[Debian-iot-maintainers] Bug#1064265: openzwave: NMU diff for 64-bit time_t transition

[Benjamin Drung]

Source: openzwave
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 openzwave-1.6.1914+ds/debian/changelog openzwave-1.6.1914+ds/debian/changelog
--- openzwave-1.6.1914+ds/debian/changelog	2021-10-21 19:17:21.000000000 +0000
+++ openzwave-1.6.1914+ds/debian/changelog	2024-02-29 18:55:23.000000000 +0000
@@ -1,3 +1,12 @@
+openzwave (1.6.1914+ds-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1064265
+  * d/libopenzwave1.6-dev: pkgconfig file will be in
+    /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+
+ -- Benjamin Drung <bdrung at debian.org>  Thu, 29 Feb 2024 18:55:23 +0000
+
 openzwave (1.6.1914+ds-1) unstable; urgency=medium
 
   * Team upload
diff -Nru openzwave-1.6.1914+ds/debian/control openzwave-1.6.1914+ds/debian/control
--- openzwave-1.6.1914+ds/debian/control	2021-10-21 19:17:21.000000000 +0000
+++ openzwave-1.6.1914+ds/debian/control	2024-02-29 18:55:23.000000000 +0000
@@ -3,7 +3,7 @@
 Uploaders: Thorsten Alteholz <debian at alteholz.de>
 Section: devel
 Priority: optional
-Build-Depends: debhelper-compat (= 13)
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13)
 	, dh-exec (>=0.2)
 	, libudev-dev
 	, libxml2-utils
@@ -14,9 +14,10 @@
 Vcs-Git: https://salsa.debian.org/debian-iot-team/openzwave.git
 Rules-Requires-Root: no
 
-Package: libopenzwave1.6
-Replaces: libopenzwave1.5
-Breaks: libopenzwave1.5
+Package: libopenzwave1.6t64
+Provides: ${t64:Provides}
+Replaces: libopenzwave1.6, libopenzwave1.5
+Breaks: libopenzwave1.6 (<< ${source:Version}), libopenzwave1.5
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
@@ -31,7 +32,7 @@
 
 Package: libopenzwave1.6-dev
 Section: libdevel
-Depends: ${misc:Depends}, libopenzwave1.6 (= ${binary:Version})
+Depends: ${misc:Depends}, libopenzwave1.6t64 (= ${binary:Version})
 Suggests: libopenzwave-doc
 Architecture: any
 Description: header files for the openzwave library
@@ -57,7 +58,7 @@
 Package: openzwave
 Section: misc
 Architecture: any
-Depends: libopenzwave1.6 (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libopenzwave1.6t64 (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Sample Program for libopenzwave
  OpenZWave is an open-source, cross-platform library designed to enable
  anyone to add support for Z-Wave home-automation devices to their
diff -Nru openzwave-1.6.1914+ds/debian/libopenzwave1.6-dev.install openzwave-1.6.1914+ds/debian/libopenzwave1.6-dev.install
--- openzwave-1.6.1914+ds/debian/libopenzwave1.6-dev.install	2021-10-21 19:17:21.000000000 +0000
+++ openzwave-1.6.1914+ds/debian/libopenzwave1.6-dev.install	2024-02-29 18:55:23.000000000 +0000
@@ -3,4 +3,4 @@
 usr/lib/*/libopenzwave.so
 usr/include/openzwave/*
 cpp/tinyxml/*.h usr/include/openzwave/tinyxml
-usr/lib/pkgconfig/* usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/*
diff -Nru openzwave-1.6.1914+ds/debian/libopenzwave1.6.install openzwave-1.6.1914+ds/debian/libopenzwave1.6.install
--- openzwave-1.6.1914+ds/debian/libopenzwave1.6.install	2021-10-21 19:17:21.000000000 +0000
+++ openzwave-1.6.1914+ds/debian/libopenzwave1.6.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libopenzwave.so.*
-etc/openzwave/*
diff -Nru openzwave-1.6.1914+ds/debian/libopenzwave1.6.lintian-overrides openzwave-1.6.1914+ds/debian/libopenzwave1.6.lintian-overrides
--- openzwave-1.6.1914+ds/debian/libopenzwave1.6.lintian-overrides	2021-10-21 19:17:21.000000000 +0000
+++ openzwave-1.6.1914+ds/debian/libopenzwave1.6.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-# this is a modified version
-libopenzwave1.6: embedded-library tinyxml usr/lib/x86_64-linux-gnu/libopenzwave.so.1.6
-#due to arch- and optimisation-dependent symbols the symbols-file is not
-#maintainable and FTBSs occur on lots of architectures
-libopenzwave1.6: no-symbols-control-file
diff -Nru openzwave-1.6.1914+ds/debian/libopenzwave1.6t64.install openzwave-1.6.1914+ds/debian/libopenzwave1.6t64.install
--- openzwave-1.6.1914+ds/debian/libopenzwave1.6t64.install	1970-01-01 00:00:00.000000000 +0000
+++ openzwave-1.6.1914+ds/debian/libopenzwave1.6t64.install	2021-10-21 19:17:21.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libopenzwave.so.*
+etc/openzwave/*
diff -Nru openzwave-1.6.1914+ds/debian/libopenzwave1.6t64.lintian-overrides openzwave-1.6.1914+ds/debian/libopenzwave1.6t64.lintian-overrides
--- openzwave-1.6.1914+ds/debian/libopenzwave1.6t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ openzwave-1.6.1914+ds/debian/libopenzwave1.6t64.lintian-overrides	2024-02-29 18:55:18.000000000 +0000
@@ -0,0 +1,6 @@
+# this is a modified version
+libopenzwave1.6t64: embedded-library tinyxml usr/lib/x86_64-linux-gnu/libopenzwave.so.1.6
+#due to arch- and optimisation-dependent symbols the symbols-file is not
+#maintainable and FTBSs occur on lots of architectures
+libopenzwave1.6t64: no-symbols-control-file
+libopenzwave1.6t64: package-name-doesnt-match-sonames libopenzwave1.6