Imported Debian patch 1.0.8-3

diff --git a/debian/changelog b/debian/changelog
index df5b8fce01122880e1f545ebb9ad6f3d63285789..8db089a3bd910639455f70597f58a458cd47e6fa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+nfs-utils (1:1.0.8-3) unstable; urgency=low
+
+  * The "what the heck, I uploaded an outdated 1:1.0.8-1 release without
+    the pkg-config fix and some other changes" release.
+  * Tweaks to debian/rules:
+    * Drop --sourcedir=debian/tmp from dh_install so we can also install files
+      directly from the debian/ directory.
+    * Minimize direct uses of install; move all the ucf installation into the
+      debhelper .install files.
+    * Remove some obsolete comments.
+  * Remove empty (modulo #DEBHELPER# tokens) nhfsstone.{postinst,prerm}
+    scripts.
+  * Clear out obsolete (pre-sarge) debconf and rc.d purging from postinst
+    script. (Same as in 1:1.0.7-10, but for nfs-kernel-server too, not just
+    nfs-common.) Minor style cleanup.
+  * Include the md5sum for /etc/default/nfs-kernel-server from 1:1.0.7-13, 
+    to make ucf not complain when upgrading from that version.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sat,  3 Jun 2006 11:00:14 +0200
+
 nfs-utils (1:1.0.8-2) unstable; urgency=low
 
   * Added missing dependency on pkg-config.

diff --git a/debian/nfs-common.install b/debian/nfs-common.install
index 915964aafaac717e341dda795ae1aaedafad0a29..45c637dbabcc4f2d8305fc66a189b7f0557447ca 100644 (file)
--- a/debian/nfs-common.install
+++ b/debian/nfs-common.install
@@ -1,6 +1,10 @@
-usr/sbin/rpc.lockd sbin/
-usr/sbin/rpc.statd sbin/
-usr/sbin/showmount sbin/
-usr/sbin/nfsstat
-usr/sbin/rpc.gssd
-usr/sbin/rpc.idmapd
+debian/tmp/usr/sbin/rpc.lockd sbin/
+debian/tmp/usr/sbin/rpc.statd sbin/
+debian/tmp/usr/sbin/showmount sbin/
+debian/tmp/usr/sbin/nfsstat
+debian/tmp/usr/sbin/rpc.gssd
+debian/tmp/usr/sbin/rpc.idmapd
+debian/idmapd.conf usr/share/nfs-common/conffiles/
+debian/idmapd.conf.md5sum usr/share/nfs-common/conffiles/
+debian/nfs-common.default usr/share/nfs-common/conffiles/
+debian/nfs-common.default.md5sum usr/share/nfs-common/conffiles/

diff --git a/debian/nfs-kernel-server.default.md5sum b/debian/nfs-kernel-server.default.md5sum
index 1858c270484db6914ad532a3d5d23d6303119a99..9231d22ad38783dbd95723b6abfff23d0c1efc3f 100644 (file)
--- a/debian/nfs-kernel-server.default.md5sum
+++ b/debian/nfs-kernel-server.default.md5sum
@@ -1,2 +1,3 @@
 226f8fdd37b11c59d73e2f378e22b0d0  nfs-utils-1.0.6/debian/nfs-kernel-server.default
 41388b5bb60d7ad1b1281b975dc07ce9  nfs-utils-1.0.7/debian/nfs-kernel-server.default
+41cb37d01bbfacaf4bfbe0f62b18284f  nfs-utils-1.0.7-13/nfs-kernel-server.default

diff --git a/debian/nfs-kernel-server.install b/debian/nfs-kernel-server.install
index 1c66d7897029276a95a46f52c50b01c57884ce57..341c538ae646cc63522a1acbf057cfd404b16463 100644 (file)
--- a/debian/nfs-kernel-server.install
+++ b/debian/nfs-kernel-server.install
@@ -1,3 +1,7 @@
-usr/sbin/exportfs
-usr/sbin/rpc.mountd
-usr/sbin/rpc.nfsd
+debian/tmp/usr/sbin/exportfs
+debian/tmp/usr/sbin/rpc.mountd
+debian/tmp/usr/sbin/rpc.nfsd
+debian/nfs-kernel-server.default /usr/share/nfs-kernel-server/conffiles/
+debian/etc.exports /usr/share/nfs-kernel-server/conffiles/
+debian/nfs-kernel-server.default.md5sum /usr/share/nfs-kernel-server/conffiles/
+debian/etc.exports.md5sum /usr/share/nfs-kernel-server/conffiles/

diff --git a/debian/nfs-kernel-server.postinst b/debian/nfs-kernel-server.postinst
index c8b244dde88436ec3a2609876498955da5acc2a3..f7dbc259043b2bd2907fae5606e881f7401b2dea 100644 (file)
--- a/debian/nfs-kernel-server.postinst
+++ b/debian/nfs-kernel-server.postinst
@@ -14,15 +14,7 @@ case "$1" in
        done
 
        update-rc.d nfs-kernel-server defaults 20 80 >/dev/null
-
-       # Remove obsolete debconf questions
-       if [ -e /usr/share/debconf/confmodule ]; then
-           . /usr/share/debconf/confmodule
-           db_unregister nfs-kernel-server/sync-default || true
-           db_unregister nfs-kernel-server/tcpwrappers-mountd || true
-           db_stop
-       fi
-       ;;
+    ;;
 esac
 
 act="restart"

diff --git a/debian/nhfsstone.install b/debian/nhfsstone.install
index 5d2c329f72a250db6d82bc5fa5f9ba493b064d06..27d18c515303df7dab49ca6c4d44b5e2f6563c66 100644 (file)
--- a/debian/nhfsstone.install
+++ b/debian/nhfsstone.install
@@ -1,2 +1,2 @@
-usr/sbin/nhfs*
-usr/share/man/man8/nhfs*
+debian/tmp/usr/sbin/nhfs*
+debian/tmp/usr/share/man/man8/nhfs*

diff --git a/debian/nhfsstone.postinst b/debian/nhfsstone.postinst
deleted file mode 100644 (file)
index 07fe0c2..0000000
--- a/debian/nhfsstone.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#

diff --git a/debian/nhfsstone.prerm b/debian/nhfsstone.prerm
deleted file mode 100644 (file)
index 42faf6a..0000000
--- a/debian/nhfsstone.prerm
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/rules b/debian/rules
index 9729fa368c5755390896f6770089dd4075d98cb1..0c5b9dea7ae9bcd077bf045614651b254bdba6c5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,27 +32,14 @@ binary-arch: build
        dh_clean -k
        dh_installdirs
        mkdir $(DEBTMP)
-       # Add here commands to install the files into debian/tmp
        $(MAKE) DESTDIR='$(DEBTMP)' install
-       dh_install --sourcedir=debian/tmp
-       # Fixups Start Here #
-       cd debian && \
-         for f in lockd statd showmount; do \
-           perl -pi -e "s#/usr(/sbin/(rpc\\.)?$$f)#\$$1#g" \
-               tmp/usr/share/man/man8/$$f.8; \
-         done;
-       # Fixups End Here #
+       dh_install
        
-       # Move all files that will be managed by ucf
-       install -m 0644 debian/idmapd.conf debian/nfs-common/usr/share/nfs-common/conffiles/
-       install -m 0644 debian/nfs-common.default debian/nfs-common/usr/share/nfs-common/conffiles/
-       install -m 0644 debian/nfs-kernel-server.default debian/nfs-kernel-server/usr/share/nfs-kernel-server/conffiles/
-       install -m 0644 debian/etc.exports debian/nfs-kernel-server/usr/share/nfs-kernel-server/conffiles/
-       
-       install -m 0644 debian/idmapd.conf.md5sum debian/nfs-common/usr/share/nfs-common/conffiles/
-       install -m 0644 debian/nfs-common.default.md5sum debian/nfs-common/usr/share/nfs-common/conffiles/
-       install -m 0644 debian/nfs-kernel-server.default.md5sum debian/nfs-kernel-server/usr/share/nfs-kernel-server/conffiles/
-       install -m 0644 debian/etc.exports.md5sum debian/nfs-kernel-server/usr/share/nfs-kernel-server/conffiles/
+       # Fix up the manpages
+       for f in lockd statd showmount; do \
+         perl -pi -e "s#/usr(/sbin/(rpc\\.)?$$f)#\$$1#g" \
+           debian/tmp/usr/share/man/man8/$$f.8; \
+       done;
        
        dh_installdocs -A
        dh_installdocs -pnfs-common debian/README.Debian.nfsv4