[SCM] KDevelop Platform packaging branch, experimental, updated. debian/1.7.3-3-6-g2998720

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevplatform.git;a=commitdiff;h=2772a0e

The following commit has been merged in the experimental branch:
commit 2772a0edffe723fa4144ed646174baeb426ddba8
Author: Pino Toscano <pino at debian.org>
Date:   Thu Aug 25 19:50:57 2016 +0200

    update the patches
    
    - 11_disable_examples_tests.diff: drop, no more needed
    - upstream_filetemplates-plugin-Make-testfiletemplates-depend-o.patch:
      drop, backported from upstream
---
 debian/changelog                                   |  4 +++
 debian/patches/11_disable_examples_tests.diff      | 11 -------
 debian/patches/series                              |  2 --
 ...es-plugin-Make-testfiletemplates-depend-o.patch | 35 ----------------------
 4 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1bae03b..9da7a4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,10 @@ kdevplatform (5.0-0r1) UNRELEASED; urgency=medium
   * Rename packages according to the SONAME bumps:
     - kdevplatform8-libs -> kdevplatform10-libs
     - libsublime8 -> libsublime10
+  * Update the patches:
+    - 11_disable_examples_tests.diff: drop, no more needed
+    - upstream_filetemplates-plugin-Make-testfiletemplates-depend-o.patch:
+      drop, backported from upstream
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Aug 2016 19:23:00 +0200
 
diff --git a/debian/patches/11_disable_examples_tests.diff b/debian/patches/11_disable_examples_tests.diff
deleted file mode 100644
index 7044b26..0000000
--- a/debian/patches/11_disable_examples_tests.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-Description: disable examples and tests.
-
---- a/sublime/CMakeLists.txt
-+++ b/sublime/CMakeLists.txt
-@@ -1,6 +1,4 @@
- add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9504 )
--add_subdirectory(examples)
--add_subdirectory(tests)
- 
- ########### next target ###############
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fd9342a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-11_disable_examples_tests.diff
-upstream_filetemplates-plugin-Make-testfiletemplates-depend-o.patch
diff --git a/debian/patches/upstream_filetemplates-plugin-Make-testfiletemplates-depend-o.patch b/debian/patches/upstream_filetemplates-plugin-Make-testfiletemplates-depend-o.patch
deleted file mode 100644
index c3e0587..0000000
--- a/debian/patches/upstream_filetemplates-plugin-Make-testfiletemplates-depend-o.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From dd18e9a13558cbe519c382d3fe358ae97e39cd38 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rakuco at FreeBSD.org>
-Date: Thu, 17 Mar 2016 15:32:21 +0100
-Subject: [PATCH] filetemplates plugin: Make testfiletemplates depend on
- kdevfiletemplates
-
-There is currently no dependency between both targets, however some of
-the files built by both testfiletemplates and kdevfiletemplates (such as
-classidentifierpage.cpp) depend on ui files that only the latter target
-generates. This means that if one does make testfiletemplates the build
-fails like this:
-
-  /tmp/kdevplatform/plugins/filetemplates/classidentifierpage.cpp:23:25:
-  fatal error: ui_newclass.h: No such file or directory
-
-Differential Revision:	https://phabricator.kde.org/D1160
----
- plugins/filetemplates/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt
-index f9a16ec..061ee29 100644
---- a/plugins/filetemplates/CMakeLists.txt
-+++ b/plugins/filetemplates/CMakeLists.txt
-@@ -81,6 +81,7 @@ main.cpp
- )
- 
- kde4_add_executable(testfiletemplates ${test_srcs})
-+add_dependencies(testfiletemplates kdevfiletemplates)
- 
- target_link_libraries(testfiletemplates
-     ${KDE4_KDECORE_LIBS}
--- 
-2.8.1
-

-- 
KDevelop Platform packaging