[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 f121f308d300c9f13e070282518227d164f3f897
Author: Pino Toscano <address@hidden>
Date:   Mon Feb 25 00:08:26 2013 +0100

    hurd/hurd-dev: install more stuff via dh_install
    
    ... instead of copying them manually.

diff --git a/debian/changelog b/debian/changelog
index ad78225..f80b800 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ hurd (20130105-2) UNRELEASED; urgency=low
     - Fix the dh_strip parameters.
   * Rename hurd-console.default to hurd.hurd-console.default, and let it be
     installed by dh_installinit.
+  * hurd/hurd-dev: install more stuff via dh_install, instead of copying them
+    manually.
 
  -- Samuel Thibault <address@hidden>  Sun, 27 Jan 2013 20:38:39 +0100
 
diff --git a/debian/hurd-dev.install b/debian/hurd-dev.install
index 2bfce01..181fc63 100644
--- a/debian/hurd-dev.install
+++ b/debian/hurd-dev.install
@@ -5,3 +5,5 @@ libdde_linux26/lib/src/libdde_*.a usr/lib
 libdde_linux26/mk usr/share/libdde_linux26
 libdde_linux26/Makeconf* usr/share/libdde_linux26
 debian/tmp/usr/share/libdde_linux26/build usr/share/libdde_linux26
+debian/local/cdrom.h usr/include/sys
+debian/local/soundcard.h usr/include/sys
diff --git a/debian/hurd.install b/debian/hurd.install
index 6dff36c..4d0b259 100644
--- a/debian/hurd.install
+++ b/debian/hurd.install
@@ -68,3 +68,5 @@ debian/tmp/etc/ttys
 debian/tmp/dev/MAKEDEV
 debian/tmp/share/msgids/*.msgids usr/share/msgids
 debian/tmp/usr/share/X11/xkb
+console/motd.UTF8 etc
+release/servers.boot boot
diff --git a/debian/rules b/debian/rules
index 643e378..558aacb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,19 +58,12 @@ install/hurd::
        mv debian/tmp/sbin/halt debian/tmp/sbin/halt-hurd
        mv debian/tmp/sbin/reboot debian/tmp/sbin/reboot-hurd
 
-       install -m664 $(DEB_SRCDIR)/console/motd.UTF8 debian/hurd/etc/
-       install -m664 $(DEB_SRCDIR)/release/servers.boot debian/hurd/boot/
-
        $(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
 
-install/hurd-dev::
-       install -m644 debian/local/soundcard.h debian/tmp/include/sys
-       install -m644 debian/local/cdrom.h debian/tmp/include/sys
-
 SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd
 
 binary-predeb/hurd::

-- 
Debian GNU Hurd packaging