[Pkg-gnupg-commit] [gpgme] 06/09: try to force python 3.6

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gpgme.

commit 27e7d80efc4f1b4f41cd8c3e733073a8e3c470bd
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Aug 17 21:39:45 2017 -0400

    try to force python 3.6
---
 .../0045-Try-to-find-python-3.6-as-well.patch      | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  1 +
 3 files changed, 43 insertions(+)

diff --git a/debian/patches/python-3.6/0045-Try-to-find-python-3.6-as-well.patch b/debian/patches/python-3.6/0045-Try-to-find-python-3.6-as-well.patch
new file mode 100644
index 0000000..202d817
--- /dev/null
+++ b/debian/patches/python-3.6/0045-Try-to-find-python-3.6-as-well.patch
@@ -0,0 +1,41 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Thu, 17 Aug 2017 21:57:43 -0400
+Subject: Try to find python 3.6 as well
+
+---
+ configure.ac | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 794e0d9..510aae1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -447,6 +447,28 @@ if test "$found_py" = "1" -o "$found_py2" = "1" -o "$found_py3" = "1"; then
+ 			PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
+ 		fi
+ 	    ], :)
++
++	    # Reset everything, so that we can look for Python 3.6.
++	    unset PYTHON
++	    unset PYTHON_VERSION
++	    unset PYTHON_CPPFLAGS
++	    unset PYTHON_LDFLAGS
++	    unset PYTHON_SITE_PKG
++	    unset PYTHON_EXTRA_LIBS
++	    unset PYTHON_EXTRA_LDFLAGS
++	    unset ac_cv_path_PYTHON
++	    unset am_cv_pathless_PYTHON
++	    unset am_cv_python_version
++	    unset am_cv_python_platform
++	    unset am_cv_python_pythondir
++	    unset am_cv_python_pyexecdir
++	    AM_PATH_PYTHON([3.6], [
++		AX_PYTHON_DEVEL
++		if test "$PYTHON_VERSION"; then
++			PYTHONS="$(echo $PYTHONS $PYTHON)"
++			PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
++		fi
++	    ], :)
+ 	fi
+ 
+ 	# Recover some values lost in the second attempt to find Python.
diff --git a/debian/patches/series b/debian/patches/series
index 765e1ef..8a3b072 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,3 +42,4 @@
 0042-doc-Add-more-tofu-documentation.patch
 0043-doc-Clarify-import-keys-operation.patch
 0044-doc-Clarify-import-keys-operation-further.patch
+python-3.6/0045-Try-to-find-python-3.6-as-well.patch
diff --git a/debian/rules b/debian/rules
index 7fe12b2..e684337 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 	    --enable-static \
 	    --enable-languages="python cpp qt" \
+	    PYTHON_VERSIONS="2.7 3.5 3.6" \
 	    --infodir=/usr/share/info
 
 override_dh_install:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git