[Python-modules-commits] [sorl-thumbnail] 10/15: update icc_profile.patch

[Wolfgang Borgert]

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

debacle pushed a commit to branch master
in repository sorl-thumbnail.

commit 7dc59352bf1f36b87cb50e0ae003e156d4c89a5d
Author: W. Martin Borgert <debacle at debian.org>
Date:   Wed Oct 5 02:51:21 2016 +0200

    update icc_profile.patch
---
 debian/patches/icc_profile.patch | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/debian/patches/icc_profile.patch b/debian/patches/icc_profile.patch
index d6b3854..1c321ec 100644
--- a/debian/patches/icc_profile.patch
+++ b/debian/patches/icc_profile.patch
@@ -1,31 +1,22 @@
-From d5a9bbb625355a53997bda0ece0e669c69552881 Mon Sep 17 00:00:00 2001
 From: Michael Fladischer <FladischerMichael at fladi.at>
 Date: Thu, 8 Oct 2015 13:53:18 -0700
-Subject: isome engines do not preserve ICC profile on crop
-
- Skip the test for the ICC profile in a thumbnail if either graphicsmagick or
- pgmagick is used as an engine.
-Last-Update: 2015-01-27
+Subject: imagemagick does not preserve ICC profile on crop
+ Skip the test for the ICC profile in a thumbnail if imagemagick
+ is used as an engine.
+Last-Update: 2016-10-05
 Forwarded: no
-
 Patch-Name: icc_profile.patch
 ---
- tests/thumbnail_tests/test_engines.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tests/thumbnail_tests/test_engines.py b/tests/thumbnail_tests/test_engines.py
-index da6a86a..b4e1bc3 100644
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/tests/thumbnail_tests/test_engines.py
 +++ b/tests/thumbnail_tests/test_engines.py
-@@ -344,6 +344,11 @@ class CropTestCase(BaseTestCase):
+@@ -343,6 +343,9 @@ class CropTestCase(BaseTestCase):
          self.assertEqual(th.x, 25)
          self.assertEqual(th.y, 50)
  
-+    @unittest.skipIf(settings.THUMBNAIL_ENGINE in (
-+        "sorl.thumbnail.engines.pgmagick_engine.Engine",
-+        "sorl.thumbnail.engines.convert_engine.Engine",
-+        ),
-+        "graphicsmagick and pgmagick do not preserve ICC profile on crop")
++    @unittest.skipIf(settings.THUMBNAIL_ENGINE == "sorl.thumbnail.engines.convert_engine.Engine"
++        and settings.THUMBNAIL_CONVERT == "convert",
++        "imagemagick does not preserve ICC profile on crop")
      def test_crop_image_with_icc_profile(self):
          name = 'data/icc_profile_test.jpg'
          item, _ = Item.objects.get_or_create(image=name)

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