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 xdelta-1.1.3/debian/changelog xdelta-1.1.3/debian/changelog
--- xdelta-1.1.3/debian/changelog       2021-12-31 16:50:22.000000000 +0000
+++ xdelta-1.1.3/debian/changelog       2024-02-29 06:20:41.000000000 +0000
@@ -1,3 +1,10 @@
+xdelta (1.1.3-10.5) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063251
+
+ -- Steve Langasek <vor...@debian.org>  Thu, 29 Feb 2024 06:20:41 +0000
+
 xdelta (1.1.3-10.4) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru xdelta-1.1.3/debian/control xdelta-1.1.3/debian/control
--- xdelta-1.1.3/debian/control 2021-12-31 16:50:22.000000000 +0000
+++ xdelta-1.1.3/debian/control 2024-02-29 06:20:41.000000000 +0000
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: LaMont Jones <lam...@debian.org>
-Build-Depends: debhelper-compat (= 13), libglib2.0-dev, zlib1g-dev, pkgconf | 
pkg-config
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), libglib2.0-dev, 
zlib1g-dev, pkgconf | pkg-config
 Standards-Version: 4.6.0
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/debian/xdelta
@@ -20,7 +20,10 @@
  these deltas to a copy of the original file.  Xdelta uses a fast,
  linear algorithm and performs well on both binary and text files.
 
-Package: libxdelta2
+Package: libxdelta2t64
+Provides: ${t64:Provides}
+Replaces: libxdelta2
+Breaks: libxdelta2 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -39,7 +42,7 @@
 Package: libxdelta2-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libxdelta2 (= ${binary:Version})
+Depends: ${misc:Depends}, libxdelta2t64 (= ${binary:Version})
 Breaks: xdelta (<< 1.1.3-9.3~)
 Replaces: xdelta-dev, xdelta (<< 1.1.3-9.3~)
 Conflicts: libxdelta0-dev, libxdelta1-dev
diff -Nru xdelta-1.1.3/debian/libxdelta2.install 
xdelta-1.1.3/debian/libxdelta2.install
--- xdelta-1.1.3/debian/libxdelta2.install      2021-12-31 16:50:22.000000000 
+0000
+++ xdelta-1.1.3/debian/libxdelta2.install      1970-01-01 00:00:00.000000000 
+0000
@@ -1 +0,0 @@
-usr/lib/*/*.so.*
diff -Nru xdelta-1.1.3/debian/libxdelta2.shlibs 
xdelta-1.1.3/debian/libxdelta2.shlibs
--- xdelta-1.1.3/debian/libxdelta2.shlibs       2021-12-31 16:50:22.000000000 
+0000
+++ xdelta-1.1.3/debian/libxdelta2.shlibs       1970-01-01 00:00:00.000000000 
+0000
@@ -1,2 +0,0 @@
-libxdelta 2 libxdelta2 (>= 1.1.3)
-libedsio 0 libxdelta2 (>= 1.1.3)
diff -Nru xdelta-1.1.3/debian/libxdelta2t64.install 
xdelta-1.1.3/debian/libxdelta2t64.install
--- xdelta-1.1.3/debian/libxdelta2t64.install   1970-01-01 00:00:00.000000000 
+0000
+++ xdelta-1.1.3/debian/libxdelta2t64.install   2021-12-31 16:50:22.000000000 
+0000
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff -Nru xdelta-1.1.3/debian/libxdelta2t64.lintian-overrides 
xdelta-1.1.3/debian/libxdelta2t64.lintian-overrides
--- xdelta-1.1.3/debian/libxdelta2t64.lintian-overrides 1970-01-01 
00:00:00.000000000 +0000
+++ xdelta-1.1.3/debian/libxdelta2t64.lintian-overrides 2024-02-29 
06:20:32.000000000 +0000
@@ -0,0 +1 @@
+libxdelta2t64: package-name-doesnt-match-sonames libxdelta2
diff -Nru xdelta-1.1.3/debian/libxdelta2t64.shlibs 
xdelta-1.1.3/debian/libxdelta2t64.shlibs
--- xdelta-1.1.3/debian/libxdelta2t64.shlibs    1970-01-01 00:00:00.000000000 
+0000
+++ xdelta-1.1.3/debian/libxdelta2t64.shlibs    2024-02-29 06:20:32.000000000 
+0000
@@ -0,0 +1,2 @@
+libxdelta 2 libxdelta2t64 (>= 1.1.3)
+libedsio 0 libxdelta2t64 (>= 1.1.3)

Reply via email to