From a3f06bf0f5b136e37f67e1e08ebd7c454208b8ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 20:23:54 +0200 Subject: Merging debian version 1.6.12-11.1. Signed-off-by: Daniel Baumann --- debian/changelog | 7 +++++++ debian/control | 11 +++++++---- debian/libgeoip1.install | 1 - debian/libgeoip1.lintian-overrides | 2 -- debian/libgeoip1t64.install | 1 + debian/libgeoip1t64.lintian-overrides | 3 +++ 6 files changed, 18 insertions(+), 7 deletions(-) delete mode 100644 debian/libgeoip1.install delete mode 100644 debian/libgeoip1.lintian-overrides create mode 100644 debian/libgeoip1t64.install create mode 100644 debian/libgeoip1t64.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 4b2021d..801acf3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +geoip (1.6.12-11.1) unstable; urgency=medium + + * Non-maintainer upload. + * Rename libraries for 64-bit time_t transition. Closes: #1062098 + + -- Steve Langasek Wed, 28 Feb 2024 16:54:53 +0000 + geoip (1.6.12-11~progress7.99u1) graograman-backports; urgency=medium * Initial reupload to graograman-backports. diff --git a/debian/control b/debian/control index 8bc0fd1..2cbc027 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: debhelper-compat (= 13), +Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), chrpath, zlib1g-dev, libtool @@ -15,7 +15,10 @@ 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: libgeoip1 +Package: libgeoip1t64 +Provides: ${t64:Provides} +Replaces: libgeoip1 +Breaks: libgeoip1 (<< ${source:Version}) Section: libs Architecture: any Pre-Depends: ${misc:Pre-Depends} @@ -37,7 +40,7 @@ Package: libgeoip-dev Section: libdevel Architecture: any Depends: ${misc:Depends}, - libgeoip1 (= ${binary:Version}), + libgeoip1t64 (= ${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 @@ -53,7 +56,7 @@ Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: libgeoip1 (<= 1.4.4.dfsg-2) +Replaces: libgeoip1t64 (<= 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 deleted file mode 100644 index 4e7e24c..0000000 --- a/debian/libgeoip1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/*/libGeoIP.so.* diff --git a/debian/libgeoip1.lintian-overrides b/debian/libgeoip1.lintian-overrides deleted file mode 100644 index 7d9e727..0000000 --- a/debian/libgeoip1.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libgeoip1: spelling-error-in-binary -libgeoip1: no-symbols-control-file usr/lib/*/libGeoIP.so.* diff --git a/debian/libgeoip1t64.install b/debian/libgeoip1t64.install new file mode 100644 index 0000000..4e7e24c --- /dev/null +++ b/debian/libgeoip1t64.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/*/libGeoIP.so.* diff --git a/debian/libgeoip1t64.lintian-overrides b/debian/libgeoip1t64.lintian-overrides new file mode 100644 index 0000000..c788b1c --- /dev/null +++ b/debian/libgeoip1t64.lintian-overrides @@ -0,0 +1,3 @@ +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