summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/control9
-rw-r--r--debian/libapr1.docs (renamed from debian/libapr1t64.docs)0
-rw-r--r--debian/libapr1.install (renamed from debian/libapr1t64.install)0
-rw-r--r--debian/libapr1.lintian-overrides1
-rw-r--r--debian/libapr1.symbols (renamed from debian/libapr1t64.symbols)0
-rw-r--r--debian/libapr1t64.lintian-overrides2
6 files changed, 4 insertions, 8 deletions
diff --git a/debian/control b/debian/control
index 3933cb6..40bd828 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: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
+Build-Depends: debhelper-compat (= 13),
autoconf,
mawk,
uuid-dev,
@@ -24,10 +24,7 @@ XSBC-Original-Vcs-Git: https://salsa.debian.org/apache-team/apr.git
Homepage: https://apr.apache.org/
Rules-Requires-Root: no
-Package: libapr1t64
-Provides: ${t64:Provides}
-Replaces: libapr1
-Breaks: libapr1 (<< ${source:Version})
+Package: libapr1
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -41,7 +38,7 @@ Description: Apache Portable Runtime Library
Package: libapr1-dev
Architecture: any
Section: libdevel
-Depends: libapr1t64 (= ${binary:Version}), uuid-dev, ${misc:Depends}, libsctp-dev [linux-any], python3:any
+Depends: libapr1 (= ${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/libapr1t64.docs b/debian/libapr1.docs
index 6d5ee1d..6d5ee1d 100644
--- a/debian/libapr1t64.docs
+++ b/debian/libapr1.docs
diff --git a/debian/libapr1t64.install b/debian/libapr1.install
index eb23182..eb23182 100644
--- a/debian/libapr1t64.install
+++ b/debian/libapr1.install
diff --git a/debian/libapr1.lintian-overrides b/debian/libapr1.lintian-overrides
new file mode 100644
index 0000000..e993caa
--- /dev/null
+++ b/debian/libapr1.lintian-overrides
@@ -0,0 +1 @@
+libapr1: package-name-doesnt-match-sonames libapr-1-0
diff --git a/debian/libapr1t64.symbols b/debian/libapr1.symbols
index bd69e08..bd69e08 100644
--- a/debian/libapr1t64.symbols
+++ b/debian/libapr1.symbols
diff --git a/debian/libapr1t64.lintian-overrides b/debian/libapr1t64.lintian-overrides
deleted file mode 100644
index 5f13efc..0000000
--- a/debian/libapr1t64.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libapr1t64: package-name-doesnt-match-sonames libapr-1-0
-libapr1t64: package-name-doesnt-match-sonames libapr1