summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-05 04:15:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-05 04:15:14 +0000
commit644e218e1f718d81f2c3351a4ac7699c2797ed24 (patch)
tree08ca5b8e388965616e274bf7d3fc03ef84a462f2 /debian
parentMerging upstream version 5.7.3. (diff)
downloadknot-resolver-644e218e1f718d81f2c3351a4ac7699c2797ed24.tar.xz
knot-resolver-644e218e1f718d81f2c3351a4ac7699c2797ed24.zip
Merging debian version 5.7.3-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--debian/changelog9
-rw-r--r--debian/copyright7
-rw-r--r--debian/source/lintian-overrides3
-rw-r--r--debian/watch2
4 files changed, 10 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 2bd7a85..4674862 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+knot-resolver (5.7.3-1) unstable; urgency=medium
+
+ * New upstream release
+ * Remove unneeded lintian-overrides
+ * d/copyright: Remove obsolete lib/generic/map entry
+ * Update debian/watch to only watch for v5 archives
+
+ -- Jakub Ružička <jakub.ruzicka@nic.cz> Tue, 04 Jun 2024 19:47:29 +0200
+
knot-resolver (5.7.2-1~progress7.99u1) graograman-backports; urgency=medium
* Uploading to graograman-backports, remaining changes:
diff --git a/debian/copyright b/debian/copyright
index dfcde1f..b594df0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -43,13 +43,6 @@ Copyright: 2006-2017 Dan Vanderkam <danvdk@gmail.com>
License: MIT
Comment: upstream site: http://dygraphs.com/download.html
-Files: lib/generic/map.c lib/generic/map.h
-Copyright: Dan Bernstein
- Jonas Gehring
- Adam Langley
- Marek Vavrusa
-License: public-domain
-
Files: modules/policy/lua-aho-corasick/*
Copyright: 2013 CloudFlare, Inc.
License: BSD-3-CloudFlare
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 984a554..26c92f8 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,9 +1,6 @@
# the lines in epoch.js are just human-written long lines:
-knot-resolver source: source-contains-prebuilt-javascript-object debian/missing-sources/epoch.js line length is 287 characters (>256)
knot-resolver source: source-is-missing debian/missing-sources/epoch.js line length is 287 characters (>256)
# the style line in datamaps.world.js is an ugly one-liner but still human-modifiable
-knot-resolver source: very-long-line-length-in-source-file debian/missing-sources/datamaps.world.js line length is 832 characters (>512)
-knot-resolver source: source-contains-prebuilt-javascript-object debian/missing-sources/datamaps.world.js line length is 826 characters (>512)
knot-resolver source: source-is-missing debian/missing-sources/datamaps.world.js line length is 826 characters (>512)
# same for dygraph.js
knot-resolver source: source-is-missing debian/missing-sources/dygraph.js line length is 847 characters (>512)
diff --git a/debian/watch b/debian/watch
index 26bed73..38ffe7a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=4
opts=pgpsigurlmangle=s/$/.asc/ \
https://secure.nic.cz/files/knot-resolver/ \
-(?:|.*/)@PACKAGE@-([\d.]*)@ARCHIVE_EXT@
+(?:|.*/)@PACKAGE@-(5\.[\d.]*)@ARCHIVE_EXT@