Bug#1061894: apr: NMU diff for 64-bit time_t transition
Source: apr
Followup-For: Bug #1061894
Apologies, an oversight in the conversion script caused us to fail to
update strict versioned dependencies on the previous package name.
Please find attached a fixed patch.
This has also now been uploaded to experimental.
diff -Nru apr-1.7.2/debian/changelog apr-1.7.2/debian/changelog
--- apr-1.7.2/debian/changelog 2023-02-26 20:51:24.000000000 +0000
+++ apr-1.7.2/debian/changelog 2024-01-31 06:04:49.000000000 +0000
@@ -1,3 +1,11 @@
+apr (1.7.2-3.1~exp2) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+ * Fix uninstallable packages from the previous upload.
+
+ -- Steve Langasek <vorlon@debian.org> Wed, 31 Jan 2024 06:04:49 +0000
+
apr (1.7.2-3) unstable; urgency=medium
* Add more fixes for atomics from upstream, in particular for
diff -Nru apr-1.7.2/debian/control apr-1.7.2/debian/control
--- apr-1.7.2/debian/control 2023-02-03 16:18:13.000000000 +0000
+++ apr-1.7.2/debian/control 2024-01-31 06:04:48.000000000 +0000
@@ -19,7 +19,10 @@
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}
@@ -33,7 +36,7 @@
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 -Nru apr-1.7.2/debian/libapr1.docs apr-1.7.2/debian/libapr1.docs
--- apr-1.7.2/debian/libapr1.docs 2023-02-02 21:18:42.000000000 +0000
+++ apr-1.7.2/debian/libapr1.docs 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-NOTICE
diff -Nru apr-1.7.2/debian/libapr1.install apr-1.7.2/debian/libapr1.install
--- apr-1.7.2/debian/libapr1.install 2023-02-02 21:18:42.000000000 +0000
+++ apr-1.7.2/debian/libapr1.install 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/libapr-1.so.*
diff -Nru apr-1.7.2/debian/libapr1.lintian-overrides apr-1.7.2/debian/libapr1.lintian-overrides
--- apr-1.7.2/debian/libapr1.lintian-overrides 2023-02-02 21:18:42.000000000 +0000
+++ apr-1.7.2/debian/libapr1.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-libapr1: package-name-doesnt-match-sonames libapr-1-0
diff -Nru apr-1.7.2/debian/libapr1.symbols apr-1.7.2/debian/libapr1.symbols
--- apr-1.7.2/debian/libapr1.symbols 2023-02-02 21:18:42.000000000 +0000
+++ apr-1.7.2/debian/libapr1.symbols 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-here for the purpose of tricking debhelper...bwahahahaha.
-
diff -Nru apr-1.7.2/debian/libapr1t64.docs apr-1.7.2/debian/libapr1t64.docs
--- apr-1.7.2/debian/libapr1t64.docs 1970-01-01 00:00:00.000000000 +0000
+++ apr-1.7.2/debian/libapr1t64.docs 2023-02-02 21:18:42.000000000 +0000
@@ -0,0 +1 @@
+NOTICE
diff -Nru apr-1.7.2/debian/libapr1t64.install apr-1.7.2/debian/libapr1t64.install
--- apr-1.7.2/debian/libapr1t64.install 1970-01-01 00:00:00.000000000 +0000
+++ apr-1.7.2/debian/libapr1t64.install 2023-02-02 21:18:42.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/libapr-1.so.*
diff -Nru apr-1.7.2/debian/libapr1t64.lintian-overrides apr-1.7.2/debian/libapr1t64.lintian-overrides
--- apr-1.7.2/debian/libapr1t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ apr-1.7.2/debian/libapr1t64.lintian-overrides 2024-01-31 06:04:48.000000000 +0000
@@ -0,0 +1,2 @@
+libapr1t64: package-name-doesnt-match-sonames libapr-1-0
+libapr1t64: package-name-doesnt-match-sonames libapr1
diff -Nru apr-1.7.2/debian/libapr1t64.symbols apr-1.7.2/debian/libapr1t64.symbols
--- apr-1.7.2/debian/libapr1t64.symbols 1970-01-01 00:00:00.000000000 +0000
+++ apr-1.7.2/debian/libapr1t64.symbols 2024-01-31 06:04:48.000000000 +0000
@@ -0,0 +1,2 @@
+here for the purpose of tricking debhelper...bwahahahaha.
+
Reply to: