* debian/rules (binary-predeb/hurd): Adjust paths.

  * debian/hurd.install: Likewise.
  * debian/hurd-udeb.install: Likewise.
  * debian/hurd.dirs: Added /usr/bin.

5 files changed, 14 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index bc3ed799..4de24358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,10 @@ hurd (20080921-1) UNRELEASED; urgency=low
   * debian/patches/uptime_w_path_fix.patch: New patch, run /usr/bin/w instead
     of /bin/w.
   * debian/rules: Install fakeroot, uptime and vmstat into /usr/bin, not /bin.
+  * debian/rules (binary-predeb/hurd): Adjust paths.
+  * debian/hurd.install: Likewise.
+  * debian/hurd-udeb.install: Likewise.
+  * debian/hurd.dirs: Added /usr/bin.
   * debian/hurd.postinst: Update accordingly.
   * debian/patches/libpthread_mutex_owner.patch: New patch, fix a hang in
     libpthread, by Neal Walfield.
diff --git a/debian/hurd-udeb.install b/debian/hurd-udeb.install
index 593f1f8c..5087ac2c 100644
--- a/debian/hurd-udeb.install
+++ b/debian/hurd-udeb.install
@@ -22,12 +22,12 @@ debian/tmp/bin/syncfs
 debian/tmp/bin/fsysopts
 debian/tmp/bin/storeinfo
 debian/tmp/bin/login
-debian/tmp/bin/w-hurd
-debian/tmp/bin/uptime-hurd
+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/bin/vmstat-hurd
+debian/tmp/usr/bin/vmstat-hurd
 debian/tmp/bin/portinfo
 debian/tmp/bin/devprobe
 debian/tmp/bin/vminfo
diff --git a/debian/hurd.dirs b/debian/hurd.dirs
index cc9d942e..3789766f 100644
--- a/debian/hurd.dirs
+++ b/debian/hurd.dirs
@@ -2,4 +2,5 @@ servers
 servers/socket
 etc/default
 usr/share/msgids
+usr/bin
 boot
diff --git a/debian/hurd.install b/debian/hurd.install
index b0404723..bd27df90 100644
--- a/debian/hurd.install
+++ b/debian/hurd.install
@@ -28,12 +28,12 @@ debian/tmp/bin/syncfs
 debian/tmp/bin/fsysopts
 debian/tmp/bin/storeinfo
 debian/tmp/bin/login
-debian/tmp/bin/w-hurd
-debian/tmp/bin/uptime-hurd
+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/bin/vmstat-hurd
+debian/tmp/usr/bin/vmstat-hurd
 debian/tmp/bin/portinfo
 debian/tmp/bin/devprobe
 debian/tmp/bin/vminfo
@@ -50,7 +50,7 @@ debian/tmp/bin/rpctrace
 debian/tmp/bin/mount
 debian/tmp/bin/gcore
 debian/tmp/bin/fakeauth
-debian/tmp/bin/fakeroot-hurd
+debian/tmp/usr/bin/fakeroot-hurd
 debian/tmp/bin/forks
 debian/tmp/bin/timertest
 debian/tmp/bin/fstests
diff --git a/debian/rules b/debian/rules
index 2053a4b7..93cd7a5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,7 @@ install/hurd::
 
 	# move away fakeroot, ps, uptime, vmstat and w to not conflict with the
 	# ones  from other packages
+	mkdir -p debian/tmp/usr/bin
 	mv debian/tmp/bin/fakeroot debian/tmp/usr/bin/fakeroot-hurd
 	mv debian/tmp/bin/ps debian/tmp/bin/ps-hurd
 	mv debian/tmp/bin/uptime debian/tmp/usr/bin/uptime-hurd
@@ -57,7 +58,7 @@ install/hurd::
 install/hurd-dev::
 	install -m644 debian/local/soundcard.h debian/tmp/include/sys
 
-SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /bin/w-hurd
+SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd
 
 binary-predeb/hurd::
 	chmod u+s $(patsubst %, $(CURDIR)/debian/$(cdbs_curpkg)%, $(SUID_PROGRAMS))