Control: tags 1101130 + patch
Control: tags 1101130 + pending


Dear maintainer,

I've prepared an NMU for mat2 (versioned as 0.13.5-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should cancel it.

Regards.


--
 .''`.  https://info.comodo.priv.at -- Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
`-
diffstat for mat2-0.13.5 mat2-0.13.5

 changelog                                                    |    8 +
 patches/0001-Fix-HEIC-parsing-with-the-latest-exiftool.patch |   71 +++++++++++
 patches/series                                               |    1 
 3 files changed, 80 insertions(+)

diff -Nru mat2-0.13.5/debian/changelog mat2-0.13.5/debian/changelog
--- mat2-0.13.5/debian/changelog	2025-01-09 08:55:40.000000000 +0100
+++ mat2-0.13.5/debian/changelog	2025-04-11 18:46:13.000000000 +0200
@@ -1,3 +1,11 @@
+mat2 (0.13.5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: test failures": add patch from upstream Git commit to fix
+    tests with newer exiftool. (Closes: #1101130)
+
+ -- gregor herrmann <gre...@debian.org>  Fri, 11 Apr 2025 18:46:13 +0200
+
 mat2 (0.13.5-1) unstable; urgency=medium
 
   * New upstream version 0.13.5:
diff -Nru mat2-0.13.5/debian/patches/0001-Fix-HEIC-parsing-with-the-latest-exiftool.patch mat2-0.13.5/debian/patches/0001-Fix-HEIC-parsing-with-the-latest-exiftool.patch
--- mat2-0.13.5/debian/patches/0001-Fix-HEIC-parsing-with-the-latest-exiftool.patch	1970-01-01 01:00:00.000000000 +0100
+++ mat2-0.13.5/debian/patches/0001-Fix-HEIC-parsing-with-the-latest-exiftool.patch	2025-04-11 18:45:51.000000000 +0200
@@ -0,0 +1,71 @@
+From 473903b70e1b269a6110242a9c098a10c18554e2 Mon Sep 17 00:00:00 2001
+From: jvoisin <julien.voi...@dustri.org>
+Date: Thu, 3 Apr 2025 15:58:27 +0200
+Subject: [PATCH] Fix HEIC parsing with the latest exiftool
+
+Bug-Debian: https://bugs.debian.org/1101130
+Origin: https://0xacab.org/jvoisin/mat2/-/commit/473903b70e1b269a6110242a9c098a10c18554e2
+
+---
+ tests/test_libmat2.py | 37 +++++++++++++++++++++++++++++++++++--
+ 1 file changed, 35 insertions(+), 2 deletions(-)
+
+--- a/tests/test_libmat2.py
++++ b/tests/test_libmat2.py
+@@ -526,7 +526,40 @@
+             'parser': images.HEICParser,
+             'meta': {},
+             'expected_meta': {
++                'BlueMatrixColumn': '0.14305 0.06061 0.71393',
++                'BlueTRC': '(Binary data 32 bytes, use -b option to extract)',
++                'CMMFlags': 'Not Embedded, Independent',
++                'ChromaticAdaptation': '1.04788 0.02292 -0.05022 0.02959 0.99048 -0.01707 -0.00925 0.01508 0.75168',
++                'ChromaticityChannel1': '0.64 0.33002',
++                'ChromaticityChannel2': '0.3 0.60001',
++                'ChromaticityChannel3': '0.15001 0.06',
++                'ChromaticityChannels': 3,
++                'ChromaticityColorant': 'Unknown',
++                'ColorSpaceData': 'RGB ',
++                'ConnectionSpaceIlluminant': '0.9642 1 0.82491',
++                'DeviceAttributes': 'Reflective, Glossy, Positive, Color',
++                'DeviceManufacturer': '',
++                'DeviceMfgDesc': 'GIMP',
++                'DeviceModel': '',
++                'DeviceModelDesc': 'sRGB',
+                 'ExifByteOrder': 'Big-endian (Motorola, MM)',
++                'GreenMatrixColumn': '0.38512 0.7169 0.09706',
++                'GreenTRC': '(Binary data 32 bytes, use -b option to extract)',
++                'MediaWhitePoint': '0.9642 1 0.82491',
++                'PrimaryPlatform': 'Apple Computer Inc.',
++                'ProfileCMMType': 'Little CMS',
++                'ProfileClass': 'Display Device Profile',
++                'ProfileConnectionSpace': 'XYZ ',
++                'ProfileCopyright': 'Public Domain',
++                'ProfileCreator': 'Little CMS',
++                'ProfileDateTime': '2022:05:15 16:29:22',
++                'ProfileDescription': 'GIMP built-in sRGB',
++                'ProfileFileSignature': 'acsp',
++                'ProfileID': 0,
++                'ProfileVersion': '4.3.0',
++                'RedMatrixColumn': '0.43604 0.22249 0.01392',
++                'RedTRC': '(Binary data 32 bytes, use -b option to extract)',
++                'RenderingIntent': 'Perceptual',
+                 'Warning': 'Bad IFD0 directory',
+             },
+         }
+@@ -563,13 +596,13 @@
+                 meta = p2.get_meta()
+                 if meta:
+                     for k, v in p2.get_meta().items():
+-                        self.assertIn(k, case['expected_meta'], '"%s" is not in "%s" (%s)' % (k, case['expected_meta'], case['name']))
++                        self.assertIn(k, case['expected_meta'], '"%s" is not in "%s" (%s), with all of them being %s' % (k, case['expected_meta'], case['name'], p2.get_meta().items()))
+                         if str(case['expected_meta'][k]) in str(v):
+                             continue
+                         if 'extra_expected_meta' in case and k in case['extra_expected_meta']:
+                             if str(case['extra_expected_meta'][k]) in str(v):
+                                 continue
+-                        self.assertTrue(False, "got a different value (%s) than excepted (%s) for %s" % (str(v), meta, k))
++                        self.assertTrue(False, "got a different value (%s) than excepted (%s) for %s, with all of them being %s" % (str(v), meta, k, p2.get_meta().items()))
+                 self.assertTrue(p2.remove_all())
+ 
+                 os.remove(target)
diff -Nru mat2-0.13.5/debian/patches/series mat2-0.13.5/debian/patches/series
--- mat2-0.13.5/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ mat2-0.13.5/debian/patches/series	2025-04-11 18:44:55.000000000 +0200
@@ -0,0 +1 @@
+0001-Fix-HEIC-parsing-with-the-latest-exiftool.patch

Attachment: signature.asc
Description: Digital Signature

Reply via email to