summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-12 15:58:12 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-12 15:58:24 +0000
commitc2751fbadc63332c95e5a0f7b79ff73501efab73 (patch)
tree62e871be75a8ada8514793621e60deab79d1ccd1 /debian
parentMerging upstream version 2.6.8. (diff)
downloadknot-c2751fbadc63332c95e5a0f7b79ff73501efab73.zip
knot-c2751fbadc63332c95e5a0f7b79ff73501efab73.tar.xz
Merging debian version 2.6.8-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog14
-rw-r--r--debian/control2
-rw-r--r--debian/knot.NEWS2
-rw-r--r--debian/patches/0001-use-python3-in-pykeymgr.patch2
4 files changed, 17 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 6537757..1e2e096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+knot (2.6.8-2) unstable; urgency=medium
+
+ * d/knot.NEWS: fix spelling (thanks, Lintian!)
+ * refresh patches
+ * Standards-Version: bump to 4.1.5 (no changes needed)
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Tue, 10 Jul 2018 16:14:48 -0400
+
+knot (2.6.8-1) unstable; urgency=medium
+
+ * New upstream version 2.6.8
+
+ -- Daniel Salzman <daniel.salzman@nic.cz> Tue, 10 Jul 2018 16:23:19 +0200
+
knot (2.6.7-2~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 8c01307..1a4d1b6 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
liburcu-dev (>= 0.4),
pkg-config,
protobuf-c-compiler,
-Standards-Version: 4.1.4
+Standards-Version: 4.1.5
Homepage: https://www.knot-dns.cz/
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/knot
Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/knot
diff --git a/debian/knot.NEWS b/debian/knot.NEWS
index 4d9d034..fa22ec4 100644
--- a/debian/knot.NEWS
+++ b/debian/knot.NEWS
@@ -5,7 +5,7 @@ knot (2.0.0-1) unstable; urgency=medium
and the package will automatically save the existing configuration
file to /var/backups/knot/<TIMESTAMP> directory and convert the
configuration file into the new format. The Knot DNS team worked
- hard to make this transition as smooth as possilbe, but you are
+ hard to make this transition as smooth as possible, but you are
strongly advised to check the results if everything went as
expected.
diff --git a/debian/patches/0001-use-python3-in-pykeymgr.patch b/debian/patches/0001-use-python3-in-pykeymgr.patch
index 8d65a99..cf63e91 100644
--- a/debian/patches/0001-use-python3-in-pykeymgr.patch
+++ b/debian/patches/0001-use-python3-in-pykeymgr.patch
@@ -15,7 +15,7 @@ division on both py2 and py3.
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/utils/pykeymgr/pykeymgr.in b/src/utils/pykeymgr/pykeymgr.in
-index 017d349..058218a 100755
+index a238f97..cb32f44 100755
--- a/src/utils/pykeymgr/pykeymgr.in
+++ b/src/utils/pykeymgr/pykeymgr.in
@@ -1,4 +1,4 @@