From 807f5fadc7b869f7cd9d8cf86868dc6303a24796 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 08:24:47 +0200 Subject: Merging debian version 1.7.2-3.1. Signed-off-by: Daniel Baumann --- debian/changelog | 7 +++++++ debian/control | 9 ++++++--- debian/libapr1.docs | 1 - debian/libapr1.install | 1 - debian/libapr1.lintian-overrides | 1 - debian/libapr1.symbols | 2 -- debian/libapr1t64.docs | 1 + debian/libapr1t64.install | 1 + debian/libapr1t64.lintian-overrides | 2 ++ debian/libapr1t64.symbols | 2 ++ 10 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 debian/libapr1.docs delete mode 100644 debian/libapr1.install delete mode 100644 debian/libapr1.lintian-overrides delete mode 100644 debian/libapr1.symbols create mode 100644 debian/libapr1t64.docs create mode 100644 debian/libapr1t64.install create mode 100644 debian/libapr1t64.lintian-overrides create mode 100644 debian/libapr1t64.symbols 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 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 XSBC-Original-Maintainer: Debian Apache Maintainers XSBC-Original-Uploaders: Stefan Fritsch 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.docs b/debian/libapr1.docs deleted file mode 100644 index 6d5ee1d..0000000 --- a/debian/libapr1.docs +++ /dev/null @@ -1 +0,0 @@ -NOTICE diff --git a/debian/libapr1.install b/debian/libapr1.install deleted file mode 100644 index eb23182..0000000 --- a/debian/libapr1.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libapr-1.so.* 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.symbols b/debian/libapr1.symbols deleted file mode 100644 index bd69e08..0000000 --- a/debian/libapr1.symbols +++ /dev/null @@ -1,2 +0,0 @@ -here for the purpose of tricking debhelper...bwahahahaha. - diff --git a/debian/libapr1t64.docs b/debian/libapr1t64.docs new file mode 100644 index 0000000..6d5ee1d --- /dev/null +++ b/debian/libapr1t64.docs @@ -0,0 +1 @@ +NOTICE diff --git a/debian/libapr1t64.install b/debian/libapr1t64.install new file mode 100644 index 0000000..eb23182 --- /dev/null +++ b/debian/libapr1t64.install @@ -0,0 +1 @@ +usr/lib/*/libapr-1.so.* 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/libapr1t64.symbols b/debian/libapr1t64.symbols new file mode 100644 index 0000000..bd69e08 --- /dev/null +++ b/debian/libapr1t64.symbols @@ -0,0 +1,2 @@ +here for the purpose of tricking debhelper...bwahahahaha. + -- cgit v1.2.3