[Pkg-gnupg-commit] [gpgme] 01/02: pull a cleanup patch from upstream

[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 74080b30178c0df95ee7c92893628f9f2cc08260
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Nov 23 01:39:30 2016 -0500

    pull a cleanup patch from upstream
---
 .../patches/0001-avoid-identifying-as-beta.patch   |  4 +--
 ...-Remove-a-forgotten-instance-of-libsuffix.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0001-avoid-identifying-as-beta.patch b/debian/patches/0001-avoid-identifying-as-beta.patch
index e1e1899..a32c928 100644
--- a/debian/patches/0001-avoid-identifying-as-beta.patch
+++ b/debian/patches/0001-avoid-identifying-as-beta.patch
@@ -11,10 +11,10 @@ This patch avoids that situation.
  1 file changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 6580b7c..16950e8 100644
+index 0a67b48..9a5372e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -37,13 +37,10 @@ m4_define(mym4_version_micro, [1])
+@@ -37,13 +37,10 @@ m4_define(mym4_version_micro, [0])
  # processing is done by autoconf and not during the configure run.
  m4_define(mym4_version,
            [mym4_version_major.mym4_version_minor.mym4_version_micro])
diff --git a/debian/patches/0002-Remove-a-forgotten-instance-of-libsuffix.patch b/debian/patches/0002-Remove-a-forgotten-instance-of-libsuffix.patch
new file mode 100644
index 0000000..589a1de
--- /dev/null
+++ b/debian/patches/0002-Remove-a-forgotten-instance-of-libsuffix.patch
@@ -0,0 +1,29 @@
+From: Heiko Becker <heirecka at exherbo.org>
+Date: Wed, 16 Nov 2016 23:09:45 +0100
+Subject: Remove a forgotten instance of @libsuffix@
+
+* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten
+instance of @libsuffix at .
+--
+
+b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from
+cmake config files, but missed one instance.
+
+Signed-off-by: Heiko Becker <heirecka at exherbo.org>
+---
+ lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+index 928d19f..cbe9713 100644
+--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
++++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
+ 
+ set_target_properties(Gpgmepp PROPERTIES
+   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
+-  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme at libsuffix@;@LIBASSUAN_LIBS@"
++  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
+   IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
+ )
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a45150a..b6073ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-avoid-identifying-as-beta.patch
+0002-Remove-a-forgotten-instance-of-libsuffix.patch

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