Bug#770020: unblock: nsd/4.1.0-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package nsd
Hi,
this release fixes RC bug (#743396), the dh_linkdoc fixed by Julien,
but he forgot to add Pre-Depends: ${misc:Pre-Depends} to pull new
dpkg, thus a new build.
$ diffstat nsd_4.1.0-2.debdiff
changelog | 16 ++++++++++++++++
control | 22 ++++++++++++++--------
copyright | 15 +++++++--------
nsd.postinst | 4 ++--
nsd3.maintscript | 7 ++++---
nsd3.postinst | 8 --------
rules | 5 +----
7 files changed, 44 insertions(+), 33 deletions(-)
nsd (4.1.0-2) unstable; urgency=medium
.
[ Jonathan Dupart ]
* 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.
.
[ Ondřej Surý ]
* Add ${misc:Pre-Depends} to pull new dpkg before calling symlink_to_dir
* Call wrap-and-sort -a on d/control and d/copyright
unblock nsd/4.1.0-2
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (990, 'testing'), (800, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 3.0 (quilt)
Source: nsd
Binary: nsd, nsd3
Architecture: any all
Version: 4.1.0-2
Maintainer: Ondřej Surý <ondrej@debian.org>
Homepage: http://www.nlnetlabs.nl/nsd/
Standards-Version: 3.9.4
Vcs-Browser: http://anonscm.debian.org/?p=pkg-nlnetlabs/nsd.git
Vcs-Git: git://anonscm.debian.org/pkg-nlnetlabs/nsd.git
Build-Depends: bison, debhelper (>= 9), dh-autoreconf, dpkg-dev (>= 1.16.1.1~), flex, libevent-dev, libssl-dev, openssl, po-debconf
Package-List:
nsd deb net optional arch=any
nsd3 deb oldlibs extra arch=all
Checksums-Sha1:
cb4ec496eaec5bfbd5b9f4b361da2a0a79d17030 1056649 nsd_4.1.0.orig.tar.gz
5a318f170e733e25b72b59ca604fb56d884ea490 16452 nsd_4.1.0-2.debian.tar.xz
Checksums-Sha256:
ec3f6902f6f26a6b9248dcd7e9f42472fa52755740b4ba6b9d3bd08910b39b62 1056649 nsd_4.1.0.orig.tar.gz
af10810b32713911b3e5b1b9b214fd2a4b57ea707642900b7593851e3dea91b1 16452 nsd_4.1.0-2.debian.tar.xz
Files:
6597b3240c7f28c8861beb3cd9a38df3 1056649 nsd_4.1.0.orig.tar.gz
d2ae5d80fce116416ae50615ca08c076 16452 nsd_4.1.0-2.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQJ8BAEBCgBmBQJUayAXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMEI5MzNEODBGQ0UzRDk4MUEyRDM4RkIw
Qzk5QjcwRUY0RkNCQjA3AAoJEAyZtw70/LsHhUEQAJfZImyjpzop8+sdOrke5ZVp
T2XI5O0rL/gW7CXpFM7s5e9tU9Kp0bY1lZob8d00Gci7cXHQeHKFBgkK6N1a6aXB
e4mW/3BYJJgzLLjfTqF8GgnDfitgcbn/r/PnFKNNCEWHIAmAUG0N3+P01UaBhQiT
8t3nuLJazaeNxJl4VCGYgepPsvDJguw8i3DX7+Yy5kOb3LmVadMbKdXx6IthNGcG
T5HLTMANiAjEtQ3nXhviALW77KFvFLZwiTd3ha3QxlMAdczDjtN88bQ9HuSokljy
tD0qNyFaVrQQA0Kyhz+yfSVP5rAHiCkHDL6kkLpgL11X3PV09px7wfz6D56P9ni5
5i5orkZTbgX4d33jUmiGuvge8AtEi2rVR4p5g4q2NQAlNw3e8gWm1j0B0Vngr6+I
hPEHz11KPIKpfkaZb1ArH2h1NxNCTiMuXs6CFdLfVtDLXHUyHo34/yDyYFMgtLHh
35ktq4jMvekGlbSmOHY5+gljmI+TL+UEgh4bdpZtWyHVhiW05ZpHYMEPLFBCoQ0s
M/L0T6fpJvKsf8ShNChHhcJztvpiTjUaZXXsRKAPGJdw8xfjsU7fgbpB+ZHupjfB
2CJB0npn7t4gnlE2xqicS7vX/1yAVvBRCZh9hGMkRj5Zk4XiqjvQsJLQBpxsAxvR
89FkvqlCFBSHLBxrhza3
=PBd8
-----END PGP SIGNATURE-----
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-18 11:29:24.000000000 +0100
@@ -1,3 +1,19 @@
+nsd (4.1.0-2) unstable; urgency=medium
+
+ [ Jonathan Dupart ]
+ * 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.
+
+ [ Ondřej Surý ]
+ * Add ${misc:Pre-Depends} to pull new dpkg before calling symlink_to_dir
+ * Call wrap-and-sort -a on d/control and d/copyright
+
+ -- Ondřej Surý <ondrej@debian.org> Tue, 18 Nov 2014 11:17:39 +0100
+
nsd (4.1.0-1) unstable; urgency=medium
* New upstream version 4.1.0
diff -Nru nsd-4.1.0/debian/control nsd-4.1.0/debian/control
--- nsd-4.1.0/debian/control 2014-09-04 16:12:43.000000000 +0200
+++ nsd-4.1.0/debian/control 2014-11-18 11:29:24.000000000 +0100
@@ -2,15 +2,15 @@
Section: net
Priority: optional
Maintainer: Ondřej Surý <ondrej@debian.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends: bison,
+ debhelper (>= 9),
+ dh-autoreconf,
dpkg-dev (>= 1.16.1.1~),
- dh-autoreconf,
- bison,
flex,
+ libevent-dev,
libssl-dev,
- libevent-dev,
- openssl,
- po-debconf
+ openssl,
+ po-debconf
Standards-Version: 3.9.4
Vcs-Browser: http://anonscm.debian.org/?p=pkg-nlnetlabs/nsd.git
Vcs-Git: git://anonscm.debian.org/pkg-nlnetlabs/nsd.git
@@ -18,7 +18,10 @@
Package: nsd
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-10), adduser
+Depends: adduser,
+ lsb-base (>= 3.0-10),
+ ${misc:Depends},
+ ${shlibs:Depends}
Replaces: nsd3 (<= 4.0.0-1~)
Breaks: nsd3 (<= 4.0.0-1~)
Description: authoritative domain name server
@@ -33,7 +36,10 @@
Architecture: all
Section: oldlibs
Priority: extra
-Depends: nsd (>= 4.0.0-1~), ${misc:Depends}, debconf
+Pre-Depends: ${misc:Pre-Depends}
+Depends: debconf,
+ nsd (>= 4.0.0-1~),
+ ${misc:Depends}
Description: authoritative domain name server - transitional package
NSD is a fast, authoritative only, high performance, simple
and open source name server.
diff -Nru nsd-4.1.0/debian/copyright nsd-4.1.0/debian/copyright
--- nsd-4.1.0/debian/copyright 2014-09-04 16:12:43.000000000 +0200
+++ nsd-4.1.0/debian/copyright 2014-11-18 11:29:24.000000000 +0100
@@ -3,7 +3,7 @@
Source: http://www.nlnetlabs.nl/nsd/
Files: debian/*
-Copyright:
+Copyright:
2006-2007, Pierre Habouzit <madcoder@debian.org>.
2009-2012, Ondřej Surý <ondrej@debian.org>.
2011-2012, Jeroen Schot <schot@a-eskwadraat.nl>.
@@ -15,34 +15,34 @@
This file is in the public domain.
Files: compat/fake-rfc2553.c compat/fake-rfc2553.h
-Copyright:
+Copyright:
2000-2003, Damien Miller. All rights reserved.
1999, WIDE Project. All rights reserved.
License: BSD-2-clause
Files: compat/inet_aton.c
-Copyright:
+Copyright:
1983, 1990, 1993, The Regents of the University of California.
All rights reserved.
License: BSD-2-clause
Files: compat/b64_ntop.c compat/b64_pton.c
-Copyright:
+Copyright:
1996, 1998, Internet Software Consortium.
License: MIT
Files: compat/strlcpy.c
-Copyright:
+Copyright:
1998, Todd C. Miller <Todd.Miller@courtesan.com>.
License: MIT
Files: contrib/bind2nsd/*
-Copyright:
+Copyright:
2007, Secure64 Software Corporation.
License: BSD-2-clause
Files: *
-Copyright:
+Copyright:
2001-2011, NLnet Labs. All rights reserved.
License: NSD-BSD-like
@@ -108,4 +108,3 @@
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-
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-18 11:29:24.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
+rm_conffile /etc/nsd3/nsd.conf.sample 4.0.0~
+rm_conffile /etc/cron.d/nsd3 4.0.0~
+rm_conffile /etc/init.d/nsd3 4.0.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-18 11:29:24.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-18 11:29:24.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-18 11:29:24.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
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Tue, 18 Nov 2014 11:17:39 +0100
Source: nsd
Binary: nsd nsd3
Architecture: source amd64 all
Version: 4.1.0-2
Distribution: unstable
Urgency: medium
Maintainer: Ondřej Surý <ondrej@debian.org>
Changed-By: Ondřej Surý <ondrej@debian.org>
Description:
nsd - authoritative domain name server
nsd3 - authoritative domain name server - transitional package
Closes: 743396
Changes:
nsd (4.1.0-2) unstable; urgency=medium
.
[ Jonathan Dupart ]
* 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.
.
[ Ondřej Surý ]
* Add ${misc:Pre-Depends} to pull new dpkg before calling symlink_to_dir
* Call wrap-and-sort -a on d/control and d/copyright
Checksums-Sha1:
41e4fd1683d46f965060c33c5f586381c8c4765d 2039 nsd_4.1.0-2.dsc
5a318f170e733e25b72b59ca604fb56d884ea490 16452 nsd_4.1.0-2.debian.tar.xz
0554b86be15e46b12c2cce3a146714a1620d7862 764070 nsd_4.1.0-2_amd64.deb
5e1857381c20467b80921b2c37aef72f972273e4 54224 nsd3_4.1.0-2_all.deb
Checksums-Sha256:
73203b89b97038cbc0b298f799b40c8d57d314ae818febbf1774eb1d16c411ee 2039 nsd_4.1.0-2.dsc
af10810b32713911b3e5b1b9b214fd2a4b57ea707642900b7593851e3dea91b1 16452 nsd_4.1.0-2.debian.tar.xz
1e43d98d8e737243c3251f581813f768858b860ec44ce52fe91da5bbbb8067f4 764070 nsd_4.1.0-2_amd64.deb
ae476ef49603f98b7ce1c91bcd629b459d8fc48d1e81117116f6ec1d2986bf1b 54224 nsd3_4.1.0-2_all.deb
Files:
9e442ed0979e7fde369ffb71d5cbbb17 2039 net optional nsd_4.1.0-2.dsc
d2ae5d80fce116416ae50615ca08c076 16452 net optional nsd_4.1.0-2.debian.tar.xz
0037e43bc7bf25ca87741b3a6125ab9d 764070 net optional nsd_4.1.0-2_amd64.deb
ea15f0d068951979d77177f1e11d5576 54224 oldlibs extra nsd3_4.1.0-2_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQJ8BAEBCgBmBQJUayAaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMEI5MzNEODBGQ0UzRDk4MUEyRDM4RkIw
Qzk5QjcwRUY0RkNCQjA3AAoJEAyZtw70/LsHtJIP/2ODJ5fqUWRtqz85cUJP74g+
KppzhxQtDgHKT3kulSOWfBc13fXiCfS5ThCXO5tX3S6Lza34DBU5hahIXlvsRoZy
LWGHX+Fr+Tk07aMN6dsu0yuYm0EAEqayaWgpYdeQ7lfLxQuAetQX3ntY6blY6BxZ
Rr55GREeqTE4kdFmlStH1GUHdkgV8n0MkXSCpR1IFz5MRNZyfxOsmr6MqcugiHCc
LPheo4X8JYp9NWw+Ca5AfhY3++NR4PebZ/gwtn42+RYATNJi6nfo2MqmU2O8uj2h
+IHbrDJoKt5DYaVKf/6JivAKA6iqq4ZtNvvGNPFuVYNS9RP3b7lqUIDlIz5LlWRe
FkMS8IuNRMJAix1LWPfpZ7QZ0podMKXWV8VS5kpjKEMGNyLYnr6Clf4FIB4a3Pju
Ny1VyKNfH8qotBTARvb3ODpEJ1AxSLMVODUZBseTuA8wEX1AmArlZEMU2mr0D2gq
ZCsTo+fd5UI1RcRx2bu7wxwZI6WSufUJ8rfAsDEg/1W2lRV1I6VFvejbTldqov7T
oQXjlYt1P6skcaiwnSQ9fHq2f3Sozk+JQ7FmxX11bur5AYH77UfJx4nufA2BClb4
5/3J/Bowd+ntLvhnR2ukhqo/XE3W9HEE17pjNPH434r/ZH+i++JzbYxfCw2H392l
0uy8CRCecuPNJFZOCBwl
=XftV
-----END PGP SIGNATURE-----
Reply to: