Bug#1063306: zbar: NMU diff for 64-bit time_t transition

2024-02-29 Thread Steve Langasek
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-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 zbar-0.23.93/debian/changelog zbar-0.23.93/debian/changelog
--- zbar-0.23.93/debian/changelog   2024-01-10 15:57:46.0 +
+++ zbar-0.23.93/debian/changelog   2024-02-29 08:15:04.0 +
@@ -1,3 +1,10 @@
+zbar (0.23.93-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063306
+
+ -- Steve Langasek   Thu, 29 Feb 2024 08:15:04 +
+
 zbar (0.23.93-1) unstable; urgency=medium
 
   * Acknowledge NMU.
diff -Nru zbar-0.23.93/debian/control zbar-0.23.93/debian/control
--- zbar-0.23.93/debian/control 2024-01-09 12:25:49.0 +
+++ zbar-0.23.93/debian/control 2024-02-29 08:15:04.0 +
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Boyuan Yang 
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  debhelper-compat (= 13),
  dh-exec,
  dh-sequence-python3,
@@ -47,7 +47,7 @@
 Depends:
  libmagick++-dev,
  libx11-dev,
- libzbar0 (= ${binary:Version}),
+ libzbar0t64 (= ${binary:Version}),
  gir1.2-zbar-1.0 (= ${binary:Version}),
  ${misc:Depends},
 Description: QR code / bar code scanner and decoder (development)
@@ -57,7 +57,10 @@
  .
  This package contains the development files.
 
-Package: libzbar0
+Package: libzbar0t64
+Provides: ${t64:Provides}
+Replaces: libzbar0
+Breaks: libzbar0 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends:
@@ -82,7 +85,7 @@
 Depends:
  libgtk-3-dev,
  libzbar-dev (= ${binary:Version}),
- libzbargtk0 (= ${binary:Version}),
+ libzbargtk0t64 (= ${binary:Version}),
  ${misc:Depends},
 Description: QR code / bar code scanner and decoder (GTK+ bindings development)
  ZBar is a library for scanning and decoding bar codes from various sources
@@ -91,13 +94,16 @@
  .
  This package contains the development files for the GTK+ bindings.
 
-Package: libzbargtk0
+Package: libzbargtk0t64
+Provides: ${t64:Provides}
+Replaces: libzbargtk0
+Breaks: libzbargtk0 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
- libzbar0 (= ${binary:Version}),
+ libzbar0t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: QR code / bar code scanner and decoder (GTK+ bindings)
@@ -114,7 +120,7 @@
 Depends:
  libqt5x11extras5-dev,
  libzbar-dev (= ${binary:Version}),
- libzbarqt0 (= ${binary:Version}),
+ libzbarqt0t64 (= ${binary:Version}),
  qtbase5-dev,
  ${misc:Depends},
 Description: QR code / bar code scanner and decoder (Qt binding development)
@@ -124,11 +130,14 @@
  .
  This package contains the development files for the Qt binding.
 
-Package: libzbarqt0
+Package: libzbarqt0t64
+Provides: ${t64:Provides}
+Replaces: libzbarqt0
+Breaks: libzbarqt0 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Depends:
- libzbar0 (= ${binary:Version}),
+ libzbar0t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: QR code / bar code scanner and decoder (Qt binding)
@@ -143,7 +152,7 @@
 Architecture: any
 Multi-Arch: same
 Depends:
- libzbar0 (= ${binary:Version}),
+ libzbar0t64 (= ${binary:Version}),
  ${misc:Depends},
  ${python3:Depends},
  ${shlibs:Depends},
@@ -158,7 +167,7 @@
 Section: graphics
 Architecture: any
 Depends:
- libzbar0 (= ${binary:Version}),
+ libzbar0t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Suggests:
@@ -176,7 +185,7 @@
 Section: utils
 Architecture: linux-any
 Depends:
- libzbargtk0 (= ${binary:Version}),
+ libzbargtk0t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: QR code / bar code scanner and decoder (Gtk camera tool)
@@ -190,7 +199,7 @@
 Section: utils
 Architecture: linux-any
 Depends:
- libzbarqt0 (= ${binary:Version}),
+ libzbarqt0t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: QR code / bar code scanner and decoder (Qt camera tool)
diff -Nru zbar-0.23.93/debian/libzbar0.install 
zbar-0.23.93/debian/libzbar0.install
--- zbar-0.23.93/debian/libzbar0.install2021-10-06 17:48:28.0 
+
+++ zbar-0.23.93/debian/libzbar0.install1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-/usr/lib/*/libzbar.so.*
diff -Nru zbar-0.23.93/debian/libzbar0.symbols 
zbar-0.23.93/debian/libzbar0.symbols
--- 

Bug#1063306: zbar: NMU diff for 64-bit time_t transition

2024-02-05 Thread Steve Langasek
Source: zbar
Version: 0.23.93-1
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
zbar 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 zbar
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'), (500, 'testing'), (500, 'stable'), (1, 
'experimental')
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 zbar-0.23.93/debian/changelog zbar-0.23.93/debian/changelog
--- zbar-0.23.93/debian/changelog   2024-01-10 15:57:46.0 +
+++ zbar-0.23.93/debian/changelog   2024-02-06 03:25:17.0 +
@@ -1,3 +1,10 @@
+zbar (0.23.93-1.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Tue, 06 Feb 2024 03:25:17 +
+
 zbar (0.23.93-1) unstable; urgency=medium
 
   * Acknowledge NMU.
diff -Nru zbar-0.23.93/debian/control zbar-0.23.93/debian/control
--- zbar-0.23.93/debian/control 2024-01-09 12:25:49.0 +
+++ zbar-0.23.93/debian/control 2024-02-06 03:25:17.0 +
@@ -47,7 +47,7 @@
 Depends:
  libmagick++-dev,
  libx11-dev,
- libzbar0 (= ${binary:Version}),
+ libzbar0t64 (= ${binary:Version}),
  gir1.2-zbar-1.0 (= ${binary:Version}),
  ${misc:Depends},
 Description: QR code / bar code scanner and decoder (development)
@@ -57,7 +57,10 @@
  .
  This package contains the development files.
 
-Package: libzbar0
+Package: libzbar0t64
+Provides: ${t64:Provides}
+Replaces: libzbar0
+Breaks: libzbar0 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends:
@@ -82,7 +85,7 @@
 Depends:
  libgtk-3-dev,
  libzbar-dev (= ${binary:Version}),
- libzbargtk0 (= ${binary:Version}),
+ libzbargtk0t64 (= ${binary:Version}),
  ${misc:Depends},
 Description: QR code / bar code scanner and decoder (GTK+ bindings development)
  ZBar is a library for scanning and decoding bar codes from various sources
@@ -91,13 +94,16 @@
  .
  This package contains the development files for the GTK+ bindings.
 
-Package: libzbargtk0
+Package: libzbargtk0t64
+Provides: ${t64:Provides}
+Replaces: libzbargtk0
+Breaks: libzbargtk0 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
- libzbar0 (= ${binary:Version}),
+ libzbar0t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: QR code / bar code scanner and decoder (GTK+ bindings)
@@ -114,7 +120,7 @@
 Depends:
  libqt5x11extras5-dev,
  libzbar-dev (= ${binary:Version}),
- libzbarqt0 (= ${binary:Version}),
+ libzbarqt0t64 (= ${binary:Version}),
  qtbase5-dev,
  ${misc:Depends},
 Description: QR code / bar code scanner and decoder (Qt binding development)
@@ -124,11 +130,14 @@
  .
  This package contains the development files for the Qt binding.
 
-Package: libzbarqt0
+Package: libzbarqt0t64
+Provides: ${t64:Provides}
+Replaces: libzbarqt0
+Breaks: libzbarqt0 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Depends:
- libzbar0 (= ${binary:Version}),
+ libzbar0t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: QR code / bar code scanner and decoder (Qt binding)
@@ -143,7 +152,7 @@
 Architecture: any
 Multi-Arch: same