Reverting t64 migration for backports.

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

4 files changed, 6 insertions, 9 deletions

diff --git a/debian/control b/debian/control
index 6f7dce9..014eb88 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,7 @@ XSBC-Original-Uploaders: Michael Vogt <mvo@debian.org>,
 Bugs: mailto:maintainers@lists.progress-linux.org
 Rules-Requires-Root: no
 Standards-Version: 4.1.1
-Build-Depends: dpkg-dev (>= 1.22.5) <!pkg.apt.ci>,
-               cmake (>= 3.4),
+Build-Depends: cmake (>= 3.4),
                debhelper-compat (= 12),
                debhelper (>= 13.13~),
                docbook-xml <!nodoc>,
@@ -46,7 +45,7 @@ Package: apt
 Architecture: any
 Depends: base-passwd (>= 3.6.1) | adduser,
          gpgv,
-         libapt-pkg6.0t64 (>= ${binary:Version}),
+         libapt-pkg6.0 (>= ${binary:Version}),
          ${apt:keyring},
          ${misc:Depends},
          ${shlibs:Depends}
@@ -77,17 +76,16 @@ Description: commandline package manager
   * apt-config as an interface to the configuration settings
   * apt-key as an interface to manage authentication keys
 
-Package: libapt-pkg6.0t64
-Replaces: libapt-pkg6.0
+Package: libapt-pkg6.0
 Architecture: any
 Multi-Arch: same
 Priority: optional
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libapt-pkg6.0 (<< ${source:Version}), appstream (<< 0.9.0-3~), apt (<< 1.6~), aptitude (<< 0.8.9), libapt-inst1.5 (<< 0.9.9~), dpkg (<< 1.20.8)
+Breaks: appstream (<< 0.9.0-3~), apt (<< 1.6~), aptitude (<< 0.8.9), libapt-inst1.5 (<< 0.9.9~), dpkg (<< 1.20.8)
 Recommends: apt (>= ${binary:Version})
 Section: libs
-Provides: ${t64:Provides}, libapt-pkg (= ${binary:Version})
+Provides: libapt-pkg (= ${binary:Version})
 Description: package management runtime library
  This library provides the common functionality for searching and
  managing packages as well as information about packages.
diff --git a/debian/libapt-pkg6.0t64.install b/debian/libapt-pkg6.0.install
index 9ac53bc..9ac53bc 100644
--- a/debian/libapt-pkg6.0t64.install
+++ b/debian/libapt-pkg6.0.install
diff --git a/debian/libapt-pkg6.0t64.symbols b/debian/libapt-pkg6.0.symbols
index e9c6c70..e12f98d 100644
--- a/debian/libapt-pkg6.0t64.symbols
+++ b/debian/libapt-pkg6.0.symbols
@@ -1,4 +1,4 @@
-libapt-pkg.so.6.0 libapt-pkg6.0t64 #MINVER#
+libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER#
 * Build-Depends-Package: libapt-pkg-dev
  TFRewritePackageOrder@APTPKG_6.0 0.8.0
  TFRewriteSourceOrder@APTPKG_6.0 0.8.0
diff --git a/debian/libapt-pkg6.0t64.lintian-overrides b/debian/libapt-pkg6.0t64.lintian-overrides
deleted file mode 100644
index 109592d..0000000
--- a/debian/libapt-pkg6.0t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libapt-pkg6.0t64: package-name-doesnt-match-sonames libapt-pkg6.0