Merging debian version 2.7.13.

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

5 files changed, 37 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index e1c4011..cdd78db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+apt (2.7.13) unstable; urgency=medium
+
+  * Acknowledge NMU; thank you, Steve!
+
+  [ Wesley Schwengle ]
+  * Show correct location of configure-index in man page
+
+  [ Yuan Tao ]
+  * Fix spelling mistake in zh_CN.po
+
+  [ Julian Andres Klode ]
+  * gpgv: Surface [GNUPG:] ERROR and [GNUPG:] WARNING status messages
+  * gpgv: Add a reason to worthless signers
+  * Implement gpgv --assert-pubkey-algo=>=rsa2048,ed25519,ed448 (LP: #2055193)
+  * Rename 'weak digest algorithm' to 'weak algorithm'
+  * Temporarily downgrade key assertions to "soon worthless"
+  * Do not require versioned dpkg-dev on CI
+  * prepare-release: Adjust for t64 suffix
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 28 Feb 2024 19:48:27 +0100
+
+apt (2.7.12+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1061896
+
+ -- Steve Langasek <vorlon@debian.org>  Wed, 28 Feb 2024 01:20:31 +0000
+
 apt (2.7.12-0.0~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index 014eb88..6f7dce9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ XSBC-Original-Uploaders: Michael Vogt <mvo@debian.org>,
 Bugs: mailto:maintainers@lists.progress-linux.org
 Rules-Requires-Root: no
 Standards-Version: 4.1.1
-Build-Depends: cmake (>= 3.4),
+Build-Depends: dpkg-dev (>= 1.22.5) <!pkg.apt.ci>,
+               cmake (>= 3.4),
                debhelper-compat (= 12),
                debhelper (>= 13.13~),
                docbook-xml <!nodoc>,
@@ -45,7 +46,7 @@ Package: apt
 Architecture: any
 Depends: base-passwd (>= 3.6.1) | adduser,
          gpgv,
-         libapt-pkg6.0 (>= ${binary:Version}),
+         libapt-pkg6.0t64 (>= ${binary:Version}),
          ${apt:keyring},
          ${misc:Depends},
          ${shlibs:Depends}
@@ -76,16 +77,17 @@ Description: commandline package manager
   * apt-config as an interface to the configuration settings
   * apt-key as an interface to manage authentication keys
 
-Package: libapt-pkg6.0
+Package: libapt-pkg6.0t64
+Replaces: libapt-pkg6.0
 Architecture: any
 Multi-Arch: same
 Priority: optional
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: appstream (<< 0.9.0-3~), apt (<< 1.6~), aptitude (<< 0.8.9), libapt-inst1.5 (<< 0.9.9~), dpkg (<< 1.20.8)
+Breaks: libapt-pkg6.0 (<< ${source:Version}), appstream (<< 0.9.0-3~), apt (<< 1.6~), aptitude (<< 0.8.9), libapt-inst1.5 (<< 0.9.9~), dpkg (<< 1.20.8)
 Recommends: apt (>= ${binary:Version})
 Section: libs
-Provides: libapt-pkg (= ${binary:Version})
+Provides: ${t64:Provides}, libapt-pkg (= ${binary:Version})
 Description: package management runtime library
  This library provides the common functionality for searching and
  managing packages as well as information about packages.
diff --git a/debian/libapt-pkg6.0.install b/debian/libapt-pkg6.0t64.install
index 9ac53bc..9ac53bc 100644
--- a/debian/libapt-pkg6.0.install
+++ b/debian/libapt-pkg6.0t64.install
diff --git a/debian/libapt-pkg6.0t64.lintian-overrides b/debian/libapt-pkg6.0t64.lintian-overrides
new file mode 100644
index 0000000..109592d
--- /dev/null
+++ b/debian/libapt-pkg6.0t64.lintian-overrides
@@ -0,0 +1 @@
+libapt-pkg6.0t64: package-name-doesnt-match-sonames libapt-pkg6.0
diff --git a/debian/libapt-pkg6.0.symbols b/debian/libapt-pkg6.0t64.symbols
index e12f98d..e9c6c70 100644
--- a/debian/libapt-pkg6.0.symbols
+++ b/debian/libapt-pkg6.0t64.symbols
@@ -1,4 +1,4 @@
-libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER#
+libapt-pkg.so.6.0 libapt-pkg6.0t64 #MINVER#
 * Build-Depends-Package: libapt-pkg-dev
  TFRewritePackageOrder@APTPKG_6.0 0.8.0
  TFRewriteSourceOrder@APTPKG_6.0 0.8.0