[Python-modules-commits] [pythonmagick] 08/10: 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 b9e841584d634956f735ea93b48351715b8b2f25
Merge: 63aaf7a 67c2b20
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Sun Oct 30 23:20:58 2016 +0100

    merge patched into master

 configure.ac                                       | 12 ++++++-
 debian/.git-dpm                                    |  4 +--
 ...-Add-minimal-python-version-for-compiling.patch | 42 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 56 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 1e24872,0000000..86cf32a
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
- 1ac5a6ab1d079702dbb6776759d8c4356bdf55f6
- 1ac5a6ab1d079702dbb6776759d8c4356bdf55f6
++67c2b20cbb4ad9f7585425393b582294c04c3c19
++67c2b20cbb4ad9f7585425393b582294c04c3c19
 +e51f997484c06fb6a4bf47e6062feda117a29be6
 +e51f997484c06fb6a4bf47e6062feda117a29be6
 +pythonmagick_0.9.14.orig.tar.xz
 +b8a6eaf97e49de0cbb2e6d287bfe01288eaade51
 +270488
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Add-minimal-python-version-for-compiling.patch
index 0000000,0000000..8eb1f1c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Add-minimal-python-version-for-compiling.patch
@@@ -1,0 -1,0 +1,42 @@@
++From 67c2b20cbb4ad9f7585425393b582294c04c3c19 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Sun, 30 Oct 2016 23:17:53 +0100
++Subject: Add minimal python version for compiling
++
++Will allow to compile python2 and python3 package
++
++Forwarded: yes, https://github.com/ImageMagick/PythonMagick/issues/6
++---
++ configure.ac | 12 +++++++++++-
++ 1 file changed, 11 insertions(+), 1 deletion(-)
++
++diff --git a/configure.ac b/configure.ac
++index 99278ef..94ee01f 100644
++--- a/configure.ac
+++++ b/configure.ac
++@@ -27,14 +27,24 @@ AC_PROG_INSTALL
++ AC_PROG_LN_S
++ AC_PROG_MAKE_SET
++ AC_PROG_LIBTOOL
++-AM_PATH_PYTHON([2.4])
++ PKG_PROG_PKG_CONFIG
++ 
++ # Add configure option --enable-maintainer-mode which enables dependency
++ # checking and generation useful to package maintainers.  This is made an
++ # option to avoid confusing end users.
+++
+++AC_ARG_WITH([python-min-version],
+++        [AS_HELP_STRING([--with-python-min-version=version : python version to use])],
+++        [PYTHON_MIN_VERSION="$withval"],
+++        [PYTHON_MIN_VERSION="2.4"])
++ AM_MAINTAINER_MODE
++ 
+++AX_COMPARE_VERSION($PYTHON_MIN_VERSION, lt, 2.4,AC_MSG_ERROR([Python version not supported]))
+++AC_MSG_CHECKING([for python with minimal version])
+++AC_MSG_RESULT([$PYTHON_MIN_VERSION])
+++AM_PATH_PYTHON([$PYTHON_MIN_VERSION])
+++AX_PYTHON_DEVEL([>= '$PYTHON_MIN_VERSION'])
+++
++ # Checks for libraries.
++ AX_BOOST_BASE
++ AX_BOOST_PYTHON
diff --cc debian/patches/series
index 0340230,0000000..1f46297
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +001_autofoo_fixes.diff
++0002-Add-minimal-python-version-for-compiling.patch

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