From d51f8ca6799ec1ecb3edeec8726aacc79f4c2275 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 20:24:43 +0200 Subject: Reverting t64 migration for backports. Signed-off-by: Daniel Baumann --- debian/control | 11 ++++------- debian/libgeoip1.install | 1 + debian/libgeoip1.lintian-overrides | 2 ++ debian/libgeoip1t64.install | 1 - debian/libgeoip1t64.lintian-overrides | 3 --- 5 files changed, 7 insertions(+), 11 deletions(-) create mode 100644 debian/libgeoip1.install create mode 100644 debian/libgeoip1.lintian-overrides delete mode 100644 debian/libgeoip1t64.install delete mode 100644 debian/libgeoip1t64.lintian-overrides diff --git a/debian/control b/debian/control index 2cbc027..8bc0fd1 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Maintainer: Progress Linux Maintainers XSBC-Uploaders: Daniel Baumann XSBC-Original-Maintainer: Patrick Matthäi Bugs: mailto:maintainers@lists.progress-linux.org -Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), +Build-Depends: debhelper-compat (= 13), chrpath, zlib1g-dev, libtool @@ -15,10 +15,7 @@ Standards-Version: 4.6.2 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/geoip Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/geoip -Package: libgeoip1t64 -Provides: ${t64:Provides} -Replaces: libgeoip1 -Breaks: libgeoip1 (<< ${source:Version}) +Package: libgeoip1 Section: libs Architecture: any Pre-Depends: ${misc:Pre-Depends} @@ -40,7 +37,7 @@ Package: libgeoip-dev Section: libdevel Architecture: any Depends: ${misc:Depends}, - libgeoip1t64 (= ${binary:Version}), + libgeoip1 (= ${binary:Version}), geoip-bin (= ${binary:Version}) Description: Development files for the GeoIP library GeoIP is a C library that enables the user to find the country that any @@ -56,7 +53,7 @@ Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: libgeoip1t64 (<= 1.4.4.dfsg-2) +Replaces: libgeoip1 (<= 1.4.4.dfsg-2) Multi-Arch: foreign Description: IP lookup command line tools that use the GeoIP library GeoIP is a C library that enables the user to find the country that any diff --git a/debian/libgeoip1.install b/debian/libgeoip1.install new file mode 100644 index 0000000..4e7e24c --- /dev/null +++ b/debian/libgeoip1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/*/libGeoIP.so.* diff --git a/debian/libgeoip1.lintian-overrides b/debian/libgeoip1.lintian-overrides new file mode 100644 index 0000000..7d9e727 --- /dev/null +++ b/debian/libgeoip1.lintian-overrides @@ -0,0 +1,2 @@ +libgeoip1: spelling-error-in-binary +libgeoip1: no-symbols-control-file usr/lib/*/libGeoIP.so.* diff --git a/debian/libgeoip1t64.install b/debian/libgeoip1t64.install deleted file mode 100644 index 4e7e24c..0000000 --- a/debian/libgeoip1t64.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/*/libGeoIP.so.* diff --git a/debian/libgeoip1t64.lintian-overrides b/debian/libgeoip1t64.lintian-overrides deleted file mode 100644 index c788b1c..0000000 --- a/debian/libgeoip1t64.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -libgeoip1t64: spelling-error-in-binary -libgeoip1t64: no-symbols-control-file usr/lib/*/libGeoIP.so.* -libgeoip1t64: package-name-doesnt-match-sonames libgeoip1 -- cgit v1.2.3