[Python-modules-commits] [willow] 01/07: 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 a0443406c9df4b70f30633b01cd1c02c0a81b333
Merge: b39202b 234b203
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Mon Feb 27 20:44:53 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 debian/patches/0001-Correct-Willow-version.patch   | 36 -------------------
 .../0002-Adjust-orientation-test-tollerance.patch  | 40 ----------------------
 debian/patches/series                              |  2 --
 setup.py                                           |  2 +-
 tests/test_pillow.py                               |  2 +-
 tests/test_wand.py                                 |  2 +-
 willow/__init__.py                                 |  2 +-
 8 files changed, 6 insertions(+), 84 deletions(-)

diff --cc debian/.git-dpm
index 1a1c44b,0000000..09f8003
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
- 06996508beb4f19d7066a6b252db8f027e0f45b0
- 06996508beb4f19d7066a6b252db8f027e0f45b0
++234b203334d3941028c32277ece7caf10adb47a0
++234b203334d3941028c32277ece7caf10adb47a0
 +234b203334d3941028c32277ece7caf10adb47a0
 +234b203334d3941028c32277ece7caf10adb47a0
 +willow_0.3.1+dfsg.orig.tar.gz
 +bd0ad5e862265dbc5bc6c8ba20d1b699a5c3b979
 +1607830
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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