[SCM] kate packaging branch, master, updated. debian/4.14.3-3-8-g19bd44d

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kate.git;a=commitdiff;h=e21e6fe

The following commit has been merged in the master branch:
commit e21e6fe7c2ba7914be0e8097c0ebfd3de1a5b13f
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 19 07:29:47 2016 +0200

    disable anything other than katepart
    
    since we are interested only in katepart, explicitly disable the build
    of kate, kwrite, and the plasma stuff:
    - pass to cmake: -DBUILD_kate=false -DBUILD_kwrite=false
      -DBUILD_doc=false -DBUILD_plasma=false
    - make sure that addons can be disabled with BUILD_<foo> options as
      well
    - remove kate stuff from kate-data.install
    - drop binary libkateinterfaces4, no more built
---
 debian/changelog                   |  8 ++++++++
 debian/control                     | 12 ------------
 debian/kate-data.install           |  9 ---------
 debian/patches/cmake-optional.diff | 18 ++++++++++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  2 +-
 6 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fdb8606..2b7322d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,14 @@ kate4 (4:4.14.3-4) UNRELEASED; urgency=medium
     integration is done only in the kate application (which is not shipped
     by this source).
   * Set the cmake minimum version required and policies; cmake-policy.diff.
+  * Since we are interested only in katepart, explicitly disable the build of
+    kate, kwrite, and the plasma stuff:
+    - pass to cmake: -DBUILD_kate=false -DBUILD_kwrite=false -DBUILD_doc=false
+      -DBUILD_plasma=false
+    - make sure that addons can be disabled with BUILD_<foo> options as well;
+      patch cmake-optional.diff
+    - remove kate stuff from kate-data.install
+    - drop binary libkateinterfaces4, no more built
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 19 Jun 2016 06:44:58 +0200
 
diff --git a/debian/control b/debian/control
index 7e08a13..b6f7472 100644
--- a/debian/control
+++ b/debian/control
@@ -55,15 +55,3 @@ Description: library for the embeddable text editor component
  instead.
  .
  This package is a part of KDE 4 Base applications module.
-
-Package: libkateinterfaces4
-Architecture: any
-Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kate (<< 4:4.6.90)
-Replaces: kate (<< 4:4.6.90)
-Description: plugin interface for the kate editor
- This library contains the code used by kate plugins that provide a better
- integration into the app like tool views
- .
- This package is part of the KDE 4 Base applications module
diff --git a/debian/kate-data.install b/debian/kate-data.install
index 101187e..02c066f 100644
--- a/debian/kate-data.install
+++ b/debian/kate-data.install
@@ -1,17 +1,8 @@
-usr/share/doc/kde/HTML/*/kate/*
-usr/share/kde4/apps/kate/icons/
-usr/share/kde4/apps/kate/kateui.rc
-usr/share/kde4/apps/kate/plugins/
-usr/share/kde4/apps/kate/tips
 usr/share/kde4/apps/katepart/
-usr/share/kde4/apps/katexmltools/
-usr/share/kde4/apps/kconf_update/kate-2.4.upd
 usr/share/kde4/apps/ktexteditor_exporter/ktexteditor_exporterui.rc
 usr/share/kde4/apps/ktexteditor_iconinserter/ktexteditor_iconinserterui.rc
 usr/share/kde4/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc
 usr/share/kde4/config/katemoderc
-usr/share/kde4/config/katerc
 usr/share/kde4/config/kateschemarc
 usr/share/kde4/config/katesyntaxhighlightingrc
 usr/share/kde4/config/ktexteditor_codesnippets_core.knsrc
-usr/share/kde4/services/katesnippetsplugin.desktop
diff --git a/debian/patches/cmake-optional.diff b/debian/patches/cmake-optional.diff
new file mode 100644
index 0000000..3315a6e
--- /dev/null
+++ b/debian/patches/cmake-optional.diff
@@ -0,0 +1,18 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Allow disabling the build of some addons
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2016-06-19
+
+--- a/addons/CMakeLists.txt
++++ b/addons/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ add_subdirectory (ktexteditor)
+ 
+ # Kate plugins
+-add_subdirectory (kate)
++macro_optional_add_subdirectory (kate)
+ 
+ # Plasma applets
+-add_subdirectory (plasma)
++macro_optional_add_subdirectory (plasma)
diff --git a/debian/patches/series b/debian/patches/series
index deadbef..aa64e39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 sideeffects_in_asserts_are_evil.patch
 do_not_enforce_tests
 cmake-policy.diff
+cmake-optional.diff
diff --git a/debian/rules b/debian/rules
index b27fbba..1133b2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DKDE4_BUILD_TESTS=false
+	$(overridden_command) -- -DKDE4_BUILD_TESTS=false -DBUILD_kate=false -DBUILD_kwrite=false -DBUILD_doc=false -DBUILD_plasma=false
 
 override_dh_auto_test:
 	# Disable dh_auto_test at build time

-- 
kate packaging