3 files changed, 22 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index e9f310c5..8624bce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 hurd (20080607-6) UNRELEASED; urgency=low
 
-  * 
+  * debian/rules (install/hurd): Move away ps, uptime, vmstat and w in order
+    to have them handled by update-alternatives.
+  * debian/hurd.postinst: Run update-alternatives for ps, uptime, vmstat and
+    w.
 
  -- Michael Banck <mbanck@debian.org>  Wed, 03 Sep 2008 17:47:22 +0200
 
diff --git a/debian/hurd.postinst b/debian/hurd.postinst
index 6df4bfba..dce5b99a 100644
--- a/debian/hurd.postinst
+++ b/debian/hurd.postinst
@@ -8,6 +8,18 @@ update-alternatives --quiet \
 update-alternatives \
 	--install /usr/bin/fakeroot fakeroot /bin/fakeroot-hurd 30
 
+update-alternatives \
+	--install /usr/bin/ps ps /bin/ps-hurd 60
+
+update-alternatives \
+	--install /usr/bin/uptime uptime /bin/uptime-hurd 30
+
+update-alternatives \
+	--install /usr/bin/vmstat vmstat /bin/vmstat-hurd 60
+
+update-alternatives \
+	--install /usr/bin/w w /bin/w-hurd 60
+
 #DEBHELPER#
 
 for i in vcs tty1 tty2 tty3 tty4 tty5 tty6; do
diff --git a/debian/rules b/debian/rules
index 6dd8a142..a664d8d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,9 +43,13 @@ install/hurd::
 	# runsystem is managed by update-alternatives
 	mv debian/tmp/libexec/runsystem debian/tmp/libexec/runsystem.gnu
 
-	# move away fakeroot to not conflict with the one from the 
-	# fakeroot package
+	# move away fakeroot, ps, uptime, vmstat and w to not conflict with the
+	# 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/w debian/tmp/bin/w-hurd
 
 	install -m664 debian/hurd-console.default debian/hurd/etc/default/hurd-console