* debian/rules: Install uptime and vmstat into /usr/bin, not /bin.

  * debian/hurd.postinst: Update accordingly.

3 files changed, 7 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 2d2b0ef1..84757799 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ hurd (20080921-1) UNRELEASED; urgency=low
   * debian/hurd.postinst: Install /proc as passive translator only.
   * debian/patches/uptime_w_path_fix.patch: New patch, run /usr/bin/w instead
     of /bin/w.
+  * debian/rules: Install uptime and vmstat into /usr/bin, not /bin.
+  * debian/hurd.postinst: Update accordingly.
 
  -- Michael Banck <mbanck@debian.org>  Sat, 13 Sep 2008 23:43:27 +0200
 
diff --git a/debian/hurd.postinst b/debian/hurd.postinst
index a51e6f71..34295466 100644
--- a/debian/hurd.postinst
+++ b/debian/hurd.postinst
@@ -12,13 +12,13 @@ update-alternatives \
 	--install /bin/ps ps /bin/ps-hurd 60
 
 update-alternatives \
-	--install /usr/bin/uptime uptime /bin/uptime-hurd 30
+	--install /usr/bin/uptime uptime /usr/bin/uptime-hurd 30
 
 update-alternatives \
-	--install /usr/bin/vmstat vmstat /bin/vmstat-hurd 60
+	--install /usr/bin/vmstat vmstat /usr/bin/vmstat-hurd 60
 
 update-alternatives \
-	--install /bin/w w /bin/w-hurd 60
+	--install /usr/bin/w w /usr/bin/w-hurd 60
 
 #DEBHELPER#
 
diff --git a/debian/rules b/debian/rules
index 7a80719d..1620561c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,8 +45,8 @@ install/hurd::
 	# ones  from other packages
 	mv debian/tmp/bin/fakeroot debian/tmp/bin/fakeroot-hurd
 	mv debian/tmp/bin/ps debian/tmp/bin/ps-hurd
-	mv debian/tmp/bin/uptime debian/tmp/bin/uptime-hurd
-	mv debian/tmp/bin/vmstat debian/tmp/bin/vmstat-hurd
+	mv debian/tmp/bin/uptime debian/tmp/usr/bin/uptime-hurd
+	mv debian/tmp/bin/vmstat debian/tmp/usr/bin/vmstat-hurd
 	mv debian/tmp/bin/w debian/tmp/usr/bin/w-hurd
 
 	install -m664 debian/hurd-console.default debian/hurd/etc/default/hurd-console