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 imagemagick-6.9.12.98+dfsg1/debian/changelog
imagemagick-6.9.12.98+dfsg1/debian/changelog
--- imagemagick-6.9.12.98+dfsg1/debian/changelog 2023-12-27
10:29:58.000000000 +0000
+++ imagemagick-6.9.12.98+dfsg1/debian/changelog 2024-03-01
01:31:19.000000000 +0000
@@ -1,3 +1,10 @@
+imagemagick (8:6.9.12.98+dfsg1-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1064140
+
+ -- Steve Langasek <vor...@debian.org> Fri, 01 Mar 2024 01:31:19 +0000
+
imagemagick (8:6.9.12.98+dfsg1-5) unstable; urgency=medium
* Bug fix: "please update Suggests: imagemagick-doc; to
diff -Nru imagemagick-6.9.12.98+dfsg1/debian/control
imagemagick-6.9.12.98+dfsg1/debian/control
--- imagemagick-6.9.12.98+dfsg1/debian/control 2023-12-27 10:29:58.000000000
+0000
+++ imagemagick-6.9.12.98+dfsg1/debian/control 2024-03-01 01:31:18.000000000
+0000
@@ -7,7 +7,7 @@
Standards-Version: 4.5.1
# for dbg-sym
Rules-Requires-Root: no
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
# for improving build
dh-exec,
# ABI dump
@@ -224,7 +224,10 @@
# predepend on dpkg (>= 1.17.6) for libgomp symbols remove after jeesie +2
# normally depends on imagemagick-6-common >= ${source:version} except
# here when some files were moved between two packages
-Package: libmagickcore-6.q16-7
+Package: libmagickcore-6.q16-7t64
+Provides: ${t64:Provides}
+Replaces: libmagickcore-6.q16-7
+Breaks: libmagickcore-6.q16-7 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Section: libs
@@ -252,7 +255,7 @@
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
-Enhances: libmagickcore-6.q16-7
+Enhances: libmagickcore-6.q16-7t64
Provides: libmagickcore-extra, libmagickcore-6.q16-1-extra,
libmagickcore-6.q16-2-extra,
libmagickcore-6.q16-3-extra,
@@ -275,7 +278,7 @@
Pre-Depends: dpkg (>= 1.17.11)
Depends:
libmagickcore-6-arch-config (= ${binary:Version}),
- libmagickcore-6.q16-7 (= ${binary:Version}),
+ libmagickcore-6.q16-7t64 (= ${binary:Version}),
libmagickcore-6.q16-7-extra (= ${binary:Version}),
libbz2-dev, libdjvulibre-dev,
libexif-dev, libfreetype-dev, libjpeg-dev, libopenjp2-7-dev,
@@ -299,7 +302,10 @@
depth of 16 bits (Q16).
# predepend on dpkg (>= 1.17.6) for libgomp symbols remove after jeesie + 2
-Package: libmagickwand-6.q16-7
+Package: libmagickwand-6.q16-7t64
+Provides: ${t64:Provides}
+Replaces: libmagickwand-6.q16-7
+Breaks: libmagickwand-6.q16-7 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Section: libs
@@ -324,7 +330,7 @@
Section: libdevel
Pre-Depends: dpkg (>= 1.17.11)
Depends: libmagickwand-6-headers (= ${source:Version}),
- libmagickwand-6.q16-7 (= ${binary:Version}),
+ libmagickwand-6.q16-7t64 (= ${binary:Version}),
libmagickcore-6.q16-7-extra (= ${binary:Version}),
libmagickcore-6.q16-dev (= ${binary:Version}),
pkg-config,
@@ -344,7 +350,10 @@
This version of libmagickwand-dev is compiled for a channel
depth of 16 bits (Q16).
-Package: libmagick++-6.q16-9
+Package: libmagick++-6.q16-9t64
+Provides: ${t64:Provides}
+Replaces: libmagick++-6.q16-9
+Breaks: libmagick++-6.q16-9 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Section: libs
@@ -366,7 +375,7 @@
Section: libdevel
Pre-Depends: dpkg (>= 1.17.11)
Depends: libmagick++-6-headers (= ${source:Version}),
- libmagick++-6.q16-9 (= ${binary:Version}),
+ libmagick++-6.q16-9t64 (= ${binary:Version}),
libmagickcore-6.q16-dev (= ${binary:Version}),
libmagickwand-6.q16-dev (= ${binary:Version}),
pkg-config,
@@ -434,7 +443,10 @@
# predepend on dpkg (>= 1.17.6) for libgomp symbols remove after jeesie +2
# normally depends on imagemagick-6-common >= ${source:version} except
# here when some files were moved between two packages
-Package: libmagickcore-6.q16hdri-7
+Package: libmagickcore-6.q16hdri-7t64
+Provides: ${t64:Provides}
+Replaces: libmagickcore-6.q16hdri-7
+Breaks: libmagickcore-6.q16hdri-7 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Section: libs
@@ -462,7 +474,7 @@
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
-Enhances: libmagickcore-6.q16hdri-7
+Enhances: libmagickcore-6.q16hdri-7t64
Provides: libmagickcore-extra, libmagickcore-6.q16hdri-1-extra,
libmagickcore-6.q16hdri-2-extra,
libmagickcore-6.q16hdri-3-extra,
@@ -485,7 +497,7 @@
Pre-Depends: dpkg (>= 1.17.11)
Depends:
libmagickcore-6-arch-config (= ${binary:Version}),
- libmagickcore-6.q16hdri-7 (= ${binary:Version}),
+ libmagickcore-6.q16hdri-7t64 (= ${binary:Version}),
libmagickcore-6.q16hdri-7-extra (= ${binary:Version}),
libbz2-dev, libdjvulibre-dev,
libexif-dev, libfreetype-dev, libjpeg-dev, libopenjp2-7-dev,
@@ -508,7 +520,10 @@
depth of 16 bits with high dynamic range (Q16HDRI).
# predepend on dpkg (>= 1.17.6) for libgomp symbols remove after jeesie + 2
-Package: libmagickwand-6.q16hdri-7
+Package: libmagickwand-6.q16hdri-7t64
+Provides: ${t64:Provides}
+Replaces: libmagickwand-6.q16hdri-7
+Breaks: libmagickwand-6.q16hdri-7 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Section: libs
@@ -533,7 +548,7 @@
Section: libdevel
Pre-Depends: dpkg (>= 1.17.11)
Depends: libmagickwand-6-headers (= ${source:Version}),
- libmagickwand-6.q16hdri-7 (= ${binary:Version}),
+ libmagickwand-6.q16hdri-7t64 (= ${binary:Version}),
libmagickcore-6.q16hdri-7-extra (= ${binary:Version}),
libmagickcore-6.q16hdri-dev (= ${binary:Version}),
pkg-config,
@@ -552,7 +567,10 @@
This version of libmagickwand-dev is compiled for a channel
depth of 16 bits with high dynamic range (Q16HDRI).
-Package: libmagick++-6.q16hdri-9
+Package: libmagick++-6.q16hdri-9t64
+Provides: ${t64:Provides}
+Replaces: libmagick++-6.q16hdri-9
+Breaks: libmagick++-6.q16hdri-9 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Section: libs
@@ -574,7 +592,7 @@
Section: libdevel
Pre-Depends: dpkg (>= 1.17.11)
Depends: libmagick++-6-headers (= ${source:Version}),
- libmagick++-6.q16hdri-9 (= ${binary:Version}),
+ libmagick++-6.q16hdri-9t64 (= ${binary:Version}),
libmagickcore-6.q16hdri-dev (= ${binary:Version}),
libmagickwand-6.q16hdri-dev (= ${binary:Version}),
pkg-config,
diff -Nru
imagemagick-6.9.12.98+dfsg1/debian/libmagick++-6.q16-9t64.lintian-overrides
imagemagick-6.9.12.98+dfsg1/debian/libmagick++-6.q16-9t64.lintian-overrides
--- imagemagick-6.9.12.98+dfsg1/debian/libmagick++-6.q16-9t64.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++ imagemagick-6.9.12.98+dfsg1/debian/libmagick++-6.q16-9t64.lintian-overrides
2024-03-01 01:24:09.000000000 +0000
@@ -0,0 +1 @@
+libmagick++-6.q16-9t64: package-name-doesnt-match-sonames libmagick++-6.q16-9
diff -Nru
imagemagick-6.9.12.98+dfsg1/debian/libmagick++-6.q16hdri-9t64.lintian-overrides
imagemagick-6.9.12.98+dfsg1/debian/libmagick++-6.q16hdri-9t64.lintian-overrides
---
imagemagick-6.9.12.98+dfsg1/debian/libmagick++-6.q16hdri-9t64.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++
imagemagick-6.9.12.98+dfsg1/debian/libmagick++-6.q16hdri-9t64.lintian-overrides
2024-03-01 01:24:09.000000000 +0000
@@ -0,0 +1 @@
+libmagick++-6.q16hdri-9t64: package-name-doesnt-match-sonames
libmagick++-6.q16hdri-9
diff -Nru
imagemagick-6.9.12.98+dfsg1/debian/libmagickcore-6.q16-7t64.lintian-overrides
imagemagick-6.9.12.98+dfsg1/debian/libmagickcore-6.q16-7t64.lintian-overrides
---
imagemagick-6.9.12.98+dfsg1/debian/libmagickcore-6.q16-7t64.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++
imagemagick-6.9.12.98+dfsg1/debian/libmagickcore-6.q16-7t64.lintian-overrides
2024-03-01 01:24:09.000000000 +0000
@@ -0,0 +1 @@
+libmagickcore-6.q16-7t64: package-name-doesnt-match-sonames
libmagickcore-6.q16-7
diff -Nru
imagemagick-6.9.12.98+dfsg1/debian/libmagickcore-6.q16hdri-7t64.lintian-overrides
imagemagick-6.9.12.98+dfsg1/debian/libmagickcore-6.q16hdri-7t64.lintian-overrides
---
imagemagick-6.9.12.98+dfsg1/debian/libmagickcore-6.q16hdri-7t64.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++
imagemagick-6.9.12.98+dfsg1/debian/libmagickcore-6.q16hdri-7t64.lintian-overrides
2024-03-01 01:24:09.000000000 +0000
@@ -0,0 +1 @@
+libmagickcore-6.q16hdri-7t64: package-name-doesnt-match-sonames
libmagickcore-6.q16hdri-7
diff -Nru
imagemagick-6.9.12.98+dfsg1/debian/libmagickwand-6.q16-7t64.lintian-overrides
imagemagick-6.9.12.98+dfsg1/debian/libmagickwand-6.q16-7t64.lintian-overrides
---
imagemagick-6.9.12.98+dfsg1/debian/libmagickwand-6.q16-7t64.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++
imagemagick-6.9.12.98+dfsg1/debian/libmagickwand-6.q16-7t64.lintian-overrides
2024-03-01 01:24:09.000000000 +0000
@@ -0,0 +1 @@
+libmagickwand-6.q16-7t64: package-name-doesnt-match-sonames
libmagickwand-6.q16-7
diff -Nru
imagemagick-6.9.12.98+dfsg1/debian/libmagickwand-6.q16hdri-7t64.lintian-overrides
imagemagick-6.9.12.98+dfsg1/debian/libmagickwand-6.q16hdri-7t64.lintian-overrides
---
imagemagick-6.9.12.98+dfsg1/debian/libmagickwand-6.q16hdri-7t64.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++
imagemagick-6.9.12.98+dfsg1/debian/libmagickwand-6.q16hdri-7t64.lintian-overrides
2024-03-01 01:24:09.000000000 +0000
@@ -0,0 +1 @@
+libmagickwand-6.q16hdri-7t64: package-name-doesnt-match-sonames
libmagickwand-6.q16hdri-7
diff -Nru imagemagick-6.9.12.98+dfsg1/debian/rules
imagemagick-6.9.12.98+dfsg1/debian/rules
--- imagemagick-6.9.12.98+dfsg1/debian/rules 2023-12-27 10:29:58.000000000
+0000
+++ imagemagick-6.9.12.98+dfsg1/debian/rules 2024-03-01 01:31:17.000000000
+0000
@@ -10,8 +10,8 @@
export QUANTUMDEPTH ?= q16 q16hdri
# lib version, run make -f debian/rules update_pkg in order to upgrade
export CORESOVERSION ?= 7
-export WANDSOVERSION ?= 7
-export PPSOVERSION ?= 9
+export WANDSOVERSION ?= 7t64
+export PPSOVERSION ?= 9t64
# minimal version ABI compatible of common
export COMMONMINVERSION ?= 8:6.9.6.2+dfsg-3
@@ -105,7 +105,7 @@
export MAGICK_PROGRAMS := compare animate convert composite conjure import
identify stream display montage mogrify
MAGICK_ANY_QUANTUM_PACKAGES := imagemagick-$(IMVERSION).$$QUANTUM \
-
libmagickcore-${IMVERSION}.$$QUANTUM-${CORESOVERSION} \
+
libmagickcore-${IMVERSION}.$$QUANTUM-${CORESOVERSION}t64 \
libmagickcore-${IMVERSION}.$$QUANTUM-${CORESOVERSION}-extra \
libmagickwand-${IMVERSION}.$$QUANTUM-${WANDSOVERSION} \
libmagick++-${IMVERSION}.$$QUANTUM-${PPSOVERSION} \
@@ -336,7 +336,7 @@
QUANTUM=$(call QUANTUM_PART,$*) \
HDRI=$(call HDRI_PART,$*) \
QUANTUMDEPTH=$* \
- dh-exec
$(CURDIR)/debian/libmagickcore-IMVERSION.QUANTUMDEPTH-CORESOVERSION.install.in
> $(CURDIR)/debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION).install
+ dh-exec
$(CURDIR)/debian/libmagickcore-IMVERSION.QUANTUMDEPTH-CORESOVERSION.install.in
> $(CURDIR)/debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION)t64.install
QUANTUM=$(call QUANTUM_PART,$*) \
HDRI=$(call HDRI_PART,$*) \
QUANTUMDEPTH=$* \
@@ -349,7 +349,7 @@
HDRI=$(call HDRI_PART,$*) \
QUANTUMDEPTH=$* \
UCQUANTUMDEPTH=$(call UC,$*) \
- $(DH_EXEC_SUBST)
$(CURDIR)/debian/libmagickcore-IMVERSION.QUANTUMDEPTH-CORESOVERSION.symbols.in
> $(CURDIR)/debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION).symbols
+ $(DH_EXEC_SUBST)
$(CURDIR)/debian/libmagickcore-IMVERSION.QUANTUMDEPTH-CORESOVERSION.symbols.in
> $(CURDIR)/debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION)t64.symbols
# wand
QUANTUM=$(call QUANTUM_PART,$*) \
@@ -687,7 +687,7 @@
# Remove extra coders from libmagickcore
set -e; while read FILE; do \
- rm -f
debian/libmagickcore-${IMVERSION}.$*-${CORESOVERSION}/$$FILE; \
+ rm -f
debian/libmagickcore-${IMVERSION}.$*-${CORESOVERSION}t64/$$FILE; \
done <
debian/libmagickcore-${IMVERSION}.$*-${CORESOVERSION}-extra.install
# install arch package
@@ -824,10 +824,10 @@
[ ! -f debian/libmagick++-$(IMVERSION).$*-dev.install ] || rm
debian/libmagick++-$(IMVERSION).$*-dev.install
[ ! -f debian/libmagick++-$(IMVERSION).$*-$(PPSOVERSION).symbols ] ||
rm debian/libmagick++-$(IMVERSION).$*-$(PPSOVERSION).symbols
- [ ! -f debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION).install ]
|| rm -f debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION).install
+ [ ! -f debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION)t64.install
] || rm -f debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION)t64.install
[ ! -f
debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION)-extra.install ] || rm -f
debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION)-extra.install
[ ! -f debian/libmagickcore-$(IMVERSION).$*-dev.install ] || rm -f
debian/libmagickcore-$(IMVERSION).$*-dev.install
- [ ! -f debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION).symbols ]
|| rm -f debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION).symbols
+ [ ! -f debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION)t64.symbols
] || rm -f debian/libmagickcore-$(IMVERSION).$*-$(CORESOVERSION)t64.symbols
[ ! -f debian/libmagickwand-$(IMVERSION).$*-$(WANDSOVERSION).install ]
|| rm -f debian/libmagickwand-$(IMVERSION).$*-$(WANDSOVERSION).install
[ ! -f debian/libmagickwand-$(IMVERSION).$*-dev.install ] || rm -f
debian/libmagickwand-$(IMVERSION).$*-dev.install
