[Debian-on-mobile-maintainers] Bug#1062876: s2geometry: NMU diff for 64-bit time_t transition

[Benjamin Drung]

Source: s2geometry
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'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-21-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
-------------- next part --------------
diff -Nru s2geometry-0.10.0/debian/changelog s2geometry-0.10.0/debian/changelog
--- s2geometry-0.10.0/debian/changelog	2022-11-21 07:50:19.000000000 +0000
+++ s2geometry-0.10.0/debian/changelog	2024-02-29 15:37:54.000000000 +0000
@@ -1,3 +1,10 @@
+s2geometry (0.10.0-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062876
+
+ -- Benjamin Drung <bdrung at debian.org>  Thu, 29 Feb 2024 15:37:54 +0000
+
 s2geometry (0.10.0-6) unstable; urgency=medium
 
   * Team upload.
diff -Nru s2geometry-0.10.0/debian/control s2geometry-0.10.0/debian/control
--- s2geometry-0.10.0/debian/control	2022-11-21 07:28:01.000000000 +0000
+++ s2geometry-0.10.0/debian/control	2024-02-29 15:37:54.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: DebianOnMobile Team <debian-on-mobile-maintainers at alioth-lists.debian.net>
 Uploaders: Sebastian Spaeth <Sebastian at SSpaeth.de>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
                cmake, libssl-dev, libabsl-dev (>= 0~20220623),
                dh-sequence-python3, python3-all-dev, swig (>= 4.0)
 Standards-Version: 4.6.1
@@ -17,7 +17,10 @@
 Vcs-Git: https://salsa.debian.org/DebianOnMobile-team/s2geometry.git
 Vcs-Browser: https://salsa.debian.org/DebianOnMobile-team/s2geometry
 
-Package: libs2-0
+Package: libs2-0t64
+Provides: ${t64:Provides}
+Replaces: libs2-0
+Breaks: libs2-0 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -30,7 +33,7 @@
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libs2-0 (= ${binary:Version}), ${misc:Depends},
+Depends: libs2-0t64 (= ${binary:Version}), ${misc:Depends},
          libssl-dev, libabsl-dev (>= 0~20220623)
 Description: ${source:Synopsis} - dev files
  ${source:Extended-Description}
@@ -40,7 +43,7 @@
 Package: python3-pywraps2
 Architecture: any
 Section: python
-Depends: libs2-0 (= ${binary:Version}),
+Depends: libs2-0t64 (= ${binary:Version}),
          ${shlibs:Depends}, ${misc:Depends},
          ${python3:Depends}
 Description: ${source:Synopsis} - Python bindings
diff -Nru s2geometry-0.10.0/debian/libs2-0.install s2geometry-0.10.0/debian/libs2-0.install
--- s2geometry-0.10.0/debian/libs2-0.install	2022-11-21 07:28:01.000000000 +0000
+++ s2geometry-0.10.0/debian/libs2-0.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/usr/lib/*/libs2.so.*
diff -Nru s2geometry-0.10.0/debian/libs2-0t64.install s2geometry-0.10.0/debian/libs2-0t64.install
--- s2geometry-0.10.0/debian/libs2-0t64.install	1970-01-01 00:00:00.000000000 +0000
+++ s2geometry-0.10.0/debian/libs2-0t64.install	2022-11-21 07:28:01.000000000 +0000
@@ -0,0 +1 @@
+/usr/lib/*/libs2.so.*
diff -Nru s2geometry-0.10.0/debian/libs2-0t64.lintian-overrides s2geometry-0.10.0/debian/libs2-0t64.lintian-overrides
--- s2geometry-0.10.0/debian/libs2-0t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ s2geometry-0.10.0/debian/libs2-0t64.lintian-overrides	2024-02-29 15:37:46.000000000 +0000
@@ -0,0 +1 @@
+libs2-0t64: package-name-doesnt-match-sonames libs2-0