[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20130105-1-6-g0f3fe38

[Pino Toscano]

The following commit has been merged in the master branch:
commit 0f3fe38d2f70e0010171a52988c0a05b57abdea4
Author: Pino Toscano <address@hidden>
Date:   Mon Feb 25 00:33:35 2013 +0100

    X11 compose data: turn into static files, install in hurd-udeb

diff --git a/debian/changelog b/debian/changelog
index f80b800..7d86e54 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 <address@hidden>  Sun, 27 Jan 2013 20:38:39 +0100
 
diff --git a/debian/hurd-udeb.install b/debian/hurd-udeb.install
index 69e6a75..486763b 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/config/login-.hushlogin b/debian/local/X11/locale/Compose
similarity index 100%
copy from config/login-.hushlogin
copy to 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 0000000..875529f
--- /dev/null
+++ b/debian/local/X11/locale/compose.dir
@@ -0,0 +1 @@
+Compose C
diff --git a/debian/rules b/debian/rules
index 558aacb..66d4f6a 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::

-- 
Debian GNU Hurd packaging