diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/hurd-udeb.install | 1 | ||||
| -rw-r--r-- | debian/local/X11/locale/Compose | 0 | ||||
| -rw-r--r-- | debian/local/X11/locale/compose.dir | 1 | ||||
| -rwxr-xr-x | debian/rules | 4 |
5 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index f80b8009..7d86e54e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ hurd (20130105-2) UNRELEASED; urgency=low installed by dh_installinit. * hurd/hurd-dev: install more stuff via dh_install, instead of copying them manually. + * Turn the X11 compose data into static files in the debian directory + (instead of being generated at build time), and install them in hurd-udeb. -- Samuel Thibault <sthibault@debian.org> Sun, 27 Jan 2013 20:38:39 +0100 diff --git a/debian/hurd-udeb.install b/debian/hurd-udeb.install index 69e6a751..486763b8 100644 --- a/debian/hurd-udeb.install +++ b/debian/hurd-udeb.install @@ -2,6 +2,7 @@ debian/local/runsystem etc/hurd debian/local/setup-translators usr/lib/hurd debian/local/partman lib debian/local/finish-install.d usr/lib +debian/local/X11/locale usr/share/X11 debian/tmp/lib/*.so.* debian/tmp/lib/hurd/console/pc_kbd.so.* usr/lib/hurd/console debian/tmp/lib/hurd/console/pc_mouse.so.* usr/lib/hurd/console diff --git a/debian/local/X11/locale/Compose b/debian/local/X11/locale/Compose new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/debian/local/X11/locale/Compose diff --git a/debian/local/X11/locale/compose.dir b/debian/local/X11/locale/compose.dir new file mode 100644 index 00000000..875529f9 --- /dev/null +++ b/debian/local/X11/locale/compose.dir @@ -0,0 +1 @@ +Compose C diff --git a/debian/rules b/debian/rules index 558aacbf..66d4f6a5 100755 --- a/debian/rules +++ b/debian/rules @@ -60,10 +60,6 @@ install/hurd:: $(MAKE) -C libdde_linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install - mkdir -p debian/tmp/usr/share/X11/locale - echo Compose C > debian/tmp/usr/share/X11/locale/compose.dir - touch debian/tmp/usr/share/X11/locale/Compose - SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd binary-predeb/hurd:: |