[Python-modules-commits] [python-pgmagick] 03/04: merge patched into master

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to branch master
in repository python-pgmagick.

commit 013316dbc407e2bafc869864d263c76e88524dfd
Merge: 967214d a8d535b
Author: W. Martin Borgert <debacle at debian.org>
Date:   Sun Jan 22 13:45:04 2017 +0000

    merge patched into master

 LICENSE                       |  2 +-
 PKG-INFO                      |  2 +-
 debian/.git-dpm               |  6 +++---
 pgmagick.egg-info/PKG-INFO    |  2 +-
 pgmagick.egg-info/SOURCES.txt |  3 ++-
 pgmagick/__init__.py          |  5 ++++-
 pgmagick/_version.py          |  2 +-
 setup.cfg                     |  3 +++
 setup.py                      |  2 +-
 src/Makefile                  |  4 ++--
 src/_Pixels.cpp               |  7 +++++++
 src/_STL.cpp                  |  7 +++++++
 test/test_pgmagick_image.py   | 12 ++++++++++++
 test/test_pgmagick_pixel.py   |  6 ++++++
 14 files changed, 51 insertions(+), 12 deletions(-)

diff --cc debian/.git-dpm
index 68192fc,0000000..32f35c4
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
- a0ce6e3c73190b0fd18de454877637190d64437a
- a0ce6e3c73190b0fd18de454877637190d64437a
- f9626bb662ca1f23d043d5ac925acd3d6e303c2d
++a8d535b2bcd66bbf87ad2e85dd523f2f7f1bd4a8
++a8d535b2bcd66bbf87ad2e85dd523f2f7f1bd4a8
++a8d535b2bcd66bbf87ad2e85dd523f2f7f1bd4a8
 +a8d535b2bcd66bbf87ad2e85dd523f2f7f1bd4a8
 +python-pgmagick_0.6.4.orig.tar.gz
 +b617b2b3babff98e07a8505d6d865122ddf71dc5
 +41043
 +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/python-pgmagick.git