Control: tags 743396 + pending Dear maintainer,
I've prepared an NMU for nsd (versioned as 4.1.0-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers, Julien
diff -Nru nsd-4.1.0/debian/changelog nsd-4.1.0/debian/changelog
--- nsd-4.1.0/debian/changelog 2014-09-04 16:12:43.000000000 +0200
+++ nsd-4.1.0/debian/changelog 2014-11-15 17:00:06.000000000 +0100
@@ -1,3 +1,16 @@
+nsd (4.1.0-1.1) unstable; urgency=medium
+
+ [ Jonathan Dupart ]
+ * Non-maintainer upload.
+ * Fix "invalid user: 'nsd'" move the debhelper tag at the end of the
+ postinst script (Closes: #743396)
+
+ [ Julien Cristau ]
+ * Stop using dh_installdocs --link-doc, as that makes nsd binNMU-unsafe.
+ Deal with the symlink-to-dir migration.
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 15 Nov 2014 17:00:04 +0100
+
nsd (4.1.0-1) unstable; urgency=medium
* New upstream version 4.1.0
diff -Nru nsd-4.1.0/debian/nsd3.maintscript nsd-4.1.0/debian/nsd3.maintscript
--- nsd-4.1.0/debian/nsd3.maintscript 2014-09-04 16:12:43.000000000 +0200
+++ nsd-4.1.0/debian/nsd3.maintscript 2014-11-15 16:31:47.000000000 +0100
@@ -1,3 +1,4 @@
rm_conffile /etc/nsd3/nsd.conf.sample 4.0.0~ nsd3 -- "$@" 0
rm_conffile /etc/cron.d/nsd3 4.0.0~ nsd3 -- "$@" 0
rm_conffile /etc/init.d/nsd3 4.0.0~ nsd3 -- "$@" 0
+symlink_to_dir /usr/share/doc/nsd3 /usr/share/doc/nsd 4.1.0-1.1~ -- "$@"
diff -Nru nsd-4.1.0/debian/nsd3.postinst nsd-4.1.0/debian/nsd3.postinst
--- nsd-4.1.0/debian/nsd3.postinst 2014-09-04 16:12:43.000000000 +0200
+++ nsd-4.1.0/debian/nsd3.postinst 2014-11-15 17:11:26.000000000 +0100
@@ -2,14 +2,6 @@
#DEBHELPER#
-DOCDIR=/usr/share/doc/nsd3
-DOCLINK=nsd
-
-if [ -d $DOCDIR ] && [ ! -L $DOCDIR ]; then
- rmdir $DOCDIR
- ln -s $DOCLINK $DOCDIR
-fi
-
# Source debconf library.
. /usr/share/debconf/confmodule
diff -Nru nsd-4.1.0/debian/nsd.postinst nsd-4.1.0/debian/nsd.postinst
--- nsd-4.1.0/debian/nsd.postinst 2014-09-04 16:12:43.000000000 +0200
+++ nsd-4.1.0/debian/nsd.postinst 2014-11-15 16:18:30.000000000 +0100
@@ -1,8 +1,6 @@
#!/bin/sh
set -e
-#DEBHELPER#
-
if test "$1" = "configure"; then
# Move /etc/nsd3/nsd.conf to /etc/nsd/nsd.conf on first install of NSD 4
OLDCONFFILE=/etc/nsd3/nsd.conf
@@ -48,4 +46,6 @@
fi
fi
+#DEBHELPER#
+
exit 0
diff -Nru nsd-4.1.0/debian/rules nsd-4.1.0/debian/rules
--- nsd-4.1.0/debian/rules 2014-09-04 16:12:43.000000000 +0200
+++ nsd-4.1.0/debian/rules 2014-11-15 16:37:36.000000000 +0100
@@ -39,10 +39,7 @@
install -m 640 debian/nsd.conf $(CURDIR)/debian/nsd/etc/nsd/
override_dh_installchangelogs:
- dh_installchangelogs -pnsd doc/ChangeLog
+ dh_installchangelogs doc/ChangeLog
override_dh_compress:
dh_compress -X/usr/share/doc/nsd/examples/nsd.conf
-
-override_dh_installdocs:
- dh_installdocs --link-doc=nsd
signature.asc
Description: Digital signature
