[Python-modules-commits] [pythonmagick] 12/13: merge patched into master

[Bastien ROUCARIES]

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

broucaries-guest pushed a commit to branch master
in repository pythonmagick.

commit 5c2bfdfcdbab9a282a7083d1e79f7c1c4b3848ac
Merge: febbf5f 1ac5a6a
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Sun Oct 30 15:41:39 2016 +0100

    merge patched into master

 ChangeLog                                |    9 +
 Makefile.in                              |   59 +-
 aclocal.m4                               |  280 +-
 autogen.pl                               |    0
 config/compile                           |    2 +-
 config/config.guess                      |  173 +-
 config/config.h.in                       |    3 +-
 config/config.sub                        |   38 +-
 config/depcomp                           |    2 +-
 config/install-sh                        |  366 +-
 config/ltmain.sh                         | 5528 +++++++++++++++++++-----------
 config/missing                           |    2 +-
 config/py-compile                        |    2 +-
 configure                                | 3173 ++++++++++-------
 configure.ac                             |    2 +-
 debian/.git-dpm                          |    4 +-
 helpers_src/Blob.cpp                     |    8 +
 helpers_src/Blob.h                       |    1 +
 helpers_src/Makefile.in                  |   25 +-
 m4/libtool.m4                            | 2550 ++++++++------
 m4/ltoptions.m4                          |  127 +-
 m4/ltsugar.m4                            |    7 +-
 m4/ltversion.m4                          |   12 +-
 m4/lt~obsolete.m4                        |    7 +-
 py-compile                               |    0
 pyste_src/Blob.pyste                     |    1 +
 pythonmagick_src/Makefile.in             |   24 +-
 pythonmagick_src/_Blob.cpp               |    8 +-
 pythonmagick_src/_Color.cpp              |   19 +-
 pythonmagick_src/_ColorspaceType.cpp     |    4 +
 pythonmagick_src/_CompositeOperator.cpp  |   22 +
 pythonmagick_src/_Drawable.cpp           |    8 +-
 pythonmagick_src/_DrawableDashArray.cpp  |   28 +
 pythonmagick_src/_DrawableDashOffset.cpp |   26 +
 pythonmagick_src/_DrawableMatte.cpp      |   32 +
 pythonmagick_src/_FilterTypes.cpp        |    6 +
 pythonmagick_src/_Geometry.cpp           |    6 +
 pythonmagick_src/_GravityType.cpp        |    2 +
 pythonmagick_src/_Image.cpp              |  134 +-
 39 files changed, 7687 insertions(+), 5013 deletions(-)

diff --cc debian/.git-dpm
index b231bf1,0000000..514dfca
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
 +c941938816bf6ccf95f72d85073282ca4f0a9178
- c941938816bf6ccf95f72d85073282ca4f0a9178
- 75a191b8dd8a6ff74789f773872ab9b37094fc87
++1ac5a6ab1d079702dbb6776759d8c4356bdf55f6
++e51f997484c06fb6a4bf47e6062feda117a29be6
 +e51f997484c06fb6a4bf47e6062feda117a29be6
 +pythonmagick_0.9.14.orig.tar.xz
 +b8a6eaf97e49de0cbb2e6d287bfe01288eaade51
 +270488
 +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/pythonmagick.git