[SCM] messagelib packaging branch, master, updated. debian/16.04.3-2-84-gd3cff88

Maximiliano Curia maxy at moszumanska.debian.org
Sun Aug 27 20:39:27 UTC 2017


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

The following commit has been merged in the master branch:
commit d4c894625fb19ca164d6e7d39863da30c0545a28
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Oct 6 23:40:29 2016 +0100

    remove version changes
---
 .../kde_01_CVE-2016-7968-CVE-2016-7966.diff        | 59 ----------------------
 1 file changed, 59 deletions(-)

diff --git a/debian/patches/kde_01_CVE-2016-7968-CVE-2016-7966.diff b/debian/patches/kde_01_CVE-2016-7968-CVE-2016-7966.diff
index 36b8642..8789198 100644
--- a/debian/patches/kde_01_CVE-2016-7968-CVE-2016-7966.diff
+++ b/debian/patches/kde_01_CVE-2016-7968-CVE-2016-7966.diff
@@ -1,62 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 09a6e81..b7736a7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,28 +18,28 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(ECMQtDeclareLoggingCategory)
- include(ECMAddTests)
- 
--set(PIM_VERSION "5.3.1")
-+set(PIM_VERSION "5.3.2")
- 
- set(MESSAGELIB_LIB_VERSION ${PIM_VERSION})
--set(AKONADIMIME_LIB_VERSION "5.3.1")
-+set(AKONADIMIME_LIB_VERSION "5.3.2")
- 
- set(QT_REQUIRED_VERSION "5.6.0")
- 
--set(AKONADI_VERSION "5.3.1")
--set(AKONADINOTES_LIB_VERSION "5.3.1")
--set(GRANTLEETHEME_LIB_VERSION "5.3.1")
--set(GRAVATAR_LIB_VERSION "5.3.1")
--set(IDENTITYMANAGEMENT_LIB_VERSION "5.3.1")
--set(KCONTACTS_LIB_VERSION "5.3.1")
--set(KDEPIM_APPS_LIB_VERSION "5.3.1")
--set(KLDAP_LIB_VERSION "5.3.1")
--set(KMAILTRANSPORT_LIB_VERSION "5.3.1")
--set(KMBOX_LIB_VERSION "5.3.1")
--set(KMIME_LIB_VERSION "5.3.1")
--set(KPIMTEXTEDIT_LIB_VERSION "5.3.1")
--set(LIBKDEPIM_LIB_VERSION "5.3.1")
--set(LIBKLEO_LIB_VERSION "5.3.1")
--set(PIMCOMMON_LIB_VERSION "5.3.1")
-+set(AKONADI_VERSION "5.3.2")
-+set(AKONADINOTES_LIB_VERSION "5.3.2")
-+set(GRANTLEETHEME_LIB_VERSION "5.3.2")
-+set(GRAVATAR_LIB_VERSION "5.3.2")
-+set(IDENTITYMANAGEMENT_LIB_VERSION "5.3.2")
-+set(KCONTACTS_LIB_VERSION "5.3.2")
-+set(KDEPIM_APPS_LIB_VERSION "5.3.2")
-+set(KLDAP_LIB_VERSION "5.3.2")
-+set(KMAILTRANSPORT_LIB_VERSION "5.3.2")
-+set(KMBOX_LIB_VERSION "5.3.2")
-+set(KMIME_LIB_VERSION "5.3.2")
-+set(KPIMTEXTEDIT_LIB_VERSION "5.3.2")
-+set(LIBKDEPIM_LIB_VERSION "5.3.2")
-+set(LIBKLEO_LIB_VERSION "5.3.2")
-+set(PIMCOMMON_LIB_VERSION "5.3.2")
- 
- find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Network PrintSupport WebEngine WebEngineWidgets WebKitWidgets)
- 
-@@ -82,7 +82,7 @@ find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5SendLater ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
- 
--find_package(KF5AkonadiSearch "5.3.1" CONFIG REQUIRED)
-+find_package(KF5AkonadiSearch "5.3.2" CONFIG REQUIRED)
- set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
- 
- option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
 diff --git a/messagecomposer/src/recipient/recipientseditor.cpp b/messagecomposer/src/recipient/recipientseditor.cpp
 index c0d660e..3f6fa02 100644
 --- a/messagecomposer/src/recipient/recipientseditor.cpp

-- 
messagelib packaging



More information about the pkg-kde-commits mailing list