From: LaMont Jones <lamont@debian.org>
Date: Thu, 17 Sep 2009 18:50:56 +0000 (-0600)
Subject: Depends: install-info, set -e in postrm
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b047e27b2738d2af2391589ec5e57c33521f791b;p=util-linux

Depends: install-info, set -e in postrm
---

diff --git a/debian/control b/debian/control
index 9f285164..f0fa6ba3 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Architecture: any
 Section: utils
 Priority: required
 Essential: yes
-Depends: lsb-base (>= 3.0-6), tzdata (>=2006c-2), initscripts
+Depends: lsb-base (>= 3.0-6), tzdata (>=2006c-2), initscripts, install-info
 Pre-Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: util-linux-locales, kbd | console-tools, dosfstools
 Replaces: schedutils, miscutils, setterm, fdisk, linux32, sparc-utils, e2fsprogs, ${util-linux:Conflicts}
diff --git a/debian/util-linux.postrm b/debian/util-linux.postrm
index 5e02ad26..21630b18 100644
--- a/debian/util-linux.postrm
+++ b/debian/util-linux.postrm
@@ -1,11 +1,13 @@
 #!/bin/sh
 
+set -e
+
 case "$1" in
 	remove)
 		;;
         purge)
-                update-rc.d hwclock.sh remove >/dev/null
-		update-rc.d hwclockfirst.sh remove >/dev/null
+                update-rc.d hwclock.sh remove >/dev/null || true
+		update-rc.d hwclockfirst.sh remove >/dev/null || true
 		rm -f /etc/adjtime
                 ;;
 	*)