[Pkg-xmpp-devel] Bug#1062768: qxmpp: NMU diff for 64-bit time_t transition

[Benjamin Drung]

Source: qxmpp
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 qxmpp-1.5.5/debian/changelog qxmpp-1.5.5/debian/changelog
--- qxmpp-1.5.5/debian/changelog	2023-11-17 08:36:15.000000000 +0000
+++ qxmpp-1.5.5/debian/changelog	2024-02-29 22:41:32.000000000 +0000
@@ -1,3 +1,10 @@
+qxmpp (1.5.5-0.4) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062768
+
+ -- Benjamin Drung <bdrung at debian.org>  Thu, 29 Feb 2024 22:41:32 +0000
+
 qxmpp (1.5.5-0.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru qxmpp-1.5.5/debian/control qxmpp-1.5.5/debian/control
--- qxmpp-1.5.5/debian/control	2023-11-12 08:08:22.000000000 +0000
+++ qxmpp-1.5.5/debian/control	2024-02-29 22:41:32.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian XMPP Maintainers <pkg-xmpp-devel at lists.alioth.debian.org>
 Uploaders: Jeremy Lain? <jeremy.laine at m4x.org>, Boris Pek <tehnick at debian.org>
-Build-Depends: cmake,
+Build-Depends: dpkg-dev (>= 1.22.5), cmake,
                debhelper-compat (= 13),
                doxygen,
                graphviz,
@@ -18,10 +18,11 @@
 Vcs-Git: https://salsa.debian.org/xmpp-team/qxmpp.git
 Vcs-Browser: https://salsa.debian.org/xmpp-team/qxmpp
 
-Package: libqxmppqt5-4
+Package: libqxmppqt5-4t64
+Provides: ${t64:Provides}
 Architecture: any
-Replaces: libqxmpp0, libqxmpp1, libqxmpp2
-Breaks: libqxmpp0, libqxmpp1, libqxmpp2
+Replaces: libqxmppqt5-4, libqxmpp0, libqxmpp1, libqxmpp2
+Breaks: libqxmppqt5-4 (<< ${source:Version}), libqxmpp0, libqxmpp1, libqxmpp2
 Depends: gstreamer1.0-plugins-base,
          gstreamer1.0-plugins-good,
          gstreamer1.0-plugins-ugly,
@@ -34,7 +35,10 @@
  .
  This package contains the shared library.
 
-Package: libqxmppomemoqt5-4
+Package: libqxmppomemoqt5-4t64
+Provides: ${t64:Provides}
+Replaces: libqxmppomemoqt5-4
+Breaks: libqxmppomemoqt5-4 (<< ${source:Version})
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -49,8 +53,8 @@
 Section: libdevel
 Architecture: any
 Depends: libgstreamer1.0-dev,
-         libqxmppomemoqt5-4 (= ${binary:Version}),
-         libqxmppqt5-4 (= ${binary:Version}),
+         libqxmppomemoqt5-4t64 (= ${binary:Version}),
+         libqxmppqt5-4t64 (= ${binary:Version}),
          qtbase5-dev,
          ${misc:Depends}
 Breaks: libqxmpp-dev (<< 1.5.5-0.1~exp1~),
diff -Nru qxmpp-1.5.5/debian/libqxmppomemoqt5-4.install qxmpp-1.5.5/debian/libqxmppomemoqt5-4.install
--- qxmpp-1.5.5/debian/libqxmppomemoqt5-4.install	2023-11-12 07:35:41.000000000 +0000
+++ qxmpp-1.5.5/debian/libqxmppomemoqt5-4.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libQXmppOmemoQt5.so.1.*
-usr/lib/*/libQXmppOmemoQt5.so.4
diff -Nru qxmpp-1.5.5/debian/libqxmppomemoqt5-4t64.install qxmpp-1.5.5/debian/libqxmppomemoqt5-4t64.install
--- qxmpp-1.5.5/debian/libqxmppomemoqt5-4t64.install	1970-01-01 00:00:00.000000000 +0000
+++ qxmpp-1.5.5/debian/libqxmppomemoqt5-4t64.install	2023-11-12 07:35:41.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libQXmppOmemoQt5.so.1.*
+usr/lib/*/libQXmppOmemoQt5.so.4
diff -Nru qxmpp-1.5.5/debian/libqxmppomemoqt5-4t64.lintian-overrides qxmpp-1.5.5/debian/libqxmppomemoqt5-4t64.lintian-overrides
--- qxmpp-1.5.5/debian/libqxmppomemoqt5-4t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ qxmpp-1.5.5/debian/libqxmppomemoqt5-4t64.lintian-overrides	2024-02-29 22:41:23.000000000 +0000
@@ -0,0 +1 @@
+libqxmppomemoqt5-4t64: package-name-doesnt-match-sonames libqxmppomemoqt5-4
diff -Nru qxmpp-1.5.5/debian/libqxmppqt5-4.install qxmpp-1.5.5/debian/libqxmppqt5-4.install
--- qxmpp-1.5.5/debian/libqxmppqt5-4.install	2023-11-12 07:34:44.000000000 +0000
+++ qxmpp-1.5.5/debian/libqxmppqt5-4.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libQXmppQt5.so.1.*
-usr/lib/*/libQXmppQt5.so.4
diff -Nru qxmpp-1.5.5/debian/libqxmppqt5-4.lintian-overrides qxmpp-1.5.5/debian/libqxmppqt5-4.lintian-overrides
--- qxmpp-1.5.5/debian/libqxmppqt5-4.lintian-overrides	2023-11-12 07:22:08.000000000 +0000
+++ qxmpp-1.5.5/debian/libqxmppqt5-4.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# There is no stable ABI in this library, only stable API is available.
-libqxmppqt5-4: no-symbols-control-file
diff -Nru qxmpp-1.5.5/debian/libqxmppqt5-4t64.install qxmpp-1.5.5/debian/libqxmppqt5-4t64.install
--- qxmpp-1.5.5/debian/libqxmppqt5-4t64.install	1970-01-01 00:00:00.000000000 +0000
+++ qxmpp-1.5.5/debian/libqxmppqt5-4t64.install	2023-11-12 07:34:44.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libQXmppQt5.so.1.*
+usr/lib/*/libQXmppQt5.so.4
diff -Nru qxmpp-1.5.5/debian/libqxmppqt5-4t64.lintian-overrides qxmpp-1.5.5/debian/libqxmppqt5-4t64.lintian-overrides
--- qxmpp-1.5.5/debian/libqxmppqt5-4t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ qxmpp-1.5.5/debian/libqxmppqt5-4t64.lintian-overrides	2024-02-29 22:41:23.000000000 +0000
@@ -0,0 +1,3 @@
+# There is no stable ABI in this library, only stable API is available.
+libqxmppqt5-4t64: no-symbols-control-file
+libqxmppqt5-4t64: package-name-doesnt-match-sonames libqxmppqt5-4