[Pkg-gnupg-commit] [gpgme] 05/10: only build against latest python3 (Closes: #866555)

[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 530bbb9396195f3b4a4908c760e7a74d4ffeef5a
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Dec 4 17:25:03 2017 -0500

    only build against latest python3 (Closes: #866555)
---
 debian/control                                     |  2 +-
 .../0045-Try-to-find-python-3.5-as-well.patch      | 41 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/debian/control b/debian/control
index 429d2d9..0a11848 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  libgpg-error-dev (>> 1.17),
  pkg-config,
  python-all-dev,
- python3-all-dev,
+ python3-dev,
  qtbase5-dev,
  scdaemon,
  swig,
diff --git a/debian/patches/python-3.5/0045-Try-to-find-python-3.5-as-well.patch b/debian/patches/python-3.5/0045-Try-to-find-python-3.5-as-well.patch
deleted file mode 100644
index df5243d..0000000
--- a/debian/patches/python-3.5/0045-Try-to-find-python-3.5-as-well.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Thu, 17 Aug 2017 21:57:43 -0400
-Subject: Try to find python 3.5 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.5.
-+	    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.5], [
-+		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 53abc67..ea00533 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,7 +42,6 @@
 0042-doc-Add-more-tofu-documentation.patch
 0043-doc-Clarify-import-keys-operation.patch
 0044-doc-Clarify-import-keys-operation-further.patch
-python-3.5/0045-Try-to-find-python-3.5-as-well.patch
 0046-python-Improve-keylist-test.patch
 0047-python-Support-parallel-build-in-tests.patch
 0048-Fix-a-couple-of-bugs-pointed-out-by-clang-compiler-w.patch

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