Dear maintainer,

Please find attached a final version of this patch for the time_t
transition.  This patch is being uploaded to unstable.

Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.

Thanks!


-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru geoip-1.6.12/debian/changelog geoip-1.6.12/debian/changelog
--- geoip-1.6.12/debian/changelog       2023-07-04 13:32:46.000000000 +0000
+++ geoip-1.6.12/debian/changelog       2024-02-28 16:54:53.000000000 +0000
@@ -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 <vor...@debian.org>  Wed, 28 Feb 2024 16:54:53 +0000
+
 geoip (1.6.12-11) unstable; urgency=medium
 
   * Update debian/copyright.
diff -Nru geoip-1.6.12/debian/control geoip-1.6.12/debian/control
--- geoip-1.6.12/debian/control 2023-07-04 13:32:46.000000000 +0000
+++ geoip-1.6.12/debian/control 2024-02-28 16:54:53.000000000 +0000
@@ -3,14 +3,17 @@
 Priority: optional
 Homepage: https://www.maxmind.com/
 Maintainer: Patrick Matthäi <pmatth...@debian.org>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
  chrpath,
  zlib1g-dev,
  libtool
 Rules-Requires-Root: no
 Standards-Version: 4.6.2
 
-Package: libgeoip1
+Package: libgeoip1t64
+Provides: ${t64:Provides}
+Replaces: libgeoip1
+Breaks: libgeoip1 (<< ${source:Version})
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
@@ -32,7 +35,7 @@
 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
@@ -48,7 +51,7 @@
 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 -Nru geoip-1.6.12/debian/libgeoip1.install 
geoip-1.6.12/debian/libgeoip1.install
--- geoip-1.6.12/debian/libgeoip1.install       2023-07-04 13:32:46.000000000 
+0000
+++ geoip-1.6.12/debian/libgeoip1.install       1970-01-01 00:00:00.000000000 
+0000
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/libGeoIP.so.*
diff -Nru geoip-1.6.12/debian/libgeoip1.lintian-overrides 
geoip-1.6.12/debian/libgeoip1.lintian-overrides
--- geoip-1.6.12/debian/libgeoip1.lintian-overrides     2023-07-04 
13:32:46.000000000 +0000
+++ geoip-1.6.12/debian/libgeoip1.lintian-overrides     1970-01-01 
00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-libgeoip1: spelling-error-in-binary
-libgeoip1: no-symbols-control-file usr/lib/*/libGeoIP.so.*
diff -Nru geoip-1.6.12/debian/libgeoip1t64.install 
geoip-1.6.12/debian/libgeoip1t64.install
--- geoip-1.6.12/debian/libgeoip1t64.install    1970-01-01 00:00:00.000000000 
+0000
+++ geoip-1.6.12/debian/libgeoip1t64.install    2023-07-04 13:32:46.000000000 
+0000
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/libGeoIP.so.*
diff -Nru geoip-1.6.12/debian/libgeoip1t64.lintian-overrides 
geoip-1.6.12/debian/libgeoip1t64.lintian-overrides
--- geoip-1.6.12/debian/libgeoip1t64.lintian-overrides  1970-01-01 
00:00:00.000000000 +0000
+++ geoip-1.6.12/debian/libgeoip1t64.lintian-overrides  2024-02-28 
16:54:47.000000000 +0000
@@ -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

Reply via email to