Bug#702001: unblock: opendnssec/1:1.3.9-5
Package: release.debian.org
Followup-For: Bug #702001
User: release.debian.org@packages.debian.org
Usertags: unblock
New debdiff is attached.
$ diffstat opendnssec_1.3.9-5.debdiff
changelog | 12 ++++++++++++
control | 26 ++++++++++++++++++++++----
libhsm-bin.install | 1 -
opendnssec-auditor.install | 1 -
opendnssec-doc.dirs | 4 ++++
opendnssec-doc.install | 4 ++++
opendnssec-enforcer.install | 1 -
opendnssec-signer.install | 1 -
rules | 12 +++++++-----
9 files changed, 49 insertions(+), 13 deletions(-)
Ondrej
-- System Information:
Debian Release: 7.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru opendnssec-1.3.9/debian/changelog opendnssec-1.3.9/debian/changelog
--- opendnssec-1.3.9/debian/changelog 2013-01-15 10:30:29.000000000 +0100
+++ opendnssec-1.3.9/debian/changelog 2013-03-02 20:58:36.000000000 +0100
@@ -1,3 +1,15 @@
+opendnssec (1:1.3.9-5) unstable; urgency=low
+
+ * Add procps to build dependencies, so ods-ksmutil can HUP enforcer
+ (Closes: #701703)
+ * Create arch:all new opendnssec-doc package and move the doxygen
+ documentation there
+ * Split dh_auto_build to arch and indep, so doxygen documentation is
+ built only once
+ * Run dh_installdoc on opendnssec-doc too, so it gets it's own copyright
+
+ -- Ondřej Surý <ondrej@debian.org> Fri, 01 Mar 2013 14:52:33 +0100
+
opendnssec (1:1.3.9-4) unstable; urgency=low
* Move the information about dropping the foreign key to README.Debian
diff -Nru opendnssec-1.3.9/debian/control opendnssec-1.3.9/debian/control
--- opendnssec-1.3.9/debian/control 2013-01-15 10:30:29.000000000 +0100
+++ opendnssec-1.3.9/debian/control 2013-03-02 20:58:36.000000000 +0100
@@ -24,9 +24,10 @@
libldns-dev (>= 1.6.12~),
libcunit1-dev,
opensc,
- rdoc,
- graphviz,
- doxygen
+ procps
+Build-Depends-Indep: rdoc,
+ graphviz,
+ doxygen
Standards-Version: 3.9.2
Homepage: http://www.opendnssec.org/
Vcs-Browser: http://git.debian.org/?p=pkg-nlnetlabs/opendnssec.git
@@ -75,6 +76,7 @@
Depends: ${misc:Depends},
opendnssec-enforcer-sqlite3 | opendnssec-enforcer,
opendnssec-signer,
+ opendnssec-doc,
libhsm-bin
Recommends: opendnssec-auditor
Suggests: softhsm
@@ -86,11 +88,25 @@
.
This meta-package depends on the standard distribution of OpenDNSSEC.
+Package: opendnssec-doc
+Section: misc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: opendnssec, softhsm
+Description: documentation for OpenDNSSEC suite
+ OpenDNSSEC is a complete DNSSEC zone signing system which is very
+ easy to use with stability and security in mind. There are a lot of
+ details in signing zone files with DNSSEC and OpenDNSSEC covers most
+ of it.
+ .
+ This package contains doxygen documentation for OpenDNSSEC.
+
Package: opendnssec-enforcer
Section: admin
Architecture: all
Depends: ${misc:Depends},
- opendnssec-enforcer-backend
+ opendnssec-enforcer-backend,
+ procps
Recommends: opendnssec-signer, opendnssec-auditor
Suggests: opendnssec, softhsm
Description: tool to prepare DNSSEC keys (common package)
@@ -224,6 +240,8 @@
Section: debug
Priority: extra
Architecture: any
+Replaces: opendnssec-auditor (<< 1:1.3.9-5), opendnssec-signer (<< 1:1.3.9-5), opendnssec-enforcer (<< 1:1.3.9-5), libhsm-bin (<< 1:1.3.9-5)
+Breaks: opendnssec-auditor (<< 1:1.3.9-5), opendnssec-signer (<< 1:1.3.9-5), opendnssec-enforcer (<< 1:1.3.9-5), libhsm-bin (<< 1:1.3.9-5)
Description: Debug symbols for OpenDNSSEC (Enforcer with SQLite3 support)
This package provides the debug symbols for OpenDNSSEC needed for properly
debugging errors in OpenDNSSEC with gdb.
diff -Nru opendnssec-1.3.9/debian/libhsm-bin.install opendnssec-1.3.9/debian/libhsm-bin.install
--- opendnssec-1.3.9/debian/libhsm-bin.install 2013-01-15 10:30:29.000000000 +0100
+++ opendnssec-1.3.9/debian/libhsm-bin.install 2013-03-02 20:58:36.000000000 +0100
@@ -1,3 +1,2 @@
usr/bin/ods-hsm*
usr/share/man/man1/ods-hsm*
-build-sqlite3/libhsm/doxygen-doc/html /usr/share/doc/libhsm-bin/
diff -Nru opendnssec-1.3.9/debian/opendnssec-auditor.install opendnssec-1.3.9/debian/opendnssec-auditor.install
--- opendnssec-1.3.9/debian/opendnssec-auditor.install 2013-01-15 10:30:29.000000000 +0100
+++ opendnssec-1.3.9/debian/opendnssec-auditor.install 2013-03-02 20:58:36.000000000 +0100
@@ -4,4 +4,3 @@
usr/lib/opendnssec/kasp_auditor/
usr/share/man/man1/ods-auditor.1
usr/share/man/man1/ods-kaspcheck.1
-build-sqlite3/auditor/doc/* /usr/share/doc/opendnssec-auditor/html/
diff -Nru opendnssec-1.3.9/debian/opendnssec-doc.dirs opendnssec-1.3.9/debian/opendnssec-doc.dirs
--- opendnssec-1.3.9/debian/opendnssec-doc.dirs 1970-01-01 01:00:00.000000000 +0100
+++ opendnssec-1.3.9/debian/opendnssec-doc.dirs 2013-03-02 20:58:36.000000000 +0100
@@ -0,0 +1,4 @@
+/usr/share/doc/opendnssec-signer/
+/usr/share/doc/opendnssec-enforcer/
+/usr/share/doc/opendnssec-auditor/html/
+/usr/share/doc/libhsm-bin/
diff -Nru opendnssec-1.3.9/debian/opendnssec-doc.install opendnssec-1.3.9/debian/opendnssec-doc.install
--- opendnssec-1.3.9/debian/opendnssec-doc.install 1970-01-01 01:00:00.000000000 +0100
+++ opendnssec-1.3.9/debian/opendnssec-doc.install 2013-03-02 20:58:36.000000000 +0100
@@ -0,0 +1,4 @@
+build-sqlite3/signer/doxygen-doc/html /usr/share/doc/opendnssec-signer/
+build-sqlite3/enforcer/doxygen-doc/html /usr/share/doc/opendnssec-enforcer/
+build-sqlite3/auditor/doc/* /usr/share/doc/opendnssec-auditor/html/
+build-sqlite3/libhsm/doxygen-doc/html /usr/share/doc/libhsm-bin/
diff -Nru opendnssec-1.3.9/debian/opendnssec-enforcer.install opendnssec-1.3.9/debian/opendnssec-enforcer.install
--- opendnssec-1.3.9/debian/opendnssec-enforcer.install 2013-01-15 10:30:29.000000000 +0100
+++ opendnssec-1.3.9/debian/opendnssec-enforcer.install 2013-03-02 20:58:36.000000000 +0100
@@ -1,3 +1,2 @@
usr/share/man/man1/ods-ksmutil.1
usr/share/man/man8/ods-enforcerd.8
-build-sqlite3/enforcer/doxygen-doc/html /usr/share/doc/opendnssec-enforcer/
\ No newline at end of file
diff -Nru opendnssec-1.3.9/debian/opendnssec-signer.install opendnssec-1.3.9/debian/opendnssec-signer.install
--- opendnssec-1.3.9/debian/opendnssec-signer.install 2013-01-15 10:30:29.000000000 +0100
+++ opendnssec-1.3.9/debian/opendnssec-signer.install 2013-03-02 20:58:36.000000000 +0100
@@ -1,3 +1,2 @@
usr/sbin/ods-signer*
usr/share/man/man8/ods-signer*
-build-sqlite3/signer/doxygen-doc/html /usr/share/doc/opendnssec-signer/
diff -Nru opendnssec-1.3.9/debian/rules opendnssec-1.3.9/debian/rules
--- opendnssec-1.3.9/debian/rules 2013-01-15 10:30:29.000000000 +0100
+++ opendnssec-1.3.9/debian/rules 2013-03-02 20:58:36.000000000 +0100
@@ -48,11 +48,13 @@
# rm conf/*.rng; \
#fi
-override_dh_auto_build:
+override_dh_auto_build-arch:
dh_auto_build -Bbuild-sqlite3
- dh_auto_build -Bbuild-sqlite3 -- docs
dh_auto_build -Bbuild-mysql/enforcer
+override_dh_auto_build-indep:
+ dh_auto_build -Bbuild-sqlite3 -- docs
+
override_dh_auto_install:
# Comment out example zone after regression testing
(cd build-sqlite3; patch -p1 -i $(CURDIR)/debian/signconf.xml.patch)
@@ -71,13 +73,13 @@
$(CURDIR)/debian/opendnssec-enforcer-mysql/usr/share/opendnssec/kasp2html.xsl \
$(CURDIR)/debian/opendnssec-enforcer-mysql/etc/opendnssec
-override_dh_installdocs:
+override_dh_installdocs-arch:
dh_installdocs -popendnssec-common -popendnssec -popendnssec-dbg-mysql -popendnssec-dbg-sqlite3 --link-doc=opendnssec-common
dh_installdocs -popendnssec-enforcer -popendnssec-enforcer-sqlite3 -popendnssec-enforcer-mysql --link-doc=opendnssec-enforcer
- dh_installdocs -plibhsm-bin -popendnssec-auditor -popendnssec-signer
+ dh_installdocs -plibhsm-bin -popendnssec-auditor -popendnssec-signer -popendnssec-doc
# Remove extra and unnecessary jquery.js library from generated docs (See #622147)
for p in libhsm-bin opendnssec-signer opendnssec-enforcer; do \
- rm -f $(CURDIR)/debian/$$p/usr/share/doc/$$p/html/jquery.js; \
+ rm -f $(CURDIR)/debian/opendnssec-doc/usr/share/doc/$$p/html/jquery.js; \
done
override_dh_installchangelogs:
Reply to: