[Python-modules-commits] [willow] 09/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 0db409283ad6b1384e7bdf0144b2003a38c4e416
Merge: 4aa9561 752ca65
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sun Jan 29 15:50:46 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ubject-Adjust-orientation-test-tollerance.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/test_wand.py                                 |  2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 6613fcc,0000000..2e65c12
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
- a8f5879238240e17c68e55d1991e627f8303f65b
- a8f5879238240e17c68e55d1991e627f8303f65b
++752ca65aec94e29840ac550baa42fa0ff921b40b
++752ca65aec94e29840ac550baa42fa0ff921b40b
 +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-Subject-Adjust-orientation-test-tollerance.patch
index 0000000,0000000..5f21394
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Subject-Adjust-orientation-test-tollerance.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 752ca65aec94e29840ac550baa42fa0ff921b40b 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=0ABug:=20https?=
++ =?UTF-8?q?://github.com/wagtail/Willow/issues/46=0AForwarded:=20https://g?=
++ =?UTF-8?q?ithub.com/wagtail/Willow/pull/50=0AAuthor:=20Christopher=20Hosk?=
++ =?UTF-8?q?in=20<mans0954 at debian.org>=0ALast-Update:=202017-01-29?=
++
++---
++ tests/test_wand.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++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 cbc8714,0000000..61b0fc8
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Subject-Correct-Willow-version.patch
++0002-Subject-Adjust-orientation-test-tollerance.patch

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