From e6cdf7c5b1d2b8da7e2616d356b5b2acb0048434 Mon Sep 17 00:00:00 2001 From: Anibal Monsalve Salazar <anibal@debian.org> Date: Sat, 11 Aug 2007 20:17:26 +1000 Subject: [PATCH] Imported Debian patch 1.1.1~git-20070709-3 --- debian/changelog | 16 ++++++++++++++++ debian/nfs-common.postrm | 2 +- debian/rules | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4ff3cec..bc9fb81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +nfs-utils (1:1.1.1~git-20070709-3) unstable; urgency=low + + * If there is no override present when running the post-removal script, do + not return exit status code 2. Closes: #436411. + * Fixed the following lintian message: + - W: nfs-utils source: debian-rules-ignores-make-clean-error line 23 + + -- Anibal Monsalve Salazar <anibal@debian.org> Sat, 11 Aug 2007 20:17:26 +1000 + nfs-utils (1:1.1.1~git-20070709-2) unstable; urgency=low * 07-daemonize-instead-of-fork.patch: New patch from upstream, uses @@ -7,6 +16,13 @@ nfs-utils (1:1.1.1~git-20070709-2) unstable; urgency=low -- Steinar H. Gunderson <sesse@debian.org> Sat, 11 Aug 2007 09:27:53 +0200 +nfs-utils (1:1.1.1~git-20070706-2) unstable; urgency=low + + * If there is no override present when running the post-removal script, do + not return exit status code 2. Closes: #436411. + + -- Anibal Monsalve Salazar <anibal@debian.org> Tue, 07 Aug 2007 17:34:47 +1000 + nfs-utils (1:1.1.1~git-20070709-1) unstable; urgency=low * New upstream release. diff --git a/debian/nfs-common.postrm b/debian/nfs-common.postrm index c7af643..aeb9848 100644 --- a/debian/nfs-common.postrm +++ b/debian/nfs-common.postrm @@ -21,6 +21,6 @@ case "$1" in /var/lib/nfs/sm/* \ /var/lib/nfs/sm.bak/* - dpkg-statoverride --remove /sbin/mount.nfs + dpkg-statoverride --remove /sbin/mount.nfs || true ;; esac diff --git a/debian/rules b/debian/rules index b72ac35..dcc4513 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ clean: unpatch dh_testroot rm -f build-stamp rm -rf $(DEBTMP) - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean dh_clean binary-indep: build -- 2.39.5