Imported Debian patch 1.2.2-2

diff --git a/debian/changelog b/debian/changelog
index 2333ba13d40f7df9f91dbacd0f083d79eb5d2d73..7ee9cf34cb6a571112f49401418228ec0dbaf02b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
-nfs-utils (1:1.2.2-1.1) unstable; urgency=low
+nfs-utils (1:1.2.2-2) unstable; urgency=low
 
-  * Non-maintainer upload.
+  [ Vagrant Cascadian ]
   * Ensure files under /var/lib/nfs/ are owned by statd user. 
     Closes: #574510 
 
- -- Vagrant Cascadian <vagrant@debian.org>  Mon, 12 Jul 2010 20:52:13 +0000
+  [ Anibal Monsalve Salazar ]
+  * Fix out-of-date-standards-version
 
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Tue, 13 Jul 2010 15:20:17 +1000
+ 
 nfs-utils (1:1.2.2-1) unstable; urgency=low
 
   [ Anibal Monsalve Salazar ]

diff --git a/debian/control b/debian/control
index 71511e7e37c50ea71d91998b706522e21e1d8797..7961fefaf27aafebc35ac3817156a0c02946795f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: net
 Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
 Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Ben Hutchings <ben@decadent.org.uk>
 Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssglue-dev, librpcsecgss-dev (>= 0.17), libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://nfs.sourceforge.net/
 
 Package: nfs-kernel-server

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index e7d94511abfa938eb8a2edfc41699502cf96e4ea..013e3c818c748d7c49944c039c1e08cc576a55df 100644 (file)
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -6,36 +6,37 @@ set -e
 
 case "$1" in
     configure)
-       ucf --three-way /usr/share/nfs-common/conffiles/idmapd.conf /etc/idmapd.conf
-       ucf --three-way /usr/share/nfs-common/conffiles/nfs-common.default /etc/default/nfs-common
+        ucf --three-way /usr/share/nfs-common/conffiles/idmapd.conf /etc/idmapd.conf
+        ucf --three-way /usr/share/nfs-common/conffiles/nfs-common.default /etc/default/nfs-common
 
         if [ "$2" != "" ] && dpkg --compare-versions "$2" lt 1:1.1.0-10; then
             update-rc.d -f nfs-common remove >/dev/null
-       fi
-       update-rc.d nfs-common start 20 2 3 4 5 . stop 20 0 1 6 . start 44 S . >/dev/null
+        fi
+        update-rc.d nfs-common start 20 2 3 4 5 . stop 20 0 1 6 . start 44 S . >/dev/null
 
-       if ! getent passwd statd >/dev/null; then
-           adduser --system --home /var/lib/nfs --no-create-home statd
-       fi
-       if dpkg --compare-versions "$2" ge 1:1.0.7-10 && dpkg --compare-versions "$2" lt 1:1.0.7-13; then
+        if ! getent passwd statd >/dev/null; then
+            adduser --system --home /var/lib/nfs --no-create-home statd
+        fi
+        if dpkg --compare-versions "$2" ge 1:1.0.7-10 && dpkg --compare-versions "$2" lt 1:1.0.7-13; then
             usermod --home /var/lib/nfs statd || true
             if [ -d /home/statd ]; then
                 rmdir --ignore-fail-on-non-empty /home/statd
             fi
-       fi
-       chown statd /var/lib/nfs/sm \
-               /var/lib/nfs/sm.bak \
-               /var/lib/nfs/rpc_pipefs \
-               /var/lib/nfs
+        fi
+
+        chown statd /var/lib/nfs/sm \
+            /var/lib/nfs/sm.bak \
+            /var/lib/nfs/rpc_pipefs \
+            /var/lib/nfs
         if [ -f /var/lib/nfs/state ]; then
-               chown statd /var/lib/nfs/state
+            chown statd /var/lib/nfs/state
+        fi
+        
+        if [ "$2" != "" ] || dpkg --compare-versions "$2" lt 1:1.1.0-14; then
+            if dpkg-statoverride --list /sbin/mount.nfs >/dev/null 2>&1; then
+                dpkg-statoverride --remove /sbin/mount.nfs
+            fi
         fi
-       
-       if [ "$2" != "" ] || dpkg --compare-versions "$2" lt 1:1.1.0-14; then
-           if dpkg-statoverride --list /sbin/mount.nfs >/dev/null 2>&1; then
-               dpkg-statoverride --remove /sbin/mount.nfs
-           fi
-       fi
     ;;
 esac