dh_install: force debian/tmp as sourcedir

strip/fix the paths in *.install.in files according to the new root

7 files changed, 157 insertions, 155 deletions

diff --git a/debian/changelog b/debian/changelog
index e93728ba..d7f1b816 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ hurd (20130916-2) UNRELEASED; urgency=low
     hurd-libs0.3 split.
   * run.patch: refresh to apply without fuzz.
   * Rename the "build" build dir to "build-deb".
+  * Force the sourcedir for dh_install to debian/tmp, and strip/fix the paths
+    in *.install.in files according to the new root.
 
  -- Samuel Thibault <sthibault@debian.org>  Tue, 17 Sep 2013 19:42:22 +0200
 
diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in
index 88f4c2b2..d3a69235 100644
--- a/debian/hurd-dev.install.in
+++ b/debian/hurd-dev.install.in
@@ -1,11 +1,11 @@
-debian/tmp/bin/timertest
-debian/tmp/bin/fstests
-debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.a lib/@DEB_HOST_MULTIARCH@
-debian/tmp/include/* usr/include
-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
-debian/local/cdrom.h usr/include/sys
-debian/local/soundcard.h usr/include/sys
+bin/timertest
+bin/fstests
+lib/@DEB_HOST_MULTIARCH@/*.a lib/@DEB_HOST_MULTIARCH@
+include/* usr/include
+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
+usr/share/libdde_linux26/build usr/share/libdde_linux26
+../local/cdrom.h usr/include/sys
+../local/soundcard.h usr/include/sys
diff --git a/debian/hurd-libs0.3-udeb.install.in b/debian/hurd-libs0.3-udeb.install.in
index 8b69f0c1..fcb97710 100644
--- a/debian/hurd-libs0.3-udeb.install.in
+++ b/debian/hurd-libs0.3-udeb.install.in
@@ -1 +1 @@
-debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.so.* lib
+lib/@DEB_HOST_MULTIARCH@/*.so.* lib
diff --git a/debian/hurd-libs0.3.install.in b/debian/hurd-libs0.3.install.in
index 5c37f7cd..05e58770 100644
--- a/debian/hurd-libs0.3.install.in
+++ b/debian/hurd-libs0.3.install.in
@@ -1 +1 @@
-debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.so.*
+lib/@DEB_HOST_MULTIARCH@/*.so.*
diff --git a/debian/hurd-udeb.install.in b/debian/hurd-udeb.install.in
index 225efb83..36085a12 100644
--- a/debian/hurd-udeb.install.in
+++ b/debian/hurd-udeb.install.in
@@ -1,73 +1,73 @@
-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/@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
-debian/tmp/sbin/losetup
-debian/tmp/sbin/swapon
-debian/tmp/sbin/swapoff
-debian/tmp/bin/boot
-debian/tmp/bin/console
-debian/tmp/bin/shd
-debian/tmp/bin/ps-hurd
-debian/tmp/bin/settrans
-debian/tmp/bin/showtrans
-debian/tmp/bin/syncfs
-debian/tmp/bin/fsysopts
-debian/tmp/bin/storeinfo
-debian/tmp/bin/login
-debian/tmp/usr/bin/w-hurd
-debian/tmp/usr/bin/uptime-hurd
-debian/tmp/bin/ids
-debian/tmp/bin/loginpr
-debian/tmp/bin/sush
-debian/tmp/usr/bin/vmstat-hurd
-debian/tmp/bin/portinfo
-debian/tmp/bin/devprobe
-debian/tmp/bin/vminfo
-debian/tmp/bin/addauth
-debian/tmp/bin/rmauth
-debian/tmp/bin/unsu
-debian/tmp/bin/setauth
-debian/tmp/bin/storecat
-debian/tmp/bin/storeread
-debian/tmp/bin/msgport
-debian/tmp/bin/mount
-debian/tmp/bin/umount
-debian/tmp/bin/nullauth
-debian/tmp/dev/MAKEDEV
-debian/tmp/hurd/auth
-debian/tmp/hurd/console
-debian/tmp/hurd/devnode
-debian/tmp/hurd/exec
-debian/tmp/hurd/ext2fs
-debian/tmp/hurd/ext2fs.static /boot
-debian/tmp/hurd/fatfs
-debian/tmp/hurd/fifo
-debian/tmp/hurd/firmlink
-debian/tmp/hurd/fwd
-debian/tmp/hurd/ifsock
-debian/tmp/hurd/init
-debian/tmp/hurd/iso9660fs
-debian/tmp/hurd/mach-defpager
-debian/tmp/hurd/magic
-debian/tmp/hurd/new-fifo
-debian/tmp/hurd/null
-debian/tmp/hurd/pfinet
-debian/tmp/hurd/pflocal
-debian/tmp/hurd/proc
-debian/tmp/hurd/procfs
-debian/tmp/hurd/proxy-defpager
-debian/tmp/hurd/random
-debian/tmp/hurd/storeio
-debian/tmp/hurd/streamio
-debian/tmp/hurd/symlink
-debian/tmp/hurd/term
-debian/tmp/hurd/tmpfs
-debian/tmp/usr/share/X11
+../local/runsystem etc/hurd
+../local/setup-translators usr/lib/hurd
+../local/partman lib
+../local/finish-install.d usr/lib
+../local/X11/locale usr/share/X11
+lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_kbd.so.* usr/lib/hurd/console
+lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_mouse.so.* usr/lib/hurd/console
+lib/@DEB_HOST_MULTIARCH@/hurd/console/vga.so.* usr/lib/hurd/console
+lib/hurd/console-run sbin
+sbin/e2os
+sbin/MAKEDEV
+sbin/losetup
+sbin/swapon
+sbin/swapoff
+bin/boot
+bin/console
+bin/shd
+bin/ps-hurd
+bin/settrans
+bin/showtrans
+bin/syncfs
+bin/fsysopts
+bin/storeinfo
+bin/login
+usr/bin/w-hurd
+usr/bin/uptime-hurd
+bin/ids
+bin/loginpr
+bin/sush
+usr/bin/vmstat-hurd
+bin/portinfo
+bin/devprobe
+bin/vminfo
+bin/addauth
+bin/rmauth
+bin/unsu
+bin/setauth
+bin/storecat
+bin/storeread
+bin/msgport
+bin/mount
+bin/umount
+bin/nullauth
+dev/MAKEDEV
+hurd/auth
+hurd/console
+hurd/devnode
+hurd/exec
+hurd/ext2fs
+hurd/ext2fs.static /boot
+hurd/fatfs
+hurd/fifo
+hurd/firmlink
+hurd/fwd
+hurd/ifsock
+hurd/init
+hurd/iso9660fs
+hurd/mach-defpager
+hurd/magic
+hurd/new-fifo
+hurd/null
+hurd/pfinet
+hurd/pflocal
+hurd/proc
+hurd/procfs
+hurd/proxy-defpager
+hurd/random
+hurd/storeio
+hurd/streamio
+hurd/symlink
+hurd/term
+hurd/tmpfs
+usr/share/X11
diff --git a/debian/hurd.install.in b/debian/hurd.install.in
index 32a5d317..29ace9fa 100644
--- a/debian/hurd.install.in
+++ b/debian/hurd.install.in
@@ -1,68 +1,68 @@
-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/@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
-debian/tmp/lib/hurd/console-run sbin
-debian/tmp/lib/hurd/runttys sbin
-debian/tmp/lib/hurd/runsystem.gnu etc/hurd
-debian/tmp/sbin/nfsd
-debian/tmp/sbin/e2os
-debian/tmp/sbin/MAKEDEV
-debian/tmp/sbin/losetup
-debian/tmp/sbin/reboot-hurd
-debian/tmp/sbin/halt-hurd
-debian/tmp/sbin/swapon
-debian/tmp/sbin/swapoff
-debian/tmp/bin/boot
-debian/tmp/bin/console
-debian/tmp/bin/shd
-debian/tmp/bin/ps-hurd
-debian/tmp/bin/settrans
-debian/tmp/bin/showtrans
-debian/tmp/bin/syncfs
-debian/tmp/bin/fsysopts
-debian/tmp/bin/storeinfo
-debian/tmp/bin/login
-debian/tmp/usr/bin/w-hurd
-debian/tmp/usr/bin/uptime-hurd
-debian/tmp/bin/ids
-debian/tmp/bin/loginpr
-debian/tmp/bin/sush
-debian/tmp/usr/bin/vmstat-hurd
-debian/tmp/bin/portinfo
-debian/tmp/bin/devprobe
-debian/tmp/bin/vminfo
-debian/tmp/bin/addauth
-debian/tmp/bin/rmauth
-debian/tmp/bin/unsu
-debian/tmp/bin/setauth
-debian/tmp/bin/nullauth
-debian/tmp/bin/ftpcp
-debian/tmp/bin/ftpdir
-debian/tmp/bin/storecat
-debian/tmp/bin/storeread
-debian/tmp/bin/msgport
-debian/tmp/bin/rpctrace
-debian/tmp/bin/mount
-debian/tmp/bin/umount
-debian/tmp/bin/gcore
-debian/tmp/bin/fakeauth
-debian/tmp/usr/bin/fakeroot-hurd
-debian/tmp/bin/forks
-debian/tmp/bin/remap
-debian/tmp/etc/login
-debian/tmp/etc/login/.bash_login
-debian/tmp/etc/login/.bashrc
-debian/tmp/etc/login/.hushlogin
-debian/tmp/etc/login/.profile
-debian/tmp/etc/login/README
-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
+../local/setup-translators usr/lib/hurd
+../local/random-hurd.sh hurd
+../local/urandom-hurd.sh hurd
+../local/securetty etc
+lib/@DEB_HOST_MULTIARCH@/hurd/console/*.so.* usr/lib/hurd/console
+hurd/*
+lib/hurd/rc etc/hurd
+lib/hurd/getty sbin
+lib/hurd/console-run sbin
+lib/hurd/runttys sbin
+lib/hurd/runsystem.gnu etc/hurd
+sbin/nfsd
+sbin/e2os
+sbin/MAKEDEV
+sbin/losetup
+sbin/reboot-hurd
+sbin/halt-hurd
+sbin/swapon
+sbin/swapoff
+bin/boot
+bin/console
+bin/shd
+bin/ps-hurd
+bin/settrans
+bin/showtrans
+bin/syncfs
+bin/fsysopts
+bin/storeinfo
+bin/login
+usr/bin/w-hurd
+usr/bin/uptime-hurd
+bin/ids
+bin/loginpr
+bin/sush
+usr/bin/vmstat-hurd
+bin/portinfo
+bin/devprobe
+bin/vminfo
+bin/addauth
+bin/rmauth
+bin/unsu
+bin/setauth
+bin/nullauth
+bin/ftpcp
+bin/ftpdir
+bin/storecat
+bin/storeread
+bin/msgport
+bin/rpctrace
+bin/mount
+bin/umount
+bin/gcore
+bin/fakeauth
+usr/bin/fakeroot-hurd
+bin/forks
+bin/remap
+etc/login
+etc/login/.bash_login
+etc/login/.bashrc
+etc/login/.hushlogin
+etc/login/.profile
+etc/login/README
+etc/ttys
+dev/MAKEDEV
+share/msgids/*.msgids usr/share/msgids
+usr/share/X11/xkb
+../../console/motd.UTF8 etc
+../../release/servers.boot boot
diff --git a/debian/rules b/debian/rules
index f1d094b0..415308db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,7 @@ override_dh_auto_install:
 	rm -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*_pic.a
 
 override_dh_install: $(INSTALL_generated)
-	dh_install --list-missing
+	dh_install --list-missing --sourcedir=debian/tmp
 
 override_dh_installinit:
 	dh_installinit -phurd --name=hurd-console