[Python-modules-commits] [willow] 14/18: merge patched into master

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository willow.

commit 3bf5b2284e8559b19855b629323d04f7bd38304f
Merge: 813fe60 32f8fe1
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sun Jan 29 16:05:51 2017 +0000

    merge patched into master

 debian/.git-dpm                                                      | 4 ++--
 ...ollerance.patch => 0002-Adjust-orientation-test-tollerance.patch} | 5 ++---
 debian/patches/series                                                | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 8d98438,0000000..970719a
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
- 025c398cb5131e6c14f0a17e0bd27b1e2c7d32a7
- 025c398cb5131e6c14f0a17e0bd27b1e2c7d32a7
++32f8fe151e385d637cb34c81ec8ca7f1c9b4b77d
++32f8fe151e385d637cb34c81ec8ca7f1c9b4b77d
 +234b203334d3941028c32277ece7caf10adb47a0
 +234b203334d3941028c32277ece7caf10adb47a0
 +willow_0.3.1+dfsg.orig.tar.gz
 +bd0ad5e862265dbc5bc6c8ba20d1b699a5c3b979
 +1607830
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Adjust-orientation-test-tollerance.patch
index 6ac6abe,0000000..1e14dcc
mode 100644,000000..100644
--- a/debian/patches/0002-Adjust-orientation-test-tollerance.patch
+++ b/debian/patches/0002-Adjust-orientation-test-tollerance.patch
@@@ -1,41 -1,0 +1,40 @@@
- From 025c398cb5131e6c14f0a17e0bd27b1e2c7d32a7 Mon Sep 17 00:00:00 2001
++From 32f8fe151e385d637cb34c81ec8ca7f1c9b4b77d Mon Sep 17 00:00:00 2001
 +From: Christopher Hoskin <mans0954 at debian.org>
 +Date: Sun, 29 Jan 2017 15:46:40 +0000
- Subject: =?UTF-8?q?Subject:=20Adjust=20orientation=20test=20tollerance=0A?=
-  =?UTF-8?q?=20Required=20as=20repack.sh=20modifies=20images?=
++Subject: Adjust orientation test tollerance
 +
 +Bug: https://github.com/wagtail/Willow/issues/46
 +Forwarded: https://github.com/wagtail/Willow/pull/50
 +Author: Christopher Hoskin <mans0954 at debian.org>
 +Last-Update: 2017-01-29
 +---
 + tests/test_pillow.py | 2 +-
 + tests/test_wand.py   | 2 +-
 + 2 files changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/tests/test_pillow.py b/tests/test_pillow.py
 +index 7376edb..273c74a 100644
 +--- a/tests/test_pillow.py
 ++++ b/tests/test_pillow.py
 +@@ -144,7 +144,7 @@ class TestPillowImageOrientation(unittest.TestCase):
 +         # Check that the red flower is in the bottom left
 +         # The JPEGs have compressed slightly differently so the colours won't be spot on
 +         colour = image.image.convert('RGB').getpixel((155, 282))
 +-        self.assertAlmostEqual(colour[0], 217, delta=10)
 ++        self.assertAlmostEqual(colour[0], 217, delta=12)
 +         self.assertAlmostEqual(colour[1], 38, delta=11)
 +         self.assertAlmostEqual(colour[2], 46, delta=13)
 + 
 +diff --git a/tests/test_wand.py b/tests/test_wand.py
 +index 6104019..5dafbf5 100644
 +--- a/tests/test_wand.py
 ++++ b/tests/test_wand.py
 +@@ -111,7 +111,7 @@ class TestWandImageOrientation(unittest.TestCase):
 +         # Check that the red flower is in the bottom left
 +         # The JPEGs have compressed slightly differently so the colours won't be spot on
 +         colour = image.image[282][155]
 +-        self.assertAlmostEqual(colour.red * 255, 217, delta=10)
 ++        self.assertAlmostEqual(colour.red * 255, 217, delta=12)
 +         self.assertAlmostEqual(colour.green * 255, 38, delta=11)
 +         self.assertAlmostEqual(colour.blue * 255, 46, delta=13)
 + 
diff --cc debian/patches/series
index 61b0fc8,0000000..a0a891f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
 +0001-Subject-Correct-Willow-version.patch
- 0002-Subject-Adjust-orientation-test-tollerance.patch
++0002-Adjust-orientation-test-tollerance.patch

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