[Python-modules-commits] [willow] 06/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 9a950334bf9ab995acff0449048f267fd4c8b93a
Merge: f3b490d a8f5879
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sun Jan 29 15:14:25 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |   6 +++---
 .../0001-Subject-Correct-Willow-version.patch      |  12 ++++++------
 tests/images/orientation/landscape_2.jpg           | Bin 137359 -> 129853 bytes
 tests/images/orientation/landscape_3.jpg           | Bin 140965 -> 133497 bytes
 tests/images/orientation/landscape_4.jpg           | Bin 140588 -> 133185 bytes
 tests/images/orientation/landscape_5.jpg           | Bin 137611 -> 129912 bytes
 tests/images/orientation/landscape_6.jpg           | Bin 137628 -> 129925 bytes
 tests/images/orientation/landscape_7.jpg           | Bin 140645 -> 133212 bytes
 tests/images/orientation/landscape_8.jpg           | Bin 141286 -> 133909 bytes
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --cc debian/.git-dpm
index 3caf896,0000000..6613fcc
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
- de20264fc6a0f6424cd705bd4308045b43d83241
- de20264fc6a0f6424cd705bd4308045b43d83241
- b16000d074b69f68aca2e22958bc3c965e9ea2e0
++a8f5879238240e17c68e55d1991e627f8303f65b
++a8f5879238240e17c68e55d1991e627f8303f65b
++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-Subject-Correct-Willow-version.patch
index a11b00a,0000000..d1e155f
mode 100644,000000..100644
--- a/debian/patches/0001-Subject-Correct-Willow-version.patch
+++ b/debian/patches/0001-Subject-Correct-Willow-version.patch
@@@ -1,37 -1,0 +1,37 @@@
- From de20264fc6a0f6424cd705bd4308045b43d83241 Mon Sep 17 00:00:00 2001
++From a8f5879238240e17c68e55d1991e627f8303f65b 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: Correct version
-  Upstream released with wrong version number
- Bug: https://github.com/torchbox/Willow/issues/43
- Author: Christopher Hoskin <christopher.hoskin at gmail.com>
- Last-Updated: 2016-09-11
++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?=
 +
 +---
 + 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'

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