summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-02-27 08:37:18 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-02-27 08:37:18 +0000
commit7bc300c08d5734bbf48833142057554ed83f28b5 (patch)
tree365073798f47ef0df39be5d9f838b4176762644f /debian
parentReleasing progress-linux version 2.6.5-2~dschinn1. (diff)
downloadknot-7bc300c08d5734bbf48833142057554ed83f28b5.zip
knot-7bc300c08d5734bbf48833142057554ed83f28b5.tar.xz
Merging debian version 2.6.5-3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/control5
-rw-r--r--debian/tests/control2
3 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 345b088..476bc3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+knot (2.6.5-3) unstable; urgency=medium
+
+ * accept suggestions from the Multiarch hinter
+ * d/tests/control: rely on ca-certificates to validate the
+ DNS-over-TLS cert
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Sun, 25 Feb 2018 15:49:46 -0800
+
knot (2.6.5-2~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index b6b3cf3..3998fc6 100644
--- a/debian/control
+++ b/debian/control
@@ -65,6 +65,7 @@ Description: Authoritative domain name server
Package: libknot7
Architecture: any
+Multi-Arch: same
Depends:
${misc:Depends},
${shlibs:Depends},
@@ -88,6 +89,7 @@ Description: Authoritative domain name server (shared library)
Package: libzscanner1
Architecture: any
+Multi-Arch: same
Depends:
${misc:Depends},
${shlibs:Depends},
@@ -111,6 +113,7 @@ Description: DNS zone-parsing library from Knot
Package: libdnssec5
Architecture: any
+Multi-Arch: same
Depends:
${misc:Depends},
${shlibs:Depends},
@@ -134,6 +137,7 @@ Description: DNSSEC shared library from Knot
Package: libknot-dev
Architecture: any
+Multi-Arch: same
Depends:
libdnssec5 (= ${binary:Version}),
libgnutls28-dev,
@@ -208,6 +212,7 @@ Description: Version of 'host' bundled with Knot DNS
Package: knot-doc
Architecture: all
+Multi-Arch: foreign
Depends:
libjs-jquery,
libjs-underscore,
diff --git a/debian/tests/control b/debian/tests/control
index 8d9808b..559a8f7 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
Tests: kdig
-Depends: knot-dnsutils
+Depends: knot-dnsutils, ca-certificates