[SCM] KDE Base Applications module packaging branch, master, updated. debian/16.04.2-1-4-g7e33c0b

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 7e33c0ba2b7202988a4738e6b342d7ae85d5654e
Author: Pino Toscano <pino at debian.org>
Date:   Thu Jul 21 08:17:22 2016 +0200

    update the patches
    
    - upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch:
      drop, backported from upstream
    - upstream_cmake-use-variable-for-knewstuff3-library.patch: drop,
      backported from upstream
---
 debian/changelog                                   |  5 +++++
 debian/patches/series                              |  2 --
 ...cmake-use-variable-for-knewstuff3-library.patch | 25 ----------------------
 ...in_req-to-match-kdelibs-policy-and-enable.patch | 25 ----------------------
 4 files changed, 5 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b75662..a26e4c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ kde-baseapps (4:16.04.3-0r1) UNRELEASED; urgency=medium
   * New upstream release.
   * Remove the unused baloo-dev build dependency, as dolphin4 is already built
     without Baloo support (unmaintained in KDE 4).
+  * Update the patches:
+    - upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch:
+      drop, backported from upstream
+    - upstream_cmake-use-variable-for-knewstuff3-library.patch: drop,
+      backported from upstream
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 02 Jul 2016 07:56:39 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index fee487e..fa12a8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,3 @@ enable_dlrestrictions.diff
 kubuntu_disable-failing-test.diff
 kubuntu_ignore-tests.diff
 disable_plasma.diff
-upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
-upstream_cmake-use-variable-for-knewstuff3-library.patch
diff --git a/debian/patches/upstream_cmake-use-variable-for-knewstuff3-library.patch b/debian/patches/upstream_cmake-use-variable-for-knewstuff3-library.patch
deleted file mode 100644
index 4decfca..0000000
--- a/debian/patches/upstream_cmake-use-variable-for-knewstuff3-library.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3eab13bc1e7fbe6c61bc156f7d6342298678dbcd Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 18 Jun 2016 08:55:44 +0200
-Subject: [PATCH] cmake: use variable for knewstuff3 library
-
----
- dolphin/src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dolphin/src/CMakeLists.txt b/dolphin/src/CMakeLists.txt
-index 28768e2..d2ef983 100644
---- a/dolphin/src/CMakeLists.txt
-+++ b/dolphin/src/CMakeLists.txt
-@@ -249,7 +249,7 @@ target_link_libraries(kdeinit_dolphin4
-     ${KDE4_KCMUTILS_LIBRARY}
-     konq
-     dolphinprivate4
--    knewstuff3
-+    ${KDE4_KNEWSTUFF3_LIBS}
-     ${KDE4_SOLID_LIBS}
-     ${KDE4_PHONON_LIBS}
- )
--- 
-2.8.1
-
diff --git a/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch b/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
deleted file mode 100644
index aeffaf2..0000000
--- a/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a74f99409d463837094c996c19e5f90fe92dea04 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 18 Jun 2016 08:48:19 +0200
-Subject: [PATCH] set cmake_min_req to match kdelibs policy and enable newer
- cmake policies
-
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b06ba01..2aae22e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,7 @@
- project(KDEBASE_APPS)
- 
-+cmake_minimum_required(VERSION 2.8.9)
-+
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
- 
--- 
-2.8.1
-

-- 
KDE Base Applications module packaging