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 xdmf-3.0+git20190531/debian/changelog 
xdmf-3.0+git20190531/debian/changelog
--- xdmf-3.0+git20190531/debian/changelog       2024-02-03 08:04:51.000000000 
+0000
+++ xdmf-3.0+git20190531/debian/changelog       2024-02-29 06:23:26.000000000 
+0000
@@ -1,3 +1,10 @@
+xdmf (3.0+git20190531-13.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063291
+
+ -- Steve Langasek <vor...@debian.org>  Thu, 29 Feb 2024 06:23:26 +0000
+
 xdmf (3.0+git20190531-13) unstable; urgency=medium
 
   * Standards-Version: 4.6.2
diff -Nru xdmf-3.0+git20190531/debian/control 
xdmf-3.0+git20190531/debian/control
--- xdmf-3.0+git20190531/debian/control 2024-02-03 08:04:51.000000000 +0000
+++ xdmf-3.0+git20190531/debian/control 2024-02-29 06:23:26.000000000 +0000
@@ -2,7 +2,7 @@
 Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckins...@debian.org>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
   dh-sequence-python3, 
   python3-all-dev, 
   cmake(>= 2.4.0), 
@@ -20,7 +20,10 @@
 Vcs-Browser: https://salsa.debian.org/science-team/xdmf
 Vcs-Git: https://salsa.debian.org/science-team/xdmf.git -b debian/latest
 
-Package:  libxdmf3
+Package:  libxdmf3t64
+Provides: ${t64:Provides}
+Replaces: libxdmf3
+Breaks: libxdmf3 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -46,8 +49,8 @@
 Section: libdevel
 Architecture: any
 Conflicts: libloki-dev
-Depends: libxdmf3  (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, 
libgzstream-dev
-Breaks: libxdmf3 (<< 3.0+git20190531)
+Depends: libxdmf3t64  (= ${binary:Version}), ${misc:Depends}, 
${shlibs:Depends}, libgzstream-dev
+Breaks: libxdmf3t64 (<< 3.0+git20190531)
 Description: eXtensible Data Model and Format development tools
  This package contains the headers and development tools needed to build
  against the Xdmf libraries.
@@ -55,7 +58,7 @@
 Package: python3-xdmf
 Section: python
 Architecture: any
-Depends: libxdmf3  (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, 
${python3:Depends}
+Depends: libxdmf3t64  (= ${binary:Version}), ${misc:Depends}, 
${shlibs:Depends}, ${python3:Depends}
 Description: Python3 wrappers for the eXtensible Data Model and Format library
  This package provides python3 wrappers for the libXDMF library.
 
diff -Nru xdmf-3.0+git20190531/debian/libxdmf3.install.in 
xdmf-3.0+git20190531/debian/libxdmf3.install.in
--- xdmf-3.0+git20190531/debian/libxdmf3.install.in     2024-02-03 
08:04:51.000000000 +0000
+++ xdmf-3.0+git20190531/debian/libxdmf3.install.in     1970-01-01 
00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-/usr/lib/@MULTIARCH@/libXdmf.so.3.0.0  /usr/lib/@MULTIARCH@/xdmf/@MPI@
-/usr/lib/@MULTIARCH@/libXdmfUtils.so.3.0.0     /usr/lib/@MULTIARCH@/xdmf/@MPI@
-/usr/lib/libXdmfCore.so.3.0.0  /usr/lib/@MULTIARCH@/xdmf/@MPI@
-./debian/build-serial-@PY3@/lib/libXdmf.so.3.0.0       
/usr/lib/@MULTIARCH@/xdmf/serial
-./debian/build-serial-@PY3@/lib/libXdmfCore.so.3.0.0   
/usr/lib/@MULTIARCH@/xdmf/serial
-./debian/build-serial-@PY3@/lib/libXdmfUtils.so.3.0.0  
/usr/lib/@MULTIARCH@/xdmf/serial
diff -Nru xdmf-3.0+git20190531/debian/libxdmf3.links.in 
xdmf-3.0+git20190531/debian/libxdmf3.links.in
--- xdmf-3.0+git20190531/debian/libxdmf3.links.in       2024-02-03 
08:04:51.000000000 +0000
+++ xdmf-3.0+git20190531/debian/libxdmf3.links.in       1970-01-01 
00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmf.so.3.0.0       
/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmf.so.3
-/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfCore.so.3.0.0   
/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfCore.so.3
-/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfUtils.so.3.0.0  
/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfUtils.so.3
-/usr/lib/@MULTIARCH@/xdmf/serial/libXdmf.so.3.0.0      
/usr/lib/@MULTIARCH@/xdmf/serial/libXdmf.so.3
-/usr/lib/@MULTIARCH@/xdmf/serial/libXdmfCore.so.3.0.0  
/usr/lib/@MULTIARCH@/xdmf/serial/libXdmfCore.so.3
-/usr/lib/@MULTIARCH@/xdmf/serial/libXdmfUtils.so.3.0.0 
/usr/lib/@MULTIARCH@/xdmf/serial/libXdmfUtils.so.3
-/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmf.so.3.0.0       
/usr/lib/@MULTIARCH@/libXdmf.so.3.0.0
-/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfCore.so.3.0.0   
/usr/lib/@MULTIARCH@/libXdmfCore.so.3.0.0
-/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfUtils.so.3.0.0  
/usr/lib/@MULTIARCH@/libXdmfUtils.so.3.0.0
-/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmf.so.3.0.0       
/usr/lib/@MULTIARCH@/libXdmf.so.3
-/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfCore.so.3.0.0   
/usr/lib/@MULTIARCH@/libXdmfCore.so.3
-/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfUtils.so.3.0.0  
/usr/lib/@MULTIARCH@/libXdmfUtils.so.3
diff -Nru xdmf-3.0+git20190531/debian/libxdmf3t64.install.in 
xdmf-3.0+git20190531/debian/libxdmf3t64.install.in
--- xdmf-3.0+git20190531/debian/libxdmf3t64.install.in  1970-01-01 
00:00:00.000000000 +0000
+++ xdmf-3.0+git20190531/debian/libxdmf3t64.install.in  2024-02-03 
08:04:51.000000000 +0000
@@ -0,0 +1,6 @@
+/usr/lib/@MULTIARCH@/libXdmf.so.3.0.0  /usr/lib/@MULTIARCH@/xdmf/@MPI@
+/usr/lib/@MULTIARCH@/libXdmfUtils.so.3.0.0     /usr/lib/@MULTIARCH@/xdmf/@MPI@
+/usr/lib/libXdmfCore.so.3.0.0  /usr/lib/@MULTIARCH@/xdmf/@MPI@
+./debian/build-serial-@PY3@/lib/libXdmf.so.3.0.0       
/usr/lib/@MULTIARCH@/xdmf/serial
+./debian/build-serial-@PY3@/lib/libXdmfCore.so.3.0.0   
/usr/lib/@MULTIARCH@/xdmf/serial
+./debian/build-serial-@PY3@/lib/libXdmfUtils.so.3.0.0  
/usr/lib/@MULTIARCH@/xdmf/serial
diff -Nru xdmf-3.0+git20190531/debian/libxdmf3t64.links.in 
xdmf-3.0+git20190531/debian/libxdmf3t64.links.in
--- xdmf-3.0+git20190531/debian/libxdmf3t64.links.in    1970-01-01 
00:00:00.000000000 +0000
+++ xdmf-3.0+git20190531/debian/libxdmf3t64.links.in    2024-02-03 
08:04:51.000000000 +0000
@@ -0,0 +1,12 @@
+/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmf.so.3.0.0       
/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmf.so.3
+/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfCore.so.3.0.0   
/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfCore.so.3
+/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfUtils.so.3.0.0  
/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfUtils.so.3
+/usr/lib/@MULTIARCH@/xdmf/serial/libXdmf.so.3.0.0      
/usr/lib/@MULTIARCH@/xdmf/serial/libXdmf.so.3
+/usr/lib/@MULTIARCH@/xdmf/serial/libXdmfCore.so.3.0.0  
/usr/lib/@MULTIARCH@/xdmf/serial/libXdmfCore.so.3
+/usr/lib/@MULTIARCH@/xdmf/serial/libXdmfUtils.so.3.0.0 
/usr/lib/@MULTIARCH@/xdmf/serial/libXdmfUtils.so.3
+/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmf.so.3.0.0       
/usr/lib/@MULTIARCH@/libXdmf.so.3.0.0
+/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfCore.so.3.0.0   
/usr/lib/@MULTIARCH@/libXdmfCore.so.3.0.0
+/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfUtils.so.3.0.0  
/usr/lib/@MULTIARCH@/libXdmfUtils.so.3.0.0
+/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmf.so.3.0.0       
/usr/lib/@MULTIARCH@/libXdmf.so.3
+/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfCore.so.3.0.0   
/usr/lib/@MULTIARCH@/libXdmfCore.so.3
+/usr/lib/@MULTIARCH@/xdmf/@MPI@/libXdmfUtils.so.3.0.0  
/usr/lib/@MULTIARCH@/libXdmfUtils.so.3
diff -Nru xdmf-3.0+git20190531/debian/libxdmf3t64.lintian-overrides 
xdmf-3.0+git20190531/debian/libxdmf3t64.lintian-overrides
--- xdmf-3.0+git20190531/debian/libxdmf3t64.lintian-overrides   1970-01-01 
00:00:00.000000000 +0000
+++ xdmf-3.0+git20190531/debian/libxdmf3t64.lintian-overrides   2024-02-29 
06:21:19.000000000 +0000
@@ -0,0 +1 @@
+libxdmf3t64: package-name-doesnt-match-sonames libxdmf3
diff -Nru xdmf-3.0+git20190531/debian/rules xdmf-3.0+git20190531/debian/rules
--- xdmf-3.0+git20190531/debian/rules   2024-02-03 08:04:51.000000000 +0000
+++ xdmf-3.0+git20190531/debian/rules   2024-02-29 06:23:18.000000000 +0000
@@ -19,8 +19,8 @@
 
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -fPIC
 
-AUTOGENERATED:= python3-xdmf.install libxdmf-dev.install libxdmf3.install \
-               libxdmf3.links libxdmf-dev.links
+AUTOGENERATED:= python3-xdmf.install libxdmf-dev.install libxdmf3t64.install \
+               libxdmf3t64.links libxdmf-dev.links
 
 build_types:= mpi serial
 BUILD_DIRS := $(foreach B,$(build_types),$(foreach 
P,$(PY3SUPPORTED),debian/build-$B-$P))

Reply via email to