[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20111206-1-3-g4baed7f

[Pino Toscano]

The following commit has been merged in the master branch:
commit 4baed7fbe23267cca4c9431666097c55a6357d3a
Author: Pino Toscano <address@hidden>
Date:   Wed Feb 1 17:37:12 2012 +0100

    rename {halt,reboot} to {halt,reboot}-hurd
    
    ... and handle them as slaves of the runsystem alternative.

diff --git a/debian/changelog b/debian/changelog
index 40a9fdc..60bb729 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ hurd (20111206-2) UNRELEASED; urgency=low
   * patches/ext2fs_large_stores.patch: Fix memory leak, thanks Sergio Lopez!
   * debian/hurd-console.default: Enable the console by default.
 
+  [ Pino Toscano ]
+  * hurd.install, hurd.postinst, rules: Rename halt/reboot to
+    halt-hurd/reboot-hurd, and register them as slaves of the runsystem
+    alternative.
+
  -- Samuel Thibault <address@hidden>  Sat, 21 Jan 2012 23:59:41 +0100
 
 hurd (20111206-1) unstable; urgency=low
diff --git a/debian/hurd.install b/debian/hurd.install
index 35ebbf7..0525430 100644
--- a/debian/hurd.install
+++ b/debian/hurd.install
@@ -14,8 +14,8 @@ debian/tmp/sbin/nfsd
 debian/tmp/sbin/e2os
 debian/tmp/sbin/MAKEDEV
 debian/tmp/sbin/losetup
-debian/tmp/sbin/reboot
-debian/tmp/sbin/halt
+debian/tmp/sbin/reboot-hurd
+debian/tmp/sbin/halt-hurd
 debian/tmp/sbin/swapon
 debian/tmp/sbin/swapoff
 debian/tmp/sbin/fsck.ufs
diff --git a/debian/hurd.postinst b/debian/hurd.postinst
index 8f79961..4a552dd 100644
--- a/debian/hurd.postinst
+++ b/debian/hurd.postinst
@@ -8,7 +8,9 @@ if [ "$1" = configure ] && [ "$2" ]; then
                --remove runsystem /libexec/runsystem.gnu
 fi
 update-alternatives --quiet \
-       --install /etc/hurd/runsystem runsystem /etc/hurd/runsystem.gnu 20
+       --install /etc/hurd/runsystem runsystem /etc/hurd/runsystem.gnu 20 \
+       --slave /sbin/halt halt /sbin/halt-hurd \
+       --slave /sbin/reboot reboot /sbin/reboot-hurd
 
 update-alternatives \
        --install /usr/bin/fakeroot fakeroot /usr/bin/fakeroot-hurd 30
diff --git a/debian/rules b/debian/rules
index b247fed..094f3a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,11 @@ install/hurd::
        mv debian/tmp/bin/vmstat debian/tmp/usr/bin/vmstat-hurd
        mv debian/tmp/bin/w debian/tmp/usr/bin/w-hurd
 
+       # move away halt and reboot to not conflict with sysvinit
+       # (they will be handled as alternatives)
+       mv debian/tmp/sbin/halt debian/tmp/sbin/halt-hurd
+       mv debian/tmp/sbin/reboot debian/tmp/sbin/reboot-hurd
+
        install -m664 debian/hurd-console.default 
debian/hurd/etc/default/hurd-console
 
        install -m664 $(DEB_SRCDIR)/console/motd.UTF8 debian/hurd/etc/

-- 
Debian GNU Hurd packaging