[SCM] KTorrent library Debian packaging branch, experimental, updated. debian/2.0.1-1-13-g7d1c1b4
Pino Toscano
pino at moszumanska.debian.org
Fri Sep 1 07:02:02 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libktorrent.git;a=commitdiff;h=3f87ffc
The following commit has been merged in the experimental branch:
commit 3f87ffc32723393a295ec72639abfaf9e5cc1dfe
Author: Pino Toscano <pino at debian.org>
Date: Fri Sep 1 08:09:37 2017 +0200
update the patches
- cmake-gcrypt-version.diff: drop, obsolete
---
debian/changelog | 2 ++
debian/patches/cmake-gcrypt-version.diff | 24 ------------------------
debian/patches/series | 1 -
3 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 43cc23e..c8186d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libktorrent (2.1-0r1) UNRELEASED; urgency=medium
[ Pino Toscano ]
* New upstream release.
* Update symbols files from buildd logs.
+ * Update the patches:
+ - cmake-gcrypt-version.diff: drop, obsolete
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Tue, 05 Jul 2016 08:01:35 +0200
diff --git a/debian/patches/cmake-gcrypt-version.diff b/debian/patches/cmake-gcrypt-version.diff
deleted file mode 100644
index ad61430..0000000
--- a/debian/patches/cmake-gcrypt-version.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-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 7d35e98..f36a47c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
set-pathmax.diff
-cmake-gcrypt-version.diff
--
KTorrent library Debian packaging
More information about the pkg-kde-commits
mailing list