Bug#1062936: sword: NMU diff for 64-bit time_t transition

2024-02-29 Thread Benjamin Drung
Source: sword
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
diff -Nru sword-1.9.0+dfsg/debian/changelog sword-1.9.0+dfsg/debian/changelog
--- sword-1.9.0+dfsg/debian/changelog   2023-10-27 22:32:31.0 +
+++ sword-1.9.0+dfsg/debian/changelog   2024-02-29 17:52:34.0 +
@@ -1,3 +1,10 @@
+sword (1.9.0+dfsg-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062936
+
+ -- Benjamin Drung   Thu, 29 Feb 2024 17:52:34 +
+
 sword (1.9.0+dfsg-5) unstable; urgency=medium
 
   * Team upload
diff -Nru sword-1.9.0+dfsg/debian/control sword-1.9.0+dfsg/debian/control
--- sword-1.9.0+dfsg/debian/control 2023-10-27 22:32:31.0 +
+++ sword-1.9.0+dfsg/debian/control 2024-02-29 17:52:34.0 +
@@ -1,5 +1,5 @@
 Source: sword
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
dh-python,
libbz2-dev,
liblzma-dev,
@@ -25,13 +25,14 @@
 Vcs-Browser: https://salsa.debian.org/pkg-crosswire-team/sword
 Vcs-Git: https://salsa.debian.org/pkg-crosswire-team/sword.git
 
-Package: libsword1.9.0
+Package: libsword1.9.0t64
+Provides: ${t64:Provides}
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libsword-common, ${shlibs:Depends}, ${misc:Depends}
 Recommends: sword-frontend
-Breaks: libsword11v5 (>= 1.8), libsword-1.8.1
-Replaces: libsword11v5 (>= 1.8), libsword-1.8.1
+Breaks: libsword1.9.0 (<< ${source:Version}), libsword11v5 (>= 1.8), 
libsword-1.8.1
+Replaces: libsword1.9.0, libsword11v5 (>= 1.8), libsword-1.8.1
 Multi-Arch: same
 Description: API/library for bible software
  The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
@@ -48,7 +49,7 @@
 Package: libsword-dev
 Architecture: any
 Section: libdevel
-Depends: libsword1.9.0 (= ${binary:Version}), ${misc:Depends}
+Depends: libsword1.9.0t64 (= ${binary:Version}), ${misc:Depends}
 Recommends: libsword-utils
 Multi-Arch: same
 Description: Development files for libsword
diff -Nru sword-1.9.0+dfsg/debian/libsword1.9.0.docs 
sword-1.9.0+dfsg/debian/libsword1.9.0.docs
--- sword-1.9.0+dfsg/debian/libsword1.9.0.docs  2023-10-27 22:32:31.0 
+
+++ sword-1.9.0+dfsg/debian/libsword1.9.0.docs  1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-doc/translation-template.conf
diff -Nru sword-1.9.0+dfsg/debian/libsword1.9.0.install 
sword-1.9.0+dfsg/debian/libsword1.9.0.install
--- sword-1.9.0+dfsg/debian/libsword1.9.0.install   2023-10-27 
22:32:31.0 +
+++ sword-1.9.0+dfsg/debian/libsword1.9.0.install   1970-01-01 
00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libsword.so.*
diff -Nru sword-1.9.0+dfsg/debian/libsword1.9.0t64.docs 
sword-1.9.0+dfsg/debian/libsword1.9.0t64.docs
--- sword-1.9.0+dfsg/debian/libsword1.9.0t64.docs   1970-01-01 
00:00:00.0 +
+++ sword-1.9.0+dfsg/debian/libsword1.9.0t64.docs   2023-10-27 
22:32:31.0 +
@@ -0,0 +1 @@
+doc/translation-template.conf
diff -Nru sword-1.9.0+dfsg/debian/libsword1.9.0t64.install 
sword-1.9.0+dfsg/debian/libsword1.9.0t64.install
--- sword-1.9.0+dfsg/debian/libsword1.9.0t64.install1970-01-01 
00:00:00.0 +
+++ sword-1.9.0+dfsg/debian/libsword1.9.0t64.install2023-10-27 
22:32:31.0 +
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libsword.so.*
diff -Nru sword-1.9.0+dfsg/debian/libsword1.9.0t64.lintian-overrides 
sword-1.9.0+dfsg/debian/libsword1.9.0t64.lintian-overrides
--- sword-1.9.0+dfsg/debian/libsword1.9.0t64.lintian-overrides  1970-01-01 
00:00:00.0 +
+++ sword-1.9.0+dfsg/debian/libsword1.9.0t64.lintian-overrides  2024-02-29 
17:52:29.0 +
@@ -0,0 +1 @@
+libsword1.9.0t64: package-name-doesnt-match-sonames libsword1.9.0


Bug#1062936: sword: NMU diff for 64-bit time_t transition

2024-02-03 Thread Steve Langasek
Source: sword
Version: 1.9.0+dfsg-5
Severity: serious
Tags: patch pending sid trixie
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t

NOTICE: these changes must not be uploaded to unstable yet!

Dear maintainer,

As part of the 64-bit time_t transition required to support 32-bit
architectures in 2038 and beyond
(https://wiki.debian.org/ReleaseGoals/64bit-time), we have identified
sword as a source package shipping runtime libraries whose ABI
either is affected by the change in size of time_t, or could not be
analyzed via abi-compliance-checker (and therefore to be on the safe
side we assume is affected).

To ensure that inconsistent combinations of libraries with their
reverse-dependencies are never installed together, it is necessary to
have a library transition, which is most easily done by renaming the
runtime library package.

Since turning on 64-bit time_t is being handled centrally through a change
to the default dpkg-buildflags (https://bugs.debian.org/1037136), it is
important that libraries affected by this ABI change all be uploaded close
together in time.  Therefore I have prepared a 0-day NMU for sword
which will initially be uploaded to experimental if possible, then to
unstable after packages have cleared binary NEW.

Please find the patch for this NMU attached.

If you have any concerns about this patch, please reach out ASAP.  Although
this package will be uploaded to experimental immediately, there will be a
period of several days before we begin uploads to unstable; so if information
becomes available that your package should not be included in the transition,
there is time for us to amend the planned uploads.



-- 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 sword-1.9.0+dfsg/debian/changelog sword-1.9.0+dfsg/debian/changelog
--- sword-1.9.0+dfsg/debian/changelog   2023-10-27 22:32:31.0 +
+++ sword-1.9.0+dfsg/debian/changelog   2024-02-04 03:18:52.0 +
@@ -1,3 +1,10 @@
+sword (1.9.0+dfsg-5.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Sun, 04 Feb 2024 03:18:52 +
+
 sword (1.9.0+dfsg-5) unstable; urgency=medium
 
   * Team upload
diff -Nru sword-1.9.0+dfsg/debian/control sword-1.9.0+dfsg/debian/control
--- sword-1.9.0+dfsg/debian/control 2023-10-27 22:32:31.0 +
+++ sword-1.9.0+dfsg/debian/control 2024-02-04 03:18:52.0 +
@@ -25,13 +25,14 @@
 Vcs-Browser: https://salsa.debian.org/pkg-crosswire-team/sword
 Vcs-Git: https://salsa.debian.org/pkg-crosswire-team/sword.git
 
-Package: libsword1.9.0
+Package: libsword1.9.0t64
+Provides: ${t64:Provides}
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libsword-common, ${shlibs:Depends}, ${misc:Depends}
 Recommends: sword-frontend
-Breaks: libsword11v5 (>= 1.8), libsword-1.8.1
-Replaces: libsword11v5 (>= 1.8), libsword-1.8.1
+Breaks: libsword1.9.0 (<< ${source:Version}), libsword11v5 (>= 1.8), 
libsword-1.8.1
+Replaces: libsword1.9.0, libsword11v5 (>= 1.8), libsword-1.8.1
 Multi-Arch: same
 Description: API/library for bible software
  The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
@@ -48,7 +49,7 @@
 Package: libsword-dev
 Architecture: any
 Section: libdevel
-Depends: libsword1.9.0 (= ${binary:Version}), ${misc:Depends}
+Depends: libsword1.9.0t64 (= ${binary:Version}), ${misc:Depends}
 Recommends: libsword-utils
 Multi-Arch: same
 Description: Development files for libsword
diff -Nru sword-1.9.0+dfsg/debian/libsword1.9.0.docs 
sword-1.9.0+dfsg/debian/libsword1.9.0.docs
--- sword-1.9.0+dfsg/debian/libsword1.9.0.docs  2023-10-27 22:32:31.0 
+
+++ sword-1.9.0+dfsg/debian/libsword1.9.0.docs  1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-doc/translation-template.conf
diff -Nru sword-1.9.0+dfsg/debian/libsword1.9.0.install 
sword-1.9.0+dfsg/debian/libsword1.9.0.install
--- sword-1.9.0+dfsg/debian/libsword1.9.0.install   2023-10-27 
22:32:31.0 +
+++ sword-1.9.0+dfsg/debian/libsword1.9.0.install   1970-01-01 
00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libsword.so.*
diff -Nru sword-1.9.0+dfsg/debian/libsword1.9.0t64.docs 
sword-1.9.0+dfsg/debian/libsword1.9.0t64.docs
--- sword-1.9.0+dfsg/debian/libsword1.9.0t64.docs   1970-01-01 
00:00:00.0 +
+++ sword-1.9.0+dfsg/debian/libsword1.9.0t64.docs   2023-10-27 
22:32:31.0 +
@@ -0,0 +1 @@
+doc/translation-template.conf
diff -Nru sword-1.9.0+dfsg/debian/libsword1.9.0t64.install