Merging debian version 3.3.5-1.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

34 files changed, 54 insertions, 34 deletions

diff --git a/debian/changelog b/debian/changelog
index e4791a0..05b896f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+knot (3.3.5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Restoring rename of libraries for 64-bit time_t transition
+    (Closes: #1062491).
+
+ -- Daniel Baumann <daniel.baumann@progress-linux.org>  Fri, 08 Mar 2024 22:56:33 +0100
+
 knot (3.3.5-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 9d15cd4..2a57a6d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends-Indep:
  python3-setuptools,
  python3-sphinx,
  python3-sphinx-panels,
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  autoconf,
  automake,
  debhelper-compat (= 13),
@@ -54,9 +54,9 @@ Package: knot
 Architecture: any
 Depends:
  adduser,
- libdnssec9 (= ${binary:Version}),
- libknot14 (= ${binary:Version}),
- libzscanner4 (= ${binary:Version}),
+ libdnssec9t64 (= ${binary:Version}),
+ libknot14t64 (= ${binary:Version}),
+ libzscanner4t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Pre-Depends:
@@ -73,7 +73,10 @@ Description: Authoritative domain name server
  registry and hence is well suited to run anything from the root
  zone, the top-level domain, to many smaller standard domain names.
 
-Package: libknot14
+Package: libknot14t64
+Provides: ${t64:Provides}
+Replaces: libknot14
+Breaks: libknot14 (<< ${source:Version})
 Architecture: any
 Depends:
  ${misc:Depends},
@@ -90,7 +93,10 @@ Description: Authoritative domain name server (shared library)
  This package provides libknot shared library used by Knot DNS and
  Knot Resolver.
 
-Package: libzscanner4
+Package: libzscanner4t64
+Provides: ${t64:Provides}
+Replaces: libzscanner4
+Breaks: libzscanner4 (<< ${source:Version})
 Architecture: any
 Depends:
  ${misc:Depends},
@@ -107,7 +113,10 @@ Description: DNS zone-parsing shared library from Knot DNS
  This package provides a fast zone parser shared library used by Knot
  DNS and Knot Resolver.
 
-Package: libdnssec9
+Package: libdnssec9t64
+Provides: ${t64:Provides}
+Replaces: libdnssec9
+Breaks: libdnssec9 (<< ${source:Version})
 Architecture: any
 Depends:
  ${misc:Depends},
@@ -127,10 +136,10 @@ Description: DNSSEC shared library from Knot DNS
 Package: libknot-dev
 Architecture: any
 Depends:
- libdnssec9 (= ${binary:Version}),
+ libdnssec9t64 (= ${binary:Version}),
  libgnutls28-dev,
- libknot14 (= ${binary:Version}),
- libzscanner4 (= ${binary:Version}),
+ libknot14t64 (= ${binary:Version}),
+ libzscanner4t64 (= ${binary:Version}),
  ${misc:Depends},
 Section: libdevel
 Description: Knot DNS shared library development files
@@ -147,9 +156,9 @@ Description: Knot DNS shared library development files
 Package: knot-dnsutils
 Architecture: any
 Depends:
- libdnssec9 (= ${binary:Version}),
- libknot14 (= ${binary:Version}),
- libzscanner4 (= ${binary:Version}),
+ libdnssec9t64 (= ${binary:Version}),
+ libknot14t64 (= ${binary:Version}),
+ libzscanner4t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks:
@@ -180,9 +189,9 @@ Description: Clients provided with Knot DNS (kdig, knsupdate, kxdpgun)
 Package: knot-dnssecutils
 Architecture: any
 Depends:
- libdnssec9 (= ${binary:Version}),
- libknot14 (= ${binary:Version}),
- libzscanner4 (= ${binary:Version}),
+ libdnssec9t64 (= ${binary:Version}),
+ libknot14t64 (= ${binary:Version}),
+ libzscanner4t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks:
@@ -208,9 +217,9 @@ Description: DNSSEC tools provided with Knot DNS (kzonecheck, kzonesign, knsec3h
 Package: knot-host
 Architecture: any
 Depends:
- libdnssec9 (= ${binary:Version}),
- libknot14 (= ${binary:Version}),
- libzscanner4 (= ${binary:Version}),
+ libdnssec9t64 (= ${binary:Version}),
+ libknot14t64 (= ${binary:Version}),
+ libzscanner4t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: Version of 'host' bundled with Knot DNS
diff --git a/debian/libdnssec9.install b/debian/libdnssec9t64.install
index 17a9fe6..17a9fe6 100644
--- a/debian/libdnssec9.install
+++ b/debian/libdnssec9t64.install
diff --git a/debian/libdnssec9t64.lintian-overrides b/debian/libdnssec9t64.lintian-overrides
new file mode 100644
index 0000000..2776c3a
--- /dev/null
+++ b/debian/libdnssec9t64.lintian-overrides
@@ -0,0 +1 @@
+libdnssec9t64: package-name-doesnt-match-sonames libdnssec9
diff --git a/debian/libdnssec9.symbols b/debian/libdnssec9t64.symbols
index c3ab2ed..a244b94 100644
--- a/debian/libdnssec9.symbols
+++ b/debian/libdnssec9t64.symbols
@@ -1,4 +1,4 @@
-libdnssec.so.9 libdnssec9 #MINVER#
+libdnssec.so.9 libdnssec9t64 #MINVER#
 * Build-Depends-Package: libknot-dev
  dnssec_algorithm_digest_support@Base 3.2.0
  dnssec_algorithm_key_size_check@Base 3.2.0
diff --git a/debian/libknot14.symbols.alpha b/debian/libknot14.symbols.alpha
deleted file mode 120000
index d07ec80..0000000
--- a/debian/libknot14.symbols.alpha
+++ /dev/null
@@ -1 +0,0 @@
-libknot14.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14.symbols.arc b/debian/libknot14.symbols.arc
deleted file mode 120000
index d07ec80..0000000
--- a/debian/libknot14.symbols.arc
+++ /dev/null
@@ -1 +0,0 @@
-libknot14.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14.symbols.hppa b/debian/libknot14.symbols.hppa
deleted file mode 120000
index d07ec80..0000000
--- a/debian/libknot14.symbols.hppa
+++ /dev/null
@@ -1 +0,0 @@
-libknot14.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14.symbols.hurd-amd64 b/debian/libknot14.symbols.hurd-amd64
deleted file mode 120000
index d07ec80..0000000
--- a/debian/libknot14.symbols.hurd-amd64
+++ /dev/null
@@ -1 +0,0 @@
-libknot14.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14.symbols.ia64 b/debian/libknot14.symbols.ia64
deleted file mode 120000
index d07ec80..0000000
--- a/debian/libknot14.symbols.ia64
+++ /dev/null
@@ -1 +0,0 @@
-libknot14.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14.symbols.loong64 b/debian/libknot14.symbols.loong64
deleted file mode 120000
index d07ec80..0000000
--- a/debian/libknot14.symbols.loong64
+++ /dev/null
@@ -1 +0,0 @@
-libknot14.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14.symbols.m68k b/debian/libknot14.symbols.m68k
deleted file mode 120000
index d07ec80..0000000
--- a/debian/libknot14.symbols.m68k
+++ /dev/null
@@ -1 +0,0 @@
-libknot14.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14.symbols.powerpc b/debian/libknot14.symbols.powerpc
deleted file mode 120000
index d07ec80..0000000
--- a/debian/libknot14.symbols.powerpc
+++ /dev/null
@@ -1 +0,0 @@
-libknot14.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14.symbols.sh4 b/debian/libknot14.symbols.sh4
deleted file mode 120000
index d07ec80..0000000
--- a/debian/libknot14.symbols.sh4
+++ /dev/null
@@ -1 +0,0 @@
-libknot14.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14.symbols.sparc64 b/debian/libknot14.symbols.sparc64
deleted file mode 120000
index d07ec80..0000000
--- a/debian/libknot14.symbols.sparc64
+++ /dev/null
@@ -1 +0,0 @@
-libknot14.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14.symbols.x32 b/debian/libknot14.symbols.x32
deleted file mode 120000
index d07ec80..0000000
--- a/debian/libknot14.symbols.x32
+++ /dev/null
@@ -1 +0,0 @@
-libknot14.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14.install b/debian/libknot14t64.install
index f9b9f93..f9b9f93 100644
--- a/debian/libknot14.install
+++ b/debian/libknot14t64.install
diff --git a/debian/libknot14t64.lintian-overrides b/debian/libknot14t64.lintian-overrides
new file mode 100644
index 0000000..1bce072
--- /dev/null
+++ b/debian/libknot14t64.lintian-overrides
@@ -0,0 +1 @@
+libknot14t64: package-name-doesnt-match-sonames libknot14
diff --git a/debian/libknot14.symbols b/debian/libknot14t64.symbols
index b6e7caf..8ef3ce0 100644
--- a/debian/libknot14.symbols
+++ b/debian/libknot14t64.symbols
@@ -1,4 +1,4 @@
-libknot.so.14 libknot14 #MINVER#
+libknot.so.14 libknot14t64 #MINVER#
 * Build-Depends-Package: libknot-dev
  KNOT_DB_LMDB_DUPSORT@Base 3.3.0
  KNOT_DB_LMDB_INTEGERKEY@Base 3.3.0
diff --git a/debian/libknot14t64.symbols.alpha b/debian/libknot14t64.symbols.alpha
new file mode 120000
index 0000000..cb14217
--- /dev/null
+++ b/debian/libknot14t64.symbols.alpha
@@ -0,0 +1 @@
+libknot14t64.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14t64.symbols.arc b/debian/libknot14t64.symbols.arc
new file mode 120000
index 0000000..cb14217
--- /dev/null
+++ b/debian/libknot14t64.symbols.arc
@@ -0,0 +1 @@
+libknot14t64.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14t64.symbols.hppa b/debian/libknot14t64.symbols.hppa
new file mode 120000
index 0000000..cb14217
--- /dev/null
+++ b/debian/libknot14t64.symbols.hppa
@@ -0,0 +1 @@
+libknot14t64.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14t64.symbols.hurd-amd64 b/debian/libknot14t64.symbols.hurd-amd64
new file mode 120000
index 0000000..cb14217
--- /dev/null
+++ b/debian/libknot14t64.symbols.hurd-amd64
@@ -0,0 +1 @@
+libknot14t64.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14.symbols.hurd-i386 b/debian/libknot14t64.symbols.hurd-i386
index 09756e2..f06d515 100644
--- a/debian/libknot14.symbols.hurd-i386
+++ b/debian/libknot14t64.symbols.hurd-i386
@@ -1,4 +1,4 @@
-libknot.so.14 libknot14 #MINVER#
+libknot.so.14 libknot14t64 #MINVER#
  KNOT_DB_LMDB_DUPSORT@Base 3.3.0
  KNOT_DB_LMDB_INTEGERKEY@Base 3.3.0
  KNOT_DB_LMDB_MAPASYNC@Base 3.3.0
diff --git a/debian/libknot14t64.symbols.ia64 b/debian/libknot14t64.symbols.ia64
new file mode 120000
index 0000000..cb14217
--- /dev/null
+++ b/debian/libknot14t64.symbols.ia64
@@ -0,0 +1 @@
+libknot14t64.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14t64.symbols.loong64 b/debian/libknot14t64.symbols.loong64
new file mode 120000
index 0000000..cb14217
--- /dev/null
+++ b/debian/libknot14t64.symbols.loong64
@@ -0,0 +1 @@
+libknot14t64.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14t64.symbols.m68k b/debian/libknot14t64.symbols.m68k
new file mode 120000
index 0000000..cb14217
--- /dev/null
+++ b/debian/libknot14t64.symbols.m68k
@@ -0,0 +1 @@
+libknot14t64.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14t64.symbols.powerpc b/debian/libknot14t64.symbols.powerpc
new file mode 120000
index 0000000..cb14217
--- /dev/null
+++ b/debian/libknot14t64.symbols.powerpc
@@ -0,0 +1 @@
+libknot14t64.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14t64.symbols.sh4 b/debian/libknot14t64.symbols.sh4
new file mode 120000
index 0000000..cb14217
--- /dev/null
+++ b/debian/libknot14t64.symbols.sh4
@@ -0,0 +1 @@
+libknot14t64.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14t64.symbols.sparc64 b/debian/libknot14t64.symbols.sparc64
new file mode 120000
index 0000000..cb14217
--- /dev/null
+++ b/debian/libknot14t64.symbols.sparc64
@@ -0,0 +1 @@
+libknot14t64.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libknot14t64.symbols.x32 b/debian/libknot14t64.symbols.x32
new file mode 120000
index 0000000..cb14217
--- /dev/null
+++ b/debian/libknot14t64.symbols.x32
@@ -0,0 +1 @@
+libknot14t64.symbols.hurd-i386
\ No newline at end of file
diff --git a/debian/libzscanner4.install b/debian/libzscanner4t64.install
index a8dc226..a8dc226 100644
--- a/debian/libzscanner4.install
+++ b/debian/libzscanner4t64.install
diff --git a/debian/libzscanner4t64.lintian-overrides b/debian/libzscanner4t64.lintian-overrides
new file mode 100644
index 0000000..3b05fc3
--- /dev/null
+++ b/debian/libzscanner4t64.lintian-overrides
@@ -0,0 +1 @@
+libzscanner4t64: package-name-doesnt-match-sonames libzscanner4
diff --git a/debian/libzscanner4.symbols b/debian/libzscanner4t64.symbols
index d918fb0..042c364 100644
--- a/debian/libzscanner4.symbols
+++ b/debian/libzscanner4t64.symbols
@@ -1,4 +1,4 @@
-libzscanner.so.4 libzscanner4 #MINVER#
+libzscanner.so.4 libzscanner4t64 #MINVER#
 * Build-Depends-Package: libknot-dev
  zs_deinit@Base 3.1.1
  zs_errorname@Base 3.1.1