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

[Pino Toscano]

The following commit has been merged in the master branch:
commit f9c212b1f151de26270e701b3a0e65668af139d2
Author: Pino Toscano <address@hidden>
Date:   Thu Feb 28 15:55:39 2013 +0100

    hurd libs: install in multiarch lib dirs (when !udeb)

diff --git a/debian/changelog b/debian/changelog
index 9e4f662..8fceee7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ hurd (20130226-2) UNRELEASED; urgency=low
   * Rename hurd{,-dev,-udeb}.install to hurd{,-dev,-udeb}.install.in, and
     generate the .install files at build time.
   * Call dh_install with --list-missing.
+  * Install the hurd libraries in multiarch library directories, but not in
+    the udeb.
 
  -- Samuel Thibault <address@hidden>  Tue, 26 Feb 2013 23:51:12 +0100
 
diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in
index 48394b4..b563626 100644
--- a/debian/hurd-dev.install.in
+++ b/debian/hurd-dev.install.in
@@ -1,9 +1,9 @@
 debian/tmp/bin/timertest
 debian/tmp/bin/fstests
-debian/tmp/lib/*.a lib
+debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.a lib/@DEB_HOST_MULTIARCH@
 debian/tmp/include/* usr/include
-debian/tmp/lib/*.so lib
-libdde_linux26/lib/src/libdde_*.a usr/lib
+debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.so lib/@DEB_HOST_MULTIARCH@
+libdde_linux26/lib/src/libdde_*.a usr/lib/@DEB_HOST_MULTIARCH@
 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
diff --git a/debian/hurd-udeb.install.in b/debian/hurd-udeb.install.in
index 486763b..196b22a 100644
--- a/debian/hurd-udeb.install.in
+++ b/debian/hurd-udeb.install.in
@@ -3,10 +3,10 @@ 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
-debian/tmp/lib/hurd/console/vga.so.* usr/lib/hurd/console
+debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.so.* lib
+debian/tmp/lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_kbd.so.* 
usr/lib/hurd/console
+debian/tmp/lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_mouse.so.* 
usr/lib/hurd/console
+debian/tmp/lib/@DEB_HOST_MULTIARCH@/hurd/console/vga.so.* usr/lib/hurd/console
 debian/tmp/lib/hurd/console-run sbin
 debian/tmp/sbin/e2os
 debian/tmp/sbin/MAKEDEV
diff --git a/debian/hurd.install.in b/debian/hurd.install.in
index 0d94d7d..70d48c3 100644
--- a/debian/hurd.install.in
+++ b/debian/hurd.install.in
@@ -2,8 +2,8 @@ debian/local/setup-translators usr/lib/hurd
 debian/local/random-hurd.sh hurd
 debian/local/urandom-hurd.sh hurd
 debian/local/securetty etc
-debian/tmp/lib/*.so.*
-debian/tmp/lib/hurd/console/*.so.* usr/lib/hurd/console
+debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.so.*
+debian/tmp/lib/@DEB_HOST_MULTIARCH@/hurd/console/*.so.* usr/lib/hurd/console
 debian/tmp/hurd/*
 debian/tmp/lib/hurd/rc etc/hurd
 debian/tmp/lib/hurd/getty sbin
diff --git a/debian/rules b/debian/rules
index a3b70b9..ab9b802 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,8 @@ SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd 
/usr/bin/w-hurd
 
 CC=gcc-4.7
 
+DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 INSTALL_in := $(wildcard debian/*.install.in)
 INSTALL_generated := $(patsubst %.in,%,$(INSTALL_in))
 
@@ -47,7 +49,7 @@ override_dh_auto_clean:
        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
+       dh_auto_install -Bbuild --destdir= -- prefix=$(DEB_DESTDIR) 
libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH) sysconfdir=$(DEB_DESTDIR)/etc 
localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb
        $(MAKE) -C libdde_linux26 
INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install
 
        # runsystem is managed by update-alternatives
@@ -68,7 +70,7 @@ override_dh_auto_install:
        mv debian/tmp/sbin/reboot debian/tmp/sbin/reboot-hurd
 
        # remove PIC static libraries
-       rm -f debian/tmp/lib/*_pic.a
+       rm -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*_pic.a
 
 override_dh_install: $(INSTALL_generated)
        dh_install --list-missing
@@ -90,5 +92,5 @@ override_dh_makeshlibs:
        dh_makeshlibs --remaining-packages
 
 debian/%.install: debian/%.install.in
-       cat $^ > $@
+       cat $^ | sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' > $@
 

-- 
Debian GNU Hurd packaging