This is an automated email from the git hooks/post-receive script.
grinorcole-guest pushed a commit to branch master
in repository willow.
commit 0abc75387afd4be3192872cf504fdc8a8a18cd36
Merge: 1781b4b de20264
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date: Sun Sep 11 21:39:53 2016 +0100
merge patched into master
debian/.git-dpm | 4 +--
.../0001-Subject-Correct-Willow-version.patch | 37 ++++++++++++++++++++++
debian/patches/series | 1 +
setup.py | 2 +-
willow/__init__.py | 2 +-
5 files changed, 42 insertions(+), 4 deletions(-)
diff --cc debian/.git-dpm
index c83d599,0000000..2d056d8
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
- b16000d074b69f68aca2e22958bc3c965e9ea2e0
- b16000d074b69f68aca2e22958bc3c965e9ea2e0
++de20264fc6a0f6424cd705bd4308045b43d83241
++de20264fc6a0f6424cd705bd4308045b43d83241
+b16000d074b69f68aca2e22958bc3c965e9ea2e0
+b16000d074b69f68aca2e22958bc3c965e9ea2e0
+willow_0.3.1.orig.tar.gz
+346bab7a49dd28457eee8769683228efd8c725bf
+1656840
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Subject-Correct-Willow-version.patch
index 0000000,0000000..0f27f73
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Subject-Correct-Willow-version.patch
@@@ -1,0 -1,0 +1,37 @@@
++From de20264fc6a0f6424cd705bd4308045b43d83241 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?=
++
++---
++ 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/series
index 0000000,0000000..cbc8714
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Subject-Correct-Willow-version.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/willow.git