Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd

Conflicts:
	debian/changelog
	debian/hurd-udeb.install.in

1 files changed, 68 insertions, 71 deletions

diff --git a/debian/hurd.install.in b/debian/hurd.install.in
index eb16d79b..11791cb2 100644
--- a/debian/hurd.install.in
+++ b/debian/hurd.install.in
@@ -1,71 +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/sbin/fsck.ufs
-debian/tmp/sbin/mkfs.ufs
-debian/tmp/sbin/clri.ufs
-debian/tmp/sbin/stati.ufs
-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/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
+../../console/motd.UTF8 etc
+../../release/servers.boot boot
+../local/random-hurd.sh hurd
+../local/securetty etc
+../local/setup-translators usr/lib/hurd
+../local/urandom-hurd.sh hurd
+bin/addauth
+bin/boot
+bin/console
+bin/devprobe
+bin/fakeauth
+bin/forks
+bin/fsysopts
+bin/ftpcp
+bin/ftpdir
+bin/gcore
+bin/ids
+bin/login
+bin/loginpr
+bin/mount
+bin/msgport
+bin/nullauth
+bin/portinfo
+bin/ps-hurd
+bin/remap
+bin/rmauth
+bin/rpctrace
+bin/setauth
+bin/settrans
+bin/shd
+bin/showtrans
+bin/storecat
+bin/storeinfo
+bin/storeread
+bin/sush
+bin/syncfs
+bin/umount
+bin/unsu
+bin/vminfo
+dev/MAKEDEV
+etc/login
+etc/login/.bash_login
+etc/login/.bashrc
+etc/login/.hushlogin
+etc/login/.profile
+etc/login/README
+etc/ttys
+hurd/*
+lib/@DEB_HOST_MULTIARCH@/hurd/console/*.so.* usr/lib/hurd/console
+lib/hurd/console-run sbin
+lib/hurd/getty sbin
+lib/hurd/rc etc/hurd
+lib/hurd/runsystem.gnu etc/hurd
+lib/hurd/runttys sbin
+sbin/MAKEDEV
+sbin/e2os
+sbin/halt-hurd
+sbin/losetup
+sbin/nfsd
+sbin/reboot-hurd
+sbin/swapoff
+sbin/swapon
+share/msgids/*.msgids usr/share/msgids
+usr/bin/fakeroot-hurd
+usr/bin/uptime-hurd
+usr/bin/vmstat-hurd
+usr/bin/w-hurd
+usr/share/X11/xkb