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')
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 gdcm-3.0.22/debian/changelog gdcm-3.0.22/debian/changelog
--- gdcm-3.0.22/debian/changelog 2023-12-07 09:37:28.000000000 +0000
+++ gdcm-3.0.22/debian/changelog 2024-02-28 08:01:41.000000000 +0000
@@ -1,3 +1,10 @@
+gdcm (3.0.22-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1062049
+
+ -- Steve Langasek <vor...@debian.org> Wed, 28 Feb 2024 08:01:41 +0000
+
gdcm (3.0.22-2) unstable; urgency=medium
* d/patches: Revert changes breaking binary ABI. Closes: #1056953
diff -Nru gdcm-3.0.22/debian/control gdcm-3.0.22/debian/control
--- gdcm-3.0.22/debian/control 2023-10-30 14:38:48.000000000 +0000
+++ gdcm-3.0.22/debian/control 2024-02-28 08:01:41.000000000 +0000
@@ -5,7 +5,7 @@
Gert Wollny <g...@debian.org>
Section: libs
Priority: optional
-Build-Depends: castxml,
+Build-Depends: dpkg-dev (>= 1.22.5), castxml,
cli-common-dev [amd64 armel armhf i386 mipsel kfreebsd-amd64
kfreebsd-i386 powerpc ppc64 ppc64el s390x arm64] <!nocil>,
cmake,
debhelper-compat (= 13),
@@ -42,7 +42,10 @@
Vcs-Git: https://salsa.debian.org/med-team/gdcm.git
Homepage: http://gdcm.sourceforge.net/
-Package: libgdcm3.0
+Package: libgdcm3.0t64
+Provides: ${t64:Provides}
+Replaces: libgdcm3.0
+Breaks: libgdcm3.0 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -74,7 +77,7 @@
Package: libgdcm-dev
Architecture: any
Section: libdevel
-Depends: libgdcm3.0 (= ${binary:Version}), ${misc:Depends}
+Depends: libgdcm3.0t64 (= ${binary:Version}), ${misc:Depends}
Breaks: libgdcm2-dev
Replaces: libgdcm2-dev
Description: Grassroots DICOM development libraries and headers
@@ -102,7 +105,7 @@
Package: python3-gdcm
Architecture: any
Section: python
-Depends: libgdcm3.0 (= ${binary:Version}),
+Depends: libgdcm3.0t64 (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
@@ -114,7 +117,10 @@
.
Python bindings to the GDCM DICOM library.
-Package: libvtkgdcm-9.1
+Package: libvtkgdcm-9.1t64
+Provides: ${t64:Provides}
+Replaces: libvtkgdcm-9.1
+Breaks: libvtkgdcm-9.1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -130,7 +136,7 @@
Package: libvtkgdcm-dev
Architecture: any
Section: libdevel
-Depends: libgdcm-dev, libvtkgdcm-9.1 (= ${binary:Version}), ${misc:Depends}
+Depends: libgdcm-dev, libvtkgdcm-9.1t64 (= ${binary:Version}), ${misc:Depends}
Breaks: libvtkgdcm2-dev
Replaces: libvtkgdcm2-dev
Description: Grassroots DICOM VTK development libraries and headers
@@ -145,7 +151,7 @@
Package: python3-vtkgdcm
Architecture: any
Section: python
-Depends: libvtkgdcm-9.1 (= ${binary:Version}),
+Depends: libvtkgdcm-9.1t64 (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
diff -Nru gdcm-3.0.22/debian/control.in gdcm-3.0.22/debian/control.in
--- gdcm-3.0.22/debian/control.in 2023-10-30 14:38:48.000000000 +0000
+++ gdcm-3.0.22/debian/control.in 2024-02-28 07:40:46.000000000 +0000
@@ -42,7 +42,10 @@
Vcs-Git: https://salsa.debian.org/med-team/gdcm.git
Homepage: http://gdcm.sourceforge.net/
-Package: libgdcm3.0
+Package: libgdcm3.0t64
+Provides: ${t64:Provides}
+Replaces: libgdcm3.0
+Breaks: libgdcm3.0 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -74,7 +77,7 @@
Package: libgdcm-dev
Architecture: any
Section: libdevel
-Depends: libgdcm3.0 (= ${binary:Version}), ${misc:Depends}
+Depends: libgdcm3.0t64 (= ${binary:Version}), ${misc:Depends}
Breaks: libgdcm2-dev
Replaces: libgdcm2-dev
Description: Grassroots DICOM development libraries and headers
@@ -102,7 +105,7 @@
Package: python3-gdcm
Architecture: any
Section: python
-Depends: libgdcm3.0 (= ${binary:Version}),
+Depends: libgdcm3.0t64 (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
@@ -114,7 +117,10 @@
.
Python bindings to the GDCM DICOM library.
-Package: libvtkgdcm-9.1
+Package: libvtkgdcm-9.1t64
+Provides: ${t64:Provides}
+Replaces: libvtkgdcm-9.1
+Breaks: libvtkgdcm-9.1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -130,7 +136,7 @@
Package: libvtkgdcm-dev
Architecture: any
Section: libdevel
-Depends: libgdcm-dev, libvtkgdcm-9.1 (= ${binary:Version}), ${misc:Depends}
+Depends: libgdcm-dev, libvtkgdcm-9.1t64 (= ${binary:Version}), ${misc:Depends}
Breaks: libvtkgdcm2-dev
Replaces: libvtkgdcm2-dev
Description: Grassroots DICOM VTK development libraries and headers
@@ -145,7 +151,7 @@
Package: python3-vtkgdcm
Architecture: any
Section: python
-Depends: libvtkgdcm-9.1 (= ${binary:Version}),
+Depends: libvtkgdcm-9.1t64 (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
diff -Nru gdcm-3.0.22/debian/libgdcm3.0.docs gdcm-3.0.22/debian/libgdcm3.0.docs
--- gdcm-3.0.22/debian/libgdcm3.0.docs 2023-10-30 14:38:48.000000000 +0000
+++ gdcm-3.0.22/debian/libgdcm3.0.docs 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-README.md
diff -Nru gdcm-3.0.22/debian/libgdcm3.0.install
gdcm-3.0.22/debian/libgdcm3.0.install
--- gdcm-3.0.22/debian/libgdcm3.0.install 2023-10-30 14:38:48.000000000
+0000
+++ gdcm-3.0.22/debian/libgdcm3.0.install 1970-01-01 00:00:00.000000000
+0000
@@ -1,2 +0,0 @@
-usr/lib/*/libgdcm*.so.*
-usr/share/gdcm-3.*/XML
diff -Nru gdcm-3.0.22/debian/libgdcm3.0.lintian-overrides
gdcm-3.0.22/debian/libgdcm3.0.lintian-overrides
--- gdcm-3.0.22/debian/libgdcm3.0.lintian-overrides 2023-10-30
14:38:48.000000000 +0000
+++ gdcm-3.0.22/debian/libgdcm3.0.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-# this is a multi-lib library package
-#
-libgdcm3.0: package-name-doesnt-match-sonames
-
-# This is a C++ library, using symbols files here is quite a challange
-libgdcm3.0: no-symbols-control-file
-
diff -Nru gdcm-3.0.22/debian/libgdcm3.0t64.docs
gdcm-3.0.22/debian/libgdcm3.0t64.docs
--- gdcm-3.0.22/debian/libgdcm3.0t64.docs 1970-01-01 00:00:00.000000000
+0000
+++ gdcm-3.0.22/debian/libgdcm3.0t64.docs 2023-10-30 14:38:48.000000000
+0000
@@ -0,0 +1 @@
+README.md
diff -Nru gdcm-3.0.22/debian/libgdcm3.0t64.install
gdcm-3.0.22/debian/libgdcm3.0t64.install
--- gdcm-3.0.22/debian/libgdcm3.0t64.install 1970-01-01 00:00:00.000000000
+0000
+++ gdcm-3.0.22/debian/libgdcm3.0t64.install 2023-10-30 14:38:48.000000000
+0000
@@ -0,0 +1,2 @@
+usr/lib/*/libgdcm*.so.*
+usr/share/gdcm-3.*/XML
diff -Nru gdcm-3.0.22/debian/libgdcm3.0t64.lintian-overrides
gdcm-3.0.22/debian/libgdcm3.0t64.lintian-overrides
--- gdcm-3.0.22/debian/libgdcm3.0t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ gdcm-3.0.22/debian/libgdcm3.0t64.lintian-overrides 2024-02-28
07:40:46.000000000 +0000
@@ -0,0 +1,8 @@
+# this is a multi-lib library package
+#
+libgdcm3.0t64: package-name-doesnt-match-sonames
+
+# This is a C++ library, using symbols files here is quite a challange
+libgdcm3.0t64: no-symbols-control-file
+
+libgdcm3.0t64: package-name-doesnt-match-sonames libgdcm3.0
diff -Nru gdcm-3.0.22/debian/libvtkgdcm-9.1.install
gdcm-3.0.22/debian/libvtkgdcm-9.1.install
--- gdcm-3.0.22/debian/libvtkgdcm-9.1.install 2023-10-30 14:38:48.000000000
+0000
+++ gdcm-3.0.22/debian/libvtkgdcm-9.1.install 1970-01-01 00:00:00.000000000
+0000
@@ -1 +0,0 @@
-usr/lib/*/libvtkgdcm-*.so.*
diff -Nru gdcm-3.0.22/debian/libvtkgdcm-9.1t64.install
gdcm-3.0.22/debian/libvtkgdcm-9.1t64.install
--- gdcm-3.0.22/debian/libvtkgdcm-9.1t64.install 1970-01-01
00:00:00.000000000 +0000
+++ gdcm-3.0.22/debian/libvtkgdcm-9.1t64.install 2023-10-30
14:38:48.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/libvtkgdcm-*.so.*
diff -Nru gdcm-3.0.22/debian/libvtkgdcm-9.1t64.lintian-overrides
gdcm-3.0.22/debian/libvtkgdcm-9.1t64.lintian-overrides
--- gdcm-3.0.22/debian/libvtkgdcm-9.1t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ gdcm-3.0.22/debian/libvtkgdcm-9.1t64.lintian-overrides 2024-02-28
07:40:46.000000000 +0000
@@ -0,0 +1 @@
+libvtkgdcm-9.1t64: package-name-doesnt-match-sonames libvtkgdcm-9.1
