[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20130226-1-8-gc1c0e31

[Pino Toscano]

The following commit has been merged in the master branch:
commit c1c0e316104da49a73ba08d92fc739db5950328f
Author: Pino Toscano <address@hidden>
Date:   Thu Feb 28 14:47:26 2013 +0100

    hurd{,-dev,-udeb}.install -> hurd{,-dev,-udeb}.install.in
    
    generate the .install files at build time, so we can put values known only 
at build time

diff --git a/debian/changelog b/debian/changelog
index 24a7cfb..49b60e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ hurd (20130226-2) UNRELEASED; urgency=low
     - Remove hurd (a bit pointless, since it is essential).
     - Add www-browser (for the HTML documentation).
   * Add missing autotools-dev build dependency (for the autotools_dev dh 
addon).
+  * Rename hurd{,-dev,-udeb}.install to hurd{,-dev,-udeb}.install.in, and
+    generate the .install files at build time.
 
  -- Samuel Thibault <address@hidden>  Tue, 26 Feb 2013 23:51:12 +0100
 
diff --git a/debian/hurd-dev.install b/debian/hurd-dev.install.in
similarity index 100%
rename from debian/hurd-dev.install
rename to debian/hurd-dev.install.in
diff --git a/debian/hurd-udeb.install b/debian/hurd-udeb.install.in
similarity index 100%
rename from debian/hurd-udeb.install
rename to debian/hurd-udeb.install.in
diff --git a/debian/hurd.install b/debian/hurd.install.in
similarity index 100%
rename from debian/hurd.install
rename to debian/hurd.install.in
diff --git a/debian/rules b/debian/rules
index 7a4e78e..ad11b80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,9 @@ SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd 
/usr/bin/w-hurd
 
 CC=gcc-4.7
 
+INSTALL_in := $(wildcard debian/*.install.in)
+INSTALL_generated := $(patsubst %.in,%,$(INSTALL_in))
+
 %:
        dh $@ -Bbuild --with autotools_dev
 
@@ -41,6 +44,7 @@ override_dh_auto_clean:
        rm -f $$(find libdde_linux26 -name \*.d)
        rm -fr libdde_linux26/build
        rm -fr libdde_linux26/lib/src/gen_crc32table 
libdde_linux26/lib/src/crc32table.h libdde_linux26/lib/src/timeconst.h
+       rm -f $(INSTALL_generated)
 
 override_dh_auto_install:
        dh_auto_install -Bbuild --destdir= -- prefix=$(DEB_DESTDIR) 
sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var 
XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb
@@ -66,6 +70,9 @@ override_dh_auto_install:
        # remove PIC static libraries
        rm -f debian/tmp/lib/*_pic.a
 
+override_dh_install: $(INSTALL_generated)
+       dh_install
+
 override_dh_installinit:
        dh_installinit -phurd --name=hurd-console
        dh_installinit --remaining-packages
@@ -82,3 +89,6 @@ override_dh_makeshlibs:
        dh_makeshlibs -phurd --add-udeb=hurd-udeb
        dh_makeshlibs --remaining-packages
 
+debian/%.install: debian/%.install.in
+       cat $^ > $@
+

-- 
Debian GNU Hurd packaging