summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2014-01-16 15:38:59 +0100
committerJustus Winter <4winter@informatik.uni-hamburg.de>2014-01-16 15:38:59 +0100
commit2f1d122476d8f948db6b99bad8a7a3918e940019 (patch)
treee34ae7b5b2b0a9735122c9f3f7a7c86c5fe1eeaa /debian
parent379cde4881b6d5efc3fff42461927231c3bc179d (diff)
sync with debian packaging
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog17
-rw-r--r--debian/hurd.hurd-console.init2
2 files changed, 17 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 805092ec..9cc7be8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
-hurd (1:0.5.git20131101-2) UNRELEASED; urgency=low
+hurd (1:0.5.git20140113-2) UNRELEASED; urgency=low
+
+ * hurd.hurd-console.init: Actually make ENABLE=false in default work.
+
+ -- Samuel Thibault <sthibault@debian.org> Tue, 19 Nov 2013 00:21:47 +0100
+
+hurd (1:0.5.git20140113-1) unstable; urgency=low
+
+ [ Samuel Thibault ]
+ * New upstream snapshot.
+ - refresh patches.
+ * patches/libports_revert_stacksize.patch: New patch to revert upstream
+ cleanup.
+ * patches/xkb-compat.patch: Replace default compat with explicit content.
[ Justus Winter ]
* patches/exec_filename_fix.patch: Fix passing path in hurdish
- fakeroot/chroot.
+ fakeroot/chroot.
-- Samuel Thibault <sthibault@debian.org> Tue, 19 Nov 2013 00:21:47 +0100
diff --git a/debian/hurd.hurd-console.init b/debian/hurd.hurd-console.init
index cac6fc2d..095e8cb4 100644
--- a/debian/hurd.hurd-console.init
+++ b/debian/hurd.hurd-console.init
@@ -25,6 +25,8 @@ SCRIPTNAME=/etc/init.d/hurd-$NAME
# Read configuration variable file if it is present
[ -r /etc/default/hurd-$NAME ] && . /etc/default/hurd-$NAME
+[ "$ENABLE" = true ] || exit 0
+
# Augment the arguments.
DAEMON_ARGS="${DAEMON_ARGS} ${DISPLAY} ${KBD} ${KBD_REPEAT} \
${SPEAKER} ${MOUSE} ${MOUSE_REPEAT}"