[Python-modules-commits] [willow] 17/18: merge patched into master
Christopher Stuart Hoskin
mans0954 at moszumanska.debian.org
Sun Jan 29 18:11:25 UTC 2017
This is an automated email from the git hooks/post-receive script.
mans0954 pushed a commit to branch master
in repository willow.
commit aeadf1972e543b74b2bec9794780bec982b15cc1
Merge: 3bf5b22 0699650
Author: Christopher Hoskin <mans0954 at debian.org>
Date: Sun Jan 29 16:07:29 2017 +0000
merge patched into master
debian/.git-dpm | 4 ++--
...Willow-version.patch => 0001-Correct-Willow-version.patch} | 11 +++++------
debian/patches/0002-Adjust-orientation-test-tollerance.patch | 2 +-
debian/patches/series | 2 +-
4 files changed, 9 insertions(+), 10 deletions(-)
diff --cc debian/.git-dpm
index 970719a,0000000..1a1c44b
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
- 32f8fe151e385d637cb34c81ec8ca7f1c9b4b77d
- 32f8fe151e385d637cb34c81ec8ca7f1c9b4b77d
++06996508beb4f19d7066a6b252db8f027e0f45b0
++06996508beb4f19d7066a6b252db8f027e0f45b0
+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/0001-Correct-Willow-version.patch
index d1e155f,0000000..1a59b0e
mode 100644,000000..100644
--- a/debian/patches/0001-Correct-Willow-version.patch
+++ b/debian/patches/0001-Correct-Willow-version.patch
@@@ -1,37 -1,0 +1,36 @@@
- From a8f5879238240e17c68e55d1991e627f8303f65b Mon Sep 17 00:00:00 2001
++From 1c5860f046c2c7a76d08990bbf0156b9a8d4d4d6 Mon Sep 17 00:00:00 2001
+From: Christopher Hoskin <christopher.hoskin at gmail.com>
+Date: Sun, 11 Sep 2016 21:38:32 +0100
- Subject: =?UTF-8?q?Subject:=20Correct=20Willow=20version=0A=20Upstream=20r?=
- =?UTF-8?q?eleased=20with=20wrong=20version=20number=0ABug:=20https://gith?=
- =?UTF-8?q?ub.com/torchbox/Willow/issues/43=0AAuthor:=20Christopher=20Hosk?=
- =?UTF-8?q?in=20<christopher.hoskin at gmail.com>=0ALast-Updated:=202016-09-1?=
- =?UTF-8?q?1?=
++Subject: Correct Willow version
+
++Bug: https://github.com/torchbox/Willow/issues/43
++Author: Christopher Hoskin <christopher.hoskin at gmail.com>
++Last-Updated: 2016-09-11
+---
+ setup.py | 2 +-
+ willow/__init__.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 4d2ab26..34de961 100644
+--- a/setup.py
++++ b/setup.py
+@@ -20,7 +20,7 @@ except ImportError:
+
+ setup(
+ name='Willow',
+- version='0.4a0',
++ version='0.3.1',
+ description='A Python image library that sits on top of Pillow, Wand and OpenCV',
+ author='Karl Hobley',
+ author_email='karlhobley10 at gmail.com',
+diff --git a/willow/__init__.py b/willow/__init__.py
+index ec6f52b..055c4dc 100644
+--- a/willow/__init__.py
++++ b/willow/__init__.py
+@@ -27,4 +27,4 @@ def setup():
+ setup()
+
+
+-__version__ = '0.4a0'
++__version__ = '0.3.1'
diff --cc debian/patches/0002-Adjust-orientation-test-tollerance.patch
index 1e14dcc,0000000..bd70e84
mode 100644,000000..100644
--- a/debian/patches/0002-Adjust-orientation-test-tollerance.patch
+++ b/debian/patches/0002-Adjust-orientation-test-tollerance.patch
@@@ -1,40 -1,0 +1,40 @@@
- From 32f8fe151e385d637cb34c81ec8ca7f1c9b4b77d Mon Sep 17 00:00:00 2001
++From 06996508beb4f19d7066a6b252db8f027e0f45b0 Mon Sep 17 00:00:00 2001
+From: Christopher Hoskin <mans0954 at debian.org>
+Date: Sun, 29 Jan 2017 15:46:40 +0000
+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 a0a891f,0000000..914a48b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
- 0001-Subject-Correct-Willow-version.patch
++0001-Correct-Willow-version.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
More information about the Python-modules-commits
mailing list