Reverting t64 migration for backports.

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

6 files changed, 13 insertions, 17 deletions

diff --git a/debian/control b/debian/control
index f98f423..329eb75 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Uploaders: Stefan Fritsch <sf@debian.org>
 Bugs: mailto:maintainers@lists.progress-linux.org
 Section: libs
 Priority: optional
-Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 11),
+Build-Depends: debhelper-compat (= 11),
                autoconf,
                mawk,
                libldap2-dev,
@@ -27,10 +27,7 @@ XSBC-Original-Vcs-Browser: https://salsa.debian.org/apache-team/apr-util
 XSBC-Original-Vcs-Git: https://salsa.debian.org/apache-team/apr-util.git
 Homepage: https://apr.apache.org/
 
-Package: libaprutil1t64
-Provides: ${t64:Provides}
-Replaces: libaprutil1
-Breaks: libaprutil1 (<< ${source:Version})
+Package: libaprutil1
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
@@ -47,7 +44,7 @@ Description: Apache Portable Runtime Utility Library
 Package: libaprutil1-ldap
 Architecture: any
 Multi-Arch: same
-Depends: libaprutil1t64 (= ${binary:Version}),
+Depends: libaprutil1 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
@@ -64,7 +61,7 @@ Description: Apache Portable Runtime Utility Library - LDAP Driver
 Package: libaprutil1-dbd-mysql
 Architecture: any
 Multi-Arch: same
-Depends: libaprutil1t64 (= ${binary:Version}),
+Depends: libaprutil1 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
@@ -81,7 +78,7 @@ Description: Apache Portable Runtime Utility Library - MySQL Driver
 Package: libaprutil1-dbd-sqlite3
 Architecture: any
 Multi-Arch: same
-Depends: libaprutil1t64 (= ${binary:Version}),
+Depends: libaprutil1 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
@@ -98,7 +95,7 @@ Description: Apache Portable Runtime Utility Library - SQLite3 Driver
 Package: libaprutil1-dbd-odbc
 Architecture: any
 Multi-Arch: same
-Depends: libaprutil1t64 (= ${binary:Version}),
+Depends: libaprutil1 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
@@ -115,7 +112,7 @@ Description: Apache Portable Runtime Utility Library - ODBC Driver
 Package: libaprutil1-dbd-pgsql
 Architecture: any
 Multi-Arch: same
-Depends: libaprutil1t64 (= ${binary:Version}),
+Depends: libaprutil1 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
@@ -132,7 +129,7 @@ Description: Apache Portable Runtime Utility Library - PostgreSQL Driver
 Package: libaprutil1-dev
 Architecture: any
 Section: libdevel
-Depends: libaprutil1t64 (= ${binary:Version}),
+Depends: libaprutil1 (= ${binary:Version}),
          libldap2-dev,
          libexpat1-dev,
          libapr1-dev,
diff --git a/debian/libaprutil1t64.docs b/debian/libaprutil1.docs
index 6d5ee1d..6d5ee1d 100644
--- a/debian/libaprutil1t64.docs
+++ b/debian/libaprutil1.docs
diff --git a/debian/libaprutil1t64.install b/debian/libaprutil1.install
index 66db083..66db083 100644
--- a/debian/libaprutil1t64.install
+++ b/debian/libaprutil1.install
diff --git a/debian/libaprutil1.lintian-overrides b/debian/libaprutil1.lintian-overrides
new file mode 100644
index 0000000..84f64df
--- /dev/null
+++ b/debian/libaprutil1.lintian-overrides
@@ -0,0 +1,2 @@
+libaprutil1: symbols-declares-dependency-on-other-package
+libaprutil1: package-name-doesnt-match-sonames libaprutil-1-0
diff --git a/debian/libaprutil1t64.symbols b/debian/libaprutil1.symbols
index 8468461..fd9f8c8 100644
--- a/debian/libaprutil1t64.symbols
+++ b/debian/libaprutil1.symbols
@@ -1,6 +1,6 @@
-libaprutil-1.so.0 libaprutil1t64 #MINVER#
-| libaprutil1-ldap , libaprutil164 #MINVER#
-| libaprutil1-dbd-sqlite3|libaprutil1-dbd-mysql|libaprutil1-dbd-odbc|libaprutil1-dbd-pgsql|libaprutil1-dbd-freetds , libaprutil164 #MINVER#
+libaprutil-1.so.0 libaprutil1 #MINVER#
+| libaprutil1-ldap , libaprutil1 #MINVER#
+| libaprutil1-dbd-sqlite3|libaprutil1-dbd-mysql|libaprutil1-dbd-odbc|libaprutil1-dbd-pgsql|libaprutil1-dbd-freetds , libaprutil1 #MINVER#
  _crypt_blowfish_rn@Base 1.5.0
  _crypt_gensalt_blowfish_rn@Base 1.5.0
  _crypt_output_magic@Base 1.5.0
diff --git a/debian/libaprutil1t64.lintian-overrides b/debian/libaprutil1t64.lintian-overrides
deleted file mode 100644
index 90a6b4d..0000000
--- a/debian/libaprutil1t64.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libaprutil1t64: symbols-declares-dependency-on-other-package
-libaprutil1t64: package-name-doesnt-match-sonames libaprutil-1-0
-libaprutil1t64: package-name-doesnt-match-sonames libaprutil1