[SCM] KDevelop Platform packaging branch, kdev1.5, updated. debian/1.3.1-2-17-g15fcb42

[Andreas Cord-Landwehr]

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

The following commit has been merged in the kdev1.5 branch:
commit 980fa00bcd4db39c85f62e171e276d1698292ab2
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sun Jun 9 18:53:01 2013 +0200

    Disable compilation of SVN plugin.
---
 debian/changelog                                   |    2 +
 debian/kdevplatform7-libs.install                  |    5 ---
 .../patches/excludeSvnPluginFromCompilation.diff   |   28 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e22ee0..798bb29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ kdevplatform (1.5.1-0r0) UNRELEASED; urgency=low
   * Raise kdelibs5-dev build-dependency (>=4:4.7.0)
   * Bump Standards-Version to 3.9.4: no changes needed.
   * Update copyright.
+  * Disable compilation of SVN plugin due to license
+    incompatability: patches/excludeSvnPluginFromCompilation.diff
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 26 Apr 2013 21:41:47 +0200
 
diff --git a/debian/kdevplatform7-libs.install b/debian/kdevplatform7-libs.install
index a5e46a3..1c46b3b 100644
--- a/debian/kdevplatform7-libs.install
+++ b/debian/kdevplatform7-libs.install
@@ -39,7 +39,6 @@ usr/lib/kde4/kdevquickopen.so
 usr/lib/kde4/kdevreviewboard.so
 usr/lib/kde4/kdevsnippet.so
 usr/lib/kde4/kdevstandardoutputview.so
-usr/lib/kde4/kdevsubversion.so
 usr/lib/kde4/kdevswitchtobuddy.so
 usr/lib/kde4/kdevtemplatemanager_config.so
 usr/lib/kde4/kdevtestview.so
@@ -59,13 +58,10 @@ usr/lib/libkdevplatformvcs.so.7*
 usr/share/icons/hicolor/128x128/apps/reviewboard.png
 usr/share/icons/hicolor/16x16/apps/git.png
 usr/share/icons/hicolor/16x16/apps/reviewboard.png
-usr/share/icons/hicolor/16x16/apps/subversion.png
 usr/share/icons/hicolor/22x22/actions/run-clean.png
 usr/share/icons/hicolor/22x22/actions/run-install.png
 usr/share/icons/hicolor/32x32/apps/git.png
-usr/share/icons/hicolor/32x32/apps/subversion.png
 usr/share/icons/hicolor/64x64/apps/git.png
-usr/share/icons/hicolor/64x64/apps/subversion.png
 usr/share/kde4/apps/kdevappwizard/kdevappwizard.rc
 usr/share/kde4/apps/kdevclassbrowser/kdevclassbrowser.rc
 usr/share/kde4/apps/kdevcodegen/licenses
@@ -137,7 +133,6 @@ usr/share/kde4/services/kdevquickopen.desktop
 usr/share/kde4/services/kdevreviewboard.desktop
 usr/share/kde4/services/kdevsnippet.desktop
 usr/share/kde4/services/kdevstandardoutputview.desktop
-usr/share/kde4/services/kdevsubversion.desktop
 usr/share/kde4/services/kdevswitchtobuddy.desktop
 usr/share/kde4/services/kdevtemplatemanager_config.desktop
 usr/share/kde4/services/kdevtestview.desktop
diff --git a/debian/patches/excludeSvnPluginFromCompilation.diff b/debian/patches/excludeSvnPluginFromCompilation.diff
new file mode 100644
index 0000000..554afd2
--- /dev/null
+++ b/debian/patches/excludeSvnPluginFromCompilation.diff
@@ -0,0 +1,28 @@
+From: Andreas Cord-Landwehr <cola at uni-paderborn.de>
+Subject: Do not compile incompatible licensed SVN plugin
+Forwarded: no
+Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
+Last-Update: 2013-06-09
+
+Description: SVN plugin uses GPL-3+ license while KDevPlatform
+  contains files with incompatible GPL-2 license.
+--- a/plugins/CMakeLists.txt
++++ b/plugins/CMakeLists.txt
+@@ -35,12 +35,12 @@ if(Boost_FOUND)
+     macro_optional_add_subdirectory(classbrowser)
+ endif(Boost_FOUND)
+ 
+-find_package(SubversionLibrary)
+-macro_log_feature( SUBVERSION_FOUND "Subversion" "Support for Subversion integration" "http://subversion.tigris.org" FALSE "1.3.0" "The subversion libraries are needed for the Subversion support" )
++#find_package(SubversionLibrary)
++#macro_log_feature( SUBVERSION_FOUND "Subversion" "Support for Subversion integration" "http://subversion.tigris.org" FALSE "1.3.0" "The subversion libraries are needed for the Subversion support" )
+ 
+-if(SUBVERSION_FOUND)
+-    macro_optional_add_subdirectory(subversion)
+-endif(SUBVERSION_FOUND)
++#if(SUBVERSION_FOUND)
++#    macro_optional_add_subdirectory(subversion)
++#endif(SUBVERSION_FOUND)
+ 
+ if(QJSON_FOUND)
+     macro_optional_add_subdirectory(reviewboard)
diff --git a/debian/patches/series b/debian/patches/series
index a6a68c8..133364c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 11_disable_examples_tests.diff
+excludeSvnPluginFromCompilation.diff

-- 
KDevelop Platform packaging