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

[Sebastian Ramacher]

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

sramacher pushed a commit to tag debian/0.5.12-1
in repository python-pgmagick.

commit 047463ac70f666692d049ffc5f7d2cab2477d4ee
Merge: 31a52dc c143d82
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Nov 8 14:57:17 2015 +0100

    merge patched into master

 PKG-INFO                              |  2 +-
 debian/.git-dpm                       |  6 +++---
 debian/patches/debian-changes-0.3.0-1 |  2 +-
 pgmagick.egg-info/PKG-INFO            |  2 +-
 pgmagick/_version.py                  |  2 +-
 setup.py                              | 13 +++++++++++--
 src/_Image.cpp                        |  8 ++++++--
 7 files changed, 24 insertions(+), 11 deletions(-)

diff --cc debian/.git-dpm
index 602d9ee,0000000..18cd9c5
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
- e1f131080147b58f493440cc7799e627c0fc6d78
- e1f131080147b58f493440cc7799e627c0fc6d78
- 1485b185fe35a98389faa3b683b88d83cccdd495
++c143d82a67e9c7e80f0aa156b6b84def303446c4
++c143d82a67e9c7e80f0aa156b6b84def303446c4
++1c248d7e9544c447f8c0e8be3c7f4f15d260cb10
 +1c248d7e9544c447f8c0e8be3c7f4f15d260cb10
 +python-pgmagick_0.5.12.orig.tar.gz
 +f58632520d369c8d101e78aa9b9d203b7d3fd34f
 +39906
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/debian-changes-0.3.0-1
index 81c67e6,0000000..d6c5ea6
mode 100644,000000..100644
--- a/debian/patches/debian-changes-0.3.0-1
+++ b/debian/patches/debian-changes-0.3.0-1
@@@ -1,33 -1,0 +1,33 @@@
- From e1f131080147b58f493440cc7799e627c0fc6d78 Mon Sep 17 00:00:00 2001
++From c143d82a67e9c7e80f0aa156b6b84def303446c4 Mon Sep 17 00:00:00 2001
 +From: TANIGUCHI Takaki <takaki at debian.org>
 +Date: Thu, 8 Oct 2015 12:40:14 -0700
 +Subject: Upstream changes introduced in version 0.3.0-1
 +
 + This patch has been created by dpkg-source during the package build.
 + Here's the last changelog entry, hopefully it gives details on why
 + those changes were made:
 + .
 + python-pgmagick (0.3.0-1) unstable; urgency=low
 + .
 +   * Initial release (Closes: #601047)
 + .
 + The person named in the Author field signed this changelog entry.
 +Bug-Debian: http://bugs.debian.org/601047
 +
 +Patch-Name: debian-changes-0.3.0-1
 +---
 + pgmagick.egg-info/SOURCES.txt | 1 +
 + 1 file changed, 1 insertion(+)
 +
 +diff --git a/pgmagick.egg-info/SOURCES.txt b/pgmagick.egg-info/SOURCES.txt
 +index 10169f3..1cfc3d1 100644
 +--- a/pgmagick.egg-info/SOURCES.txt
 ++++ b/pgmagick.egg-info/SOURCES.txt
 +@@ -2,6 +2,7 @@ LICENSE
 + MANIFEST.in
 + Makefile
 + README.rst
 ++setup.cfg
 + setup.py
 + ./src/_Blob.cpp
 + ./src/_ChannelType.cpp

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