[Pkg-gmagick-im-team] Bug#1066935: imagemagick: NMU diff for 64-bit time_t transition (second fix)

[Gianfranco Costamagna]

Package: imagemagick
Version: 6.9.12.98+dfsg1-5.1
Severity: normal
Tags: patch

Hello, some dependencies were incorrectly generated, leading to impossibility to install the package on armhf.

Thanks for considering the patch.

*** /tmp/tmpx4ebe5bv/imagemagick_8:6.9.12.98+dfsg1-5.1ubuntu1.debdiff
diff -Nru imagemagick-6.9.12.98+dfsg1/debian/control.d/quantum.in imagemagick-6.9.12.98+dfsg1/debian/control.d/quantum.in
--- imagemagick-6.9.12.98+dfsg1/debian/control.d/quantum.in	2023-12-27 11:29:58.000000000 +0100
+++ imagemagick-6.9.12.98+dfsg1/debian/control.d/quantum.in	2024-03-15 16:00:07.000000000 +0100
@@ -31,7 +31,7 @@
  # predepend on dpkg (>= 1.17.6) for libgomp symbols remove after jeesie +2
  # normally depends on imagemagick-${IMVERSION}-common >= ${source:version} except
  # here when some files were moved between two packages
-Package: libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-${CORESOVERSION}
+Package: libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-${CORESOVERSION}t64
  Architecture: any
  Multi-Arch: same
  Section: libs
@@ -59,7 +59,7 @@
  Section: libs
  Pre-Depends: ${misc:Pre-Depends}
  Depends: ${shlibs:Depends}, ${misc:Depends}
-Enhances: libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-${CORESOVERSION}
+Enhances: libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-${CORESOVERSION}t64
  Provides: libmagickcore-extra, libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-1-extra,
   libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-2-extra,
   libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-3-extra,
@@ -82,7 +82,7 @@
  Pre-Depends: dpkg (>= 1.17.11)
  Depends:
   libmagickcore-${IMVERSION}-arch-config (= ${binary:Version}),
- libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-${CORESOVERSION} (= ${binary:Version}),
+ libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-${CORESOVERSION}t64 (= ${binary:Version}),
   libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-${CORESOVERSION}-extra (= ${binary:Version}),
   libbz2-dev, libdjvulibre-dev,
   libexif-dev, libfreetype-dev, libjpeg-dev, libopenjp2-7-dev,
diff -Nru imagemagick-6.9.12.98+dfsg1/debian/libmagickcore-IMVERSION.QUANTUMDEPTH-CORESOVERSION.symbols.in imagemagick-6.9.12.98+dfsg1/debian/libmagickcore-IMVERSION.QUANTUMDEPTH-CORESOVERSION.symbols.in
--- imagemagick-6.9.12.98+dfsg1/debian/libmagickcore-IMVERSION.QUANTUMDEPTH-CORESOVERSION.symbols.in	2023-12-27 11:29:58.000000000 +0100
+++ imagemagick-6.9.12.98+dfsg1/debian/libmagickcore-IMVERSION.QUANTUMDEPTH-CORESOVERSION.symbols.in	2024-03-15 16:00:40.000000000 +0100
@@ -1,5 +1,5 @@
  # SymbolsHelper-Confirmed: 1.0.0 amd64
-libMagickCore-${IMVERSION}.${UCQUANTUMDEPTH}.so.${CORESOVERSION} libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-${CORESOVERSION} #MINVER#
+libMagickCore-${IMVERSION}.${UCQUANTUMDEPTH}.so.${CORESOVERSION} libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-${CORESOVERSION}t64 #MINVER#
  * Build-Depends-Package: libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-dev
   (regex|optional)"^.gomp_critical_user_.*@Base" 8:6.9.10.2
   AcquireAlignedMemory at Base 8:6.9.10.2


-- System Information:
Debian Release: bookworm/sid
   APT prefers jammy-updates
   APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy'), (100, 'jammy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, x86

Kernel: Linux 6.2.0-35-generic (SMP w/8 CPU threads; PREEMPT)
Kernel taint flags: TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-gmagick-im-team/attachments/20240315/8e28752d/attachment.sig>