[SCM] KTorrent library Debian packaging branch, master, updated. debian/2.1-2

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libktorrent.git;a=commitdiff;h=5f0e802

The following commit has been merged in the master branch:
commit 5f0e8028d501b2a3b24b09663a5e62d50aa7d817
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jul 2 21:57:02 2016 +0200

    cmake: fix extraction of libcrypt version
---
 debian/changelog                         |  2 ++
 debian/patches/cmake-gcrypt-version.diff | 24 ++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e73ff7d..631ba9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ libktorrent (2.0.1-0r1) UNRELEASED; urgency=medium
     - upstream_don-t-include-circular_buffer-in-moc-run.patch: drop,
       backported from upstream
     - set-pathmax.diff: refresh
+  * Fix extraction in cmake of the libcrypt version; patch
+    cmake-gcrypt-version.diff.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 02 Jul 2016 19:57:23 +0200
 
diff --git a/debian/patches/cmake-gcrypt-version.diff b/debian/patches/cmake-gcrypt-version.diff
new file mode 100644
index 0000000..ad61430
--- /dev/null
+++ b/debian/patches/cmake-gcrypt-version.diff
@@ -0,0 +1,24 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: Fix extraction of libgcrypt version
+ Accept also text in the GCRYPT_VERSION #define after the version, so it is
+ possible to parse the version also in cases like:
+ .
+   #define GCRYPT_VERSION "1.7.1-beta"
+Last-Update: 2016-07-02
+Forwarded: no
+
+--- a/cmake/FindLibGcrypt.cmake
++++ b/cmake/FindLibGcrypt.cmake
+@@ -96,9 +96,9 @@ endif()
+ # #define GCRYPT_VERSION "1.6.4"
+ if(LibGcrypt_INCLUDE_DIRS AND LibGcrypt_LIBRARIES)
+     file(STRINGS ${LibGcrypt_INCLUDE_DIRS}/gcrypt.h _GCRYPT_H REGEX "^#define GCRYPT_VERSION[ ]+.*$")
+-    string(REGEX REPLACE "^.*GCRYPT_VERSION[ ]+\"([0-9]).([0-9]).([0-9])\".*$" "\1" LibGcrypt_MAJOR_VERSION "${_GCRYPT_H}")
+-    string(REGEX REPLACE "^.*GCRYPT_VERSION[ ]+\"([0-9]).([0-9]).([0-9])\".*$" "\2" LibGcrypt_MINOR_VERSION "${_GCRYPT_H}")
+-    string(REGEX REPLACE "^.*GCRYPT_VERSION[ ]+\"([0-9]).([0-9]).([0-9])\".*$" "\3" LibGcrypt_PATCH_VERSION "${_GCRYPT_H}")
++    string(REGEX REPLACE "^.*GCRYPT_VERSION[ ]+\"([0-9]).([0-9]).([0-9])[^\"]*\".*$" "\1" LibGcrypt_MAJOR_VERSION "${_GCRYPT_H}")
++    string(REGEX REPLACE "^.*GCRYPT_VERSION[ ]+\"([0-9]).([0-9]).([0-9])[^\"]*\".*$" "\2" LibGcrypt_MINOR_VERSION "${_GCRYPT_H}")
++    string(REGEX REPLACE "^.*GCRYPT_VERSION[ ]+\"([0-9]).([0-9]).([0-9])[^\"]*\".*$" "\3" LibGcrypt_PATCH_VERSION "${_GCRYPT_H}")
+ 
+     set(LibGcrypt_VERSION "${LibGcrypt_MAJOR_VERSION}.${LibGcrypt_MINOR_VERSION}.${LibGcrypt_PATCH_VERSION}")
+     unset(_GCRYPT_H)
diff --git a/debian/patches/series b/debian/patches/series
index f36a47c..7d35e98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 set-pathmax.diff
+cmake-gcrypt-version.diff

-- 
KTorrent library Debian packaging