From 593b130d0a6a76265500bdc0ed63bce723ed98c7 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Sun, 24 Feb 2013 23:57:52 +0100
Subject: hurd-console.default: rename to hurd.hurd-console.default; let it be
 installed by dh_installinit

---
 debian/changelog                 |  2 ++
 debian/hurd-console.default      | 31 -------------------------------
 debian/hurd.hurd-console.default | 31 +++++++++++++++++++++++++++++++
 debian/rules                     |  3 +--
 4 files changed, 34 insertions(+), 33 deletions(-)
 delete mode 100644 debian/hurd-console.default
 create mode 100644 debian/hurd.hurd-console.default

diff --git a/debian/changelog b/debian/changelog
index d32c7992..ad782253 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ hurd (20130105-2) UNRELEASED; urgency=low
     - Bump compat to 7.
     - Bump the debhelper build dependency to >= 7.
     - Fix the dh_strip parameters.
+  * Rename hurd-console.default to hurd.hurd-console.default, and let it be
+    installed by dh_installinit.
 
  -- Samuel Thibault <sthibault@debian.org>  Sun, 27 Jan 2013 20:38:39 +0100
 
diff --git a/debian/hurd-console.default b/debian/hurd-console.default
deleted file mode 100644
index db67f3fa..00000000
--- a/debian/hurd-console.default
+++ /dev/null
@@ -1,31 +0,0 @@
-# Options to start the Hurd console.
-
-# Set this to 'false' to avoid running the Hurd console on bootup.
-ENABLE='true'
-
-# The display driver, mandatory.  Either `vga' or `ncursesw'.  In the case of
-# VGA, -f /some/where/file.bdf can be appended to load a specific font.
-DISPLAY='-d vga'
-
-# The keyboard driver, mandatory.  Either `pc_kbd' or `xkb' from the
-# console-driver-xkb package.
-KBD='-d pc_kbd'
-
-# this is bogus for a lot of cases, but the best we can do for now.
-if [ -f /etc/default/keyboard ]
-then
-  . /etc/default/keyboard
-fi
-[ -z "$XKBLAYOUT" ] || KBD="$KBD --keymap $XKBLAYOUT"
-
-# The keyboard repeater.  Required for running X11.
-KBD_REPEAT='--repeat=kbd'
-
-# The mouse driver.  Optional.
-MOUSE='-d pc_mouse --protocol=ps/2'
-
-# The mouse repeater.  Required for running X11.
-MOUSE_REPEAT='--repeat=mouse'
-
-# The pc speaker.  Optional.
-#SPEAKER='-d generic_speaker'
diff --git a/debian/hurd.hurd-console.default b/debian/hurd.hurd-console.default
new file mode 100644
index 00000000..db67f3fa
--- /dev/null
+++ b/debian/hurd.hurd-console.default
@@ -0,0 +1,31 @@
+# Options to start the Hurd console.
+
+# Set this to 'false' to avoid running the Hurd console on bootup.
+ENABLE='true'
+
+# The display driver, mandatory.  Either `vga' or `ncursesw'.  In the case of
+# VGA, -f /some/where/file.bdf can be appended to load a specific font.
+DISPLAY='-d vga'
+
+# The keyboard driver, mandatory.  Either `pc_kbd' or `xkb' from the
+# console-driver-xkb package.
+KBD='-d pc_kbd'
+
+# this is bogus for a lot of cases, but the best we can do for now.
+if [ -f /etc/default/keyboard ]
+then
+  . /etc/default/keyboard
+fi
+[ -z "$XKBLAYOUT" ] || KBD="$KBD --keymap $XKBLAYOUT"
+
+# The keyboard repeater.  Required for running X11.
+KBD_REPEAT='--repeat=kbd'
+
+# The mouse driver.  Optional.
+MOUSE='-d pc_mouse --protocol=ps/2'
+
+# The mouse repeater.  Required for running X11.
+MOUSE_REPEAT='--repeat=mouse'
+
+# The pc speaker.  Optional.
+#SPEAKER='-d generic_speaker'
diff --git a/debian/rules b/debian/rules
index ebcd3869..643e378a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,7 @@ DEB_CONFIGURE_USER_FLAGS := --disable-profile --enable-static-progs='ext2fs,ufs,
 DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb
 DEB_DH_STRIP_ARGS_hurd := --dbg-package=hurd-dbg
 DEB_DH_MAKESHLIBS_ARGS_hurd := --add-udeb="hurd-udeb"
+DEB_DH_INSTALLINIT_ARGS_hurd := --name=hurd-console
 
 build/hurd::
 	cd $(DEB_BUILDDIR)/doc && texi2html -split chapter ../../doc/hurd.texi
@@ -57,8 +58,6 @@ install/hurd::
 	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/
 	install -m664 $(DEB_SRCDIR)/release/servers.boot debian/hurd/boot/
 
-- 
cgit v1.2.3