Merging debian version 1.7.2-3.1.

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

7 files changed, 15 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 38dd9a8..e3d2c71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apr (1.7.2-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1061894
+
+ -- Steve Langasek <vorlon@debian.org>  Wed, 28 Feb 2024 01:17:18 +0000
+
 apr (1.7.2-3~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index 40bd828..3933cb6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
 XSBC-Original-Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
 XSBC-Original-Uploaders: Stefan Fritsch <sf@debian.org>
 Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
  autoconf,
  mawk,
  uuid-dev,
@@ -24,7 +24,10 @@ XSBC-Original-Vcs-Git: https://salsa.debian.org/apache-team/apr.git
 Homepage: https://apr.apache.org/
 Rules-Requires-Root: no
 
-Package: libapr1
+Package: libapr1t64
+Provides: ${t64:Provides}
+Replaces: libapr1
+Breaks: libapr1 (<< ${source:Version})
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
@@ -38,7 +41,7 @@ Description: Apache Portable Runtime Library
 Package: libapr1-dev
 Architecture: any
 Section: libdevel
-Depends: libapr1 (= ${binary:Version}), uuid-dev, ${misc:Depends}, libsctp-dev [linux-any], python3:any
+Depends: libapr1t64 (= ${binary:Version}), uuid-dev, ${misc:Depends}, libsctp-dev [linux-any], python3:any
 Conflicts: libapr1.0-dev, libapr0-dev
 Description: Apache Portable Runtime Library - Development Headers
  APR is Apache's Portable Runtime Library, designed to be a support library
diff --git a/debian/libapr1.lintian-overrides b/debian/libapr1.lintian-overrides
deleted file mode 100644
index e993caa..0000000
--- a/debian/libapr1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libapr1: package-name-doesnt-match-sonames libapr-1-0
diff --git a/debian/libapr1.docs b/debian/libapr1t64.docs
index 6d5ee1d..6d5ee1d 100644
--- a/debian/libapr1.docs
+++ b/debian/libapr1t64.docs
diff --git a/debian/libapr1.install b/debian/libapr1t64.install
index eb23182..eb23182 100644
--- a/debian/libapr1.install
+++ b/debian/libapr1t64.install
diff --git a/debian/libapr1t64.lintian-overrides b/debian/libapr1t64.lintian-overrides
new file mode 100644
index 0000000..5f13efc
--- /dev/null
+++ b/debian/libapr1t64.lintian-overrides
@@ -0,0 +1,2 @@
+libapr1t64: package-name-doesnt-match-sonames libapr-1-0
+libapr1t64: package-name-doesnt-match-sonames libapr1
diff --git a/debian/libapr1.symbols b/debian/libapr1t64.symbols
index bd69e08..bd69e08 100644
--- a/debian/libapr1.symbols
+++ b/debian/libapr1t64.symbols