[SCM] messagelib packaging branch, debian/sid, updated. debian/16.04.3-3

[Sandro Knauß]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/messagelib.git;a=commitdiff;h=62178ea

The following commit has been merged in the debian/sid branch:
commit 62178ea366777fd3a44771c5ff7aa6a58ecf7d2b
Author: Sandro Knauß <sknauss at kde.org>
Date:   Sat Jun 17 08:34:47 2017 +0200

    Revert "Build against GpgME>=1.8.0, to get rid of gpgmepp"
    
    This reverts commit 16da74f8b884e02a2835c6c1c92f8c2041aa27a1.
---
 debian/changelog                    |  6 ----
 debian/control                      |  2 +-
 debian/patches/remove_gpgmepp.patch | 65 -------------------------------------
 debian/patches/series               |  1 -
 4 files changed, 1 insertion(+), 73 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0cc5e7..c93e725 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,7 @@
 kf5-messagelib (4:16.04.3-3~) UNRELEASED; urgency=medium
 
-  [ Debian Qt/KDE Maintainers ]
   * Team upload.
 
-  [ Sandro Knauß ]
-  * Build against GpgME>=1.8.0, to get rid of gpgmepp
-    - Update Build-Deps (libgpgme11-dev-, libgpgmepp-dev+).
-    - Add patch remove_gpgmepp.patch, to replace KF5::Gpgme with GpgME.
-
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Dec 2016 13:29:10 +0100
 
 kf5-messagelib (4:16.04.3-2) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 54a68ec..aeffb94 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
                extra-cmake-modules (>= 5.19.0~),
                git,
-               libgpgmepp-dev,
+               libgpgme11-dev,
                libgrantlee5-dev (>= 5.0~),
                libkf5akonadi-dev (>= 4:5.2.0~),
                libkf5akonadimime-dev (>= 5.2.0~),
diff --git a/debian/patches/remove_gpgmepp.patch b/debian/patches/remove_gpgmepp.patch
deleted file mode 100644
index 33f30aa..0000000
--- a/debian/patches/remove_gpgmepp.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,7 +71,8 @@ set(GRANTLEETHEME_LIB_VERSION "5.2.0")
- set(KDEPIM_APPS_LIBS_LIB_VERSION "5.2.0")
- set(LIBKLEO_LIB_VERSION "5.2.0")
- set(PIMCOMMON_LIB_VERSION "5.2.0")
--find_package(Gpgme REQUIRED)
-+find_package(Gpgmepp "1.8.0" REQUIRED)
-+find_package(QGpgme "1.8.0" REQUIRED)
- find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIBS_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5Gravatar ${GRAVATAR_LIB_VERSION} CONFIG REQUIRED)
---- a/messagecomposer/autotests/CMakeLists.txt
-+++ b/messagecomposer/autotests/CMakeLists.txt
-@@ -28,7 +28,7 @@ macro( add_messagecomposer_cryptotest _s
-         KF5::PimTextEdit
-         KF5::AkonadiCore
-         Qt5::Test
--        KF5::QGpgme
-+        QGpgme
-         KF5::IconThemes
-         KF5::Completion
-         KF5::MailTransport
---- a/messageviewer/autotests/CMakeLists.txt
-+++ b/messageviewer/autotests/CMakeLists.txt
-@@ -11,7 +11,7 @@ macro(add_messageviewer_unittest _source
-     ecm_add_test(${_source} util.cpp setupenv.cpp testcsshelper.cpp ../src/viewer/cryptohelper.cpp
-         TEST_NAME ${_name}
-         NAME_PREFIX "messageviewer-"
--        LINK_LIBRARIES KF5::MessageViewer KF5::Libkleo KF5::QGpgme Qt5::Test Qt5::WebKitWidgets KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore
-+        LINK_LIBRARIES KF5::MessageViewer KF5::Libkleo QGpgme Qt5::Test Qt5::WebKitWidgets KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore
-     )
- endmacro ()
- 
-@@ -32,7 +32,7 @@ macro(add_messageviewer_crypto_unittest
-     target_link_libraries( ${_name}
-         KF5::MessageViewer
-         KF5::Libkleo
--        KF5::QGpgme
-+        QGpgme
-         Qt5::Test
-         Qt5::WebKitWidgets
-         KF5::KIOCore
---- a/messageviewer/src/CMakeLists.txt
-+++ b/messageviewer/src/CMakeLists.txt
-@@ -340,8 +340,6 @@ target_link_libraries(KF5MessageViewer
-     )
- if (WIN32)
-     target_link_libraries(KF5MessageViewer PUBLIC KF5::Gpgmepp)
--else()
--    target_link_libraries(KF5MessageViewer PUBLIC KF5::Gpgmepp-pthread)
- endif()
- 
- target_include_directories(KF5MessageViewer PUBLIC $<TARGET_PROPERTY:KF5::WebKit,INTERFACE_INCLUDE_DIRECTORIES>)
---- a/templateparser/autotests/CMakeLists.txt
-+++ b/templateparser/autotests/CMakeLists.txt
-@@ -15,7 +15,7 @@ macro(add_templateparser_unittest _sourc
-     KF5::Libkleo
-     KF5::TemplateParser
-     KF5::MessageViewer
--    KF5::QGpgme
-+    QGpgme
-     Qt5::Test
-     Qt5::WebKitWidgets
-     KF5::KIOCore
diff --git a/debian/patches/series b/debian/patches/series
index ff094f5..6e14fca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 upstream_add_copying_files.patch
 make-it-impossible-to-override-css-settings-from-a-h.patch
-remove_gpgmepp.patch

-- 
messagelib packaging