Imported Debian patch 1.1.1~git-20070706-2

diff --git a/debian/changelog b/debian/changelog
index d0f3c5f2076a2d7bcdd83af4e525662cbfbe6296..2e150efe7b02d87c4c532fceec32c223ed4ad598 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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-20070706-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/nfs-common.postrm b/debian/nfs-common.postrm
index c7af6431cb80c97840e89809c55c8bd4d84e7d15..aeb9848bf3eabccf10fe3cc5156971ee13086fe9 100644 (file)
--- 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