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

Pino Toscano pino at moszumanska.debian.org
Sun Aug 28 11:10:56 UTC 2016


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

The following commit has been merged in the master branch:
commit 75a95043fd596d3b66ccf2531ec73734aa01951c
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 28 12:46:14 2016 +0200

    update the patches
    
    - disable_plasma.diff: drop, fixed upstream
---
 debian/changelog                   |  2 ++
 debian/patches/disable_plasma.diff | 22 ----------------------
 debian/patches/series              |  1 -
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f8180a..382a76b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ kde-baseapps (4:16.08.0-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update the patches:
+    - disable_plasma.diff: drop, fixed upstream
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 28 Aug 2016 12:44:09 +0200
 
diff --git a/debian/patches/disable_plasma.diff b/debian/patches/disable_plasma.diff
deleted file mode 100644
index 03f798d..0000000
--- a/debian/patches/disable_plasma.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-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
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,7 +42,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/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



More information about the pkg-kde-commits mailing list