[SCM] KDE Base Applications module packaging branch, master, updated. debian/16.08.0-1-24-g3df137c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4fcb038c23de1eca95040dacd434ae5055d21943
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Fri Aug 19 11:48:41 2016 +0200

    Refresh patches
    
    Drop disable_plasma.diff, add it as build option now that it's an option
    Gbp-Dch: Ignore
---
 debian/patches/disable_plasma.diff          | 31 -----------------------------
 debian/patches/enable_debianabimanager.diff |  2 +-
 debian/patches/enable_dlrestrictions.diff   |  2 +-
 debian/patches/series                       |  1 -
 4 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/debian/patches/disable_plasma.diff b/debian/patches/disable_plasma.diff
deleted file mode 100644
index f7fae3a..0000000
--- a/debian/patches/disable_plasma.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Pino Toscano <pino at debian.org>
-Date: Wed, 13 Jul 2016 05:35:22 +0200
-Subject: disable_plasma
-
-Author: Pino Toscano <pino at debian.org>
-Description: Disable the build of Plasma-related stuff
- Do not build stuff based on Plasma 4, since they are useless in a Plasma 5
- desktop environment.
- .
- This patch needs to be dropped once a Frameworks-based kde-baseapps is
- prepared.
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2016-06-18
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f17762b..b5950d0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,7 +44,7 @@ add_subdirectory( kdialog )
- add_subdirectory( keditbookmarks )
- add_subdirectory( konqueror )
- add_subdirectory( kfind )
--add_subdirectory( plasma )
-+#add_subdirectory( plasma )
- add_subdirectory( konq-plugins )
- 
- if ( Q_WS_MAC )
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index d1ffc54..495b5d4 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -10,7 +10,7 @@ For more information about DebianABIManager, refer to
  1 file changed, 1 insertion(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2aae22e..6a6c084 100644
+index f740f4f..63c8781 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -59,3 +59,4 @@ macro_optional_add_subdirectory( doc )
diff --git a/debian/patches/enable_dlrestrictions.diff b/debian/patches/enable_dlrestrictions.diff
index 81a313b..5b31c34 100644
--- a/debian/patches/enable_dlrestrictions.diff
+++ b/debian/patches/enable_dlrestrictions.diff
@@ -13,7 +13,7 @@ Last-Update: 2011-05-25
  1 file changed, 7 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6a6c084..f17762b 100644
+index 63c8781..b3195e2 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -60,3 +60,10 @@ macro_optional_add_subdirectory( doc )
diff --git a/debian/patches/series b/debian/patches/series
index fa12a8e..bb3cb25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ enable_debianabimanager.diff
 enable_dlrestrictions.diff
 kubuntu_disable-failing-test.diff
 kubuntu_ignore-tests.diff
-disable_plasma.diff

-- 
KDE Base Applications module packaging