summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2025-01-05 19:21:18 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2025-02-14 19:45:12 +0100
commit2713f0fb7d2bd6efe54ccd90c422bd2262ac8b16 (patch)
tree302fb67bc670b31d0fd6e1aef73d0c5f0b8ee407
parent973d506288c8868a086a7fd62603773701abf4f4 (diff)
Bump ABI to 7.0
-rw-r--r--apt-pkg/contrib/macros.h2
-rw-r--r--debian/control7
-rw-r--r--debian/libapt-pkg6.0t64.lintian-overrides1
-rw-r--r--debian/libapt-pkg7.0.install (renamed from debian/libapt-pkg6.0t64.install)0
-rw-r--r--debian/libapt-pkg7.0.symbols (renamed from debian/libapt-pkg6.0t64.symbols)2
5 files changed, 5 insertions, 7 deletions
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index 60aba30f4..996302971 100644
--- a/apt-pkg/contrib/macros.h
+++ b/apt-pkg/contrib/macros.h
@@ -88,7 +88,7 @@
// reverse-dependencies of libapt-pkg against the new SONAME.
// Non-ABI-Breaks should only increase RELEASE number.
// See also buildlib/libversion.mak
-#define APT_PKG_MAJOR 6
+#define APT_PKG_MAJOR 7
#define APT_PKG_MINOR 0
#define APT_PKG_RELEASE 0
#define APT_PKG_ABI ((APT_PKG_MAJOR * 100) + APT_PKG_MINOR)
diff --git a/debian/control b/debian/control
index aa106ff50..157ca079e 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Package: apt
Architecture: any
Depends: base-passwd (>= 3.6.1) | adduser,
${openpgp:Depends},
- libapt-pkg6.0t64 (>= ${binary:Version}),
+ libapt-pkg7.0 (>= ${binary:Version}),
${apt:keyring},
${misc:Depends},
${shlibs:Depends}
@@ -72,14 +72,13 @@ Description: commandline package manager
* apt-extracttemplates is used by debconf to prompt for configuration
questions before installation.
-Package: libapt-pkg6.0t64
-Replaces: libapt-pkg6.0
+Package: libapt-pkg7.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})
Conflicts: libnettle8 (<< 3.9.1-2.2~)
Section: libs
diff --git a/debian/libapt-pkg6.0t64.lintian-overrides b/debian/libapt-pkg6.0t64.lintian-overrides
deleted file mode 100644
index 109592d56..000000000
--- a/debian/libapt-pkg6.0t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libapt-pkg6.0t64: package-name-doesnt-match-sonames libapt-pkg6.0
diff --git a/debian/libapt-pkg6.0t64.install b/debian/libapt-pkg7.0.install
index 9ac53bc82..9ac53bc82 100644
--- a/debian/libapt-pkg6.0t64.install
+++ b/debian/libapt-pkg7.0.install
diff --git a/debian/libapt-pkg6.0t64.symbols b/debian/libapt-pkg7.0.symbols
index cce41e3e8..d9fc82f15 100644
--- a/debian/libapt-pkg6.0t64.symbols
+++ b/debian/libapt-pkg7.0.symbols
@@ -1,4 +1,4 @@
-libapt-pkg.so.6.0 libapt-pkg6.0t64 #MINVER#
+libapt-pkg.so.7.0 libapt-pkg7.0 #MINVER#
* Build-Depends-Package: libapt-pkg-dev
TFRewritePackageOrder@APTPKG_6.0 0.8.0
TFRewriteSourceOrder@APTPKG_6.0 0.8.0