[Python-modules-commits] [python-xmp-toolkit] 02/03: merge patched into master

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

stender pushed a commit to branch master
in repository python-xmp-toolkit.

commit 28f01f4a4c4e2a2164136d198cd1fa4328986479
Merge: e905d50 9c5a6fd
Author: Daniel Stender <stender at debian.org>
Date:   Sun Jan 22 18:29:41 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0005-test_exempi-fix-for-exempi-2.4.0.patch    | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 test/test_exempi.py                                |  6 +++-
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index b6f5fa3,0000000..744d36f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 1b7e8fcbf6fb329453fb1238961471a9155bfa2b
- 1b7e8fcbf6fb329453fb1238961471a9155bfa2b
++9c5a6fdbfe13fdeb593f96f3a4f132c5de2cf5bb
++9c5a6fdbfe13fdeb593f96f3a4f132c5de2cf5bb
 +28cc309df51975a6cf86c12618ddb5e4a548e900
 +28cc309df51975a6cf86c12618ddb5e4a548e900
 +python-xmp-toolkit_2.0.1+git20140309.5437b0a.orig.tar.gz
 +0a3b880dc933710efad3e8fc54f6ae991d6f04d4
 +3574819
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0005-test_exempi-fix-for-exempi-2.4.0.patch
index 0000000,0000000..19200cd
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-test_exempi-fix-for-exempi-2.4.0.patch
@@@ -1,0 -1,0 +1,36 @@@
++From 9c5a6fdbfe13fdeb593f96f3a4f132c5de2cf5bb Mon Sep 17 00:00:00 2001
++From: Daniel Stender <stender at debian.org>
++Date: Sun, 22 Jan 2017 18:27:23 +0100
++Subject: test_exempi fix for exempi 2.4.0
++
++Origin: https://github.com/hfiguiere/python-xmp-toolkit/commit/896f50a
++Bug: https://github.com/python-xmp-toolkit/python-xmp-toolkit/issues/67
++Bug-Debian: https://bugs.debian.org/851014
++---
++ test/test_exempi.py | 6 +++++-
++ 1 file changed, 5 insertions(+), 1 deletion(-)
++
++diff --git a/test/test_exempi.py b/test/test_exempi.py
++index aafd59d..bfa9a7c 100644
++--- a/test/test_exempi.py
+++++ b/test/test_exempi.py
++@@ -30,6 +30,7 @@ from libxmp.consts import XMP_NS_EXIF as NS_EXIF
++ from libxmp.consts import XMP_NS_Photoshop as NS_PHOTOSHOP
++ from libxmp.consts import XMP_NS_TIFF as NS_TIFF
++ from libxmp.consts import XMP_NS_XMP as NS_XAP
+++from libxmp.consts import XMP_NS_XML as NS_XML
++ from libxmp.consts import XMP_NS_CameraRaw as NS_CAMERA_RAW_SETTINGS
++ from libxmp.consts import XMP_ITERATOR_OPTIONS, XMP_SERIAL_OPTIONS
++ from libxmp.consts import XMP_SKIP_OPTIONS
++@@ -543,7 +544,10 @@ class TestIteration(unittest.TestCase):
++         options = XMP_ITERATOR_OPTIONS['iter_justleafname']
++         schemas, paths, props = self.collect_iteration(NS_DC, "rights", options)
++ 
++-        self.assertEqual(schemas, [NS_DC, NS_DC, NS_DC])
+++        # in Exempi 2.4.0 and later, the actual namespace is returned.
+++        # This was fixed in the Adobe SDK CS6 (version 5.4.0)
+++        # So we test for both values since we can't check the version at runtime.
+++        self.assertTrue(schemas == [NS_DC, NS_DC, NS_DC] or schemas == [NS_DC, '', NS_XML])
++         self.assertEqual(paths,
++                          ['dc:rights',
++                           '[1]',
diff --cc debian/patches/series
index 63d60bc,0000000..1e3ba98
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
 +0001-hardcode-library-name.patch
 +0002-docs-no-updated-timestamp.patch
 +0003-fix-get_property_datetime-utc.patch
 +0004-disable-html-style.patch
++0005-test_exempi-fix-for-exempi-2.4.0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-xmp-toolkit.git