-
--- 1.10.0-1/debian/control 2017-12-14 17:48:43.000000000 +0000
+++ 1.10.0-1ubuntu1/debian/control 2017-12-14 21:47:10.000000000 +0000
@@ -1,7 +1,8 @@
Source: gpgme1.0
Priority: optional
Section: libs
-Maintainer: Debian GnuPG Maintainers <pkg-gnupg-maint@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GnuPG Maintainers <pkg-gnupg-maint@lists.alioth.debian.org>
Uploaders:
Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
Build-Depends:
-
--- 1.10.0-1/debian/patches/0007-Python-Versions.patch 1970-01-01 00:00:00.000000000 +0000
+++ 1.10.0-1ubuntu1/debian/patches/0007-Python-Versions.patch 2018-01-15 13:21:43.000000000 +0000
@@ -0,0 +1,68 @@
+Description: Use py{,3}versions detection.
+Author: Adam Conrad <adconrad@ubuntu.com>
+Last-Update: 2018-01-15
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -402,6 +402,7 @@ if test "$found_py" = "1" -o "$found_py2
+ PYTHONS=
+ PYTHON_VERSIONS=
+ unset PYTHON
++ unset PYTHON_INTERPS
+ unset PYTHON_VERSION
+ unset PYTHON_CPPFLAGS
+ unset PYTHON_LDFLAGS
+@@ -416,18 +417,21 @@ if test "$found_py" = "1" -o "$found_py2
+ unset am_cv_python_pyexecdir
+
+ if test "$found_py" = "1" -o "$found_py2" = "1"; then
+- AM_PATH_PYTHON([2.7], [
+- AX_PYTHON_DEVEL
++ for i in $(pyversions -vr); do
++ PYTHON="/usr/bin/python$i";
++ PYTHON_INTERPS="$(echo $PYTHON_INTERPS $PYTHON)";
++ PYTHON_VERSION="$(echo $i $PYTHON_VERSION)";
++ done
+ if test "$PYTHON_VERSION"; then
+- PYTHONS="$(echo $PYTHONS $PYTHON)"
++ PYTHONS="$(echo $PYTHONS $PYTHON_INTERPS)"
+ PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
+ fi
+- ], :)
+ fi
+
+ if test "$found_py" = "1" -o "$found_py3" = "1"; then
+ # Reset everything, so that we can look for another Python.
+ unset PYTHON
++ unset PYTHON_INTERPS
+ unset PYTHON_VERSION
+ unset PYTHON_CPPFLAGS
+ unset PYTHON_LDFLAGS
+@@ -440,13 +444,15 @@ if test "$found_py" = "1" -o "$found_py2
+ unset am_cv_python_platform
+ unset am_cv_python_pythondir
+ unset am_cv_python_pyexecdir
+- AM_PATH_PYTHON([3.4], [
+- AX_PYTHON_DEVEL
++ for i in $(py3versions -vr); do
++ PYTHON="/usr/bin/python$i";
++ PYTHON_INTERPS="$(echo $PYTHON_INTERPS $PYTHON)";
++ PYTHON_VERSION="$(echo $i $PYTHON_VERSION)";
++ done
+ if test "$PYTHON_VERSION"; then
+- PYTHONS="$(echo $PYTHONS $PYTHON)"
++ PYTHONS="$(echo $PYTHONS $PYTHON_INTERPS)"
+ PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
+ fi
+- ], :)
+ fi
+
+ # Recover some values lost in the second attempt to find Python.
+@@ -471,6 +477,7 @@ if test "$found_py" = "1" -o "$found_py2
+ fi
+ fi
+
++ AC_SUBST(PYTHON, $PYTHON)
+ AC_SUBST(PYTHONS, $PYTHONS)
+ fi
+ fi
-
--- 1.10.0-1/debian/patches/series 2017-12-14 17:51:22.000000000 +0000
+++ 1.10.0-1ubuntu1/debian/patches/series 2018-01-15 12:44:06.000000000 +0000
@@ -1 +1,3 @@
0001-avoid-identifying-as-beta.patch
+0006-PIC-and-shared.patch
+0007-Python-Versions.patch
-
--- 1.10.0-1/debian/libgpgme-dev.links 1970-01-01 00:00:00.000000000 +0000
+++ 1.10.0-1ubuntu1/debian/libgpgme-dev.links 2017-02-18 21:22:02.000000000 +0000
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libgpgme.so usr/lib/${DEB_HOST_MULTIARCH}/libgpgme-pthread.so
-
debian/patches/0006-PIC-and-shared.patch
--- 1.10.0-1/debian/patches/0006-PIC-and-shared.patch 1970-01-01 00:00:00.000000000 +0000
+++ 1.10.0-1ubuntu1/debian/patches/0006-PIC-and-shared.patch 2017-05-12 07:22:23.000000000 +0000
@@ -0,0 +1,19 @@
+Description: Use -fPIC instead of -fpic.
+Author: Adam Conrad <adconrad@ubuntu.com>
+Last-Update: 2017-05-12
+
+Index: gpgme1.0-1.8.0/m4/qt.m4
+===================================================================
+--- gpgme1.0-1.8.0.orig/m4/qt.m4
++++ gpgme1.0-1.8.0/m4/qt.m4
+@@ -24,8 +24,9 @@ AC_DEFUN([FIND_QT],
+ [have_qt5test_libs="no"])
+
+ if ! test "$have_w32_system" = yes; then
++ GPGME_QT_CFLAGS="$GPGME_QT_CFLAGS -shared"
+ if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
+- GPGME_QT_CFLAGS="$GPGME_QT_CFLAGS -fpic"
++ GPGME_QT_CFLAGS="$GPGME_QT_CFLAGS -fPIC"
+ fi
+ fi
+ if test "$have_qt5_libs" = "yes"; then