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

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit f70cb235477bfda5fc1224f20522c19128432742
Author: Andreas Cord-Landwehr <cordlandwehr at kde.org>
Date:   Wed Oct 16 22:51:41 2013 +0200

    Re-enable building of subversion plugin.
---
 debian/changelog                                   |  4 ++++
 debian/kdevplatform7-libs.install                  |  5 ++++
 .../patches/excludeSvnPluginFromCompilation.diff   | 28 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d899261..4e55968 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kdevplatform (1.5.1-3) UNRELEASED; urgency=low
 
+  [ Andreas Cord-Landwehr ]
+  * Re-enable GPL-3+ licensed SVN plugin due to fixed license issue in
+    GPL-2+ licensed shared library kdevplatformoutputview (was GPL-2)
+    (Closes: #719202)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 16 Oct 2013 21:51:24 +0200
 
diff --git a/debian/kdevplatform7-libs.install b/debian/kdevplatform7-libs.install
index 0e4f90d..504292d 100644
--- a/debian/kdevplatform7-libs.install
+++ b/debian/kdevplatform7-libs.install
@@ -38,6 +38,7 @@ 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
@@ -55,12 +56,15 @@ usr/lib/libkdevplatformtests.so.7*
 usr/lib/libkdevplatformutil.so.7*
 usr/lib/libkdevplatformvcs.so.7*
 usr/share/icons/hicolor/128x128/apps/reviewboard.png
+usr/share/icons/hicolor/16x16/apps/subversion.png
 usr/share/icons/hicolor/16x16/apps/git.png
 usr/share/icons/hicolor/16x16/apps/reviewboard.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
@@ -132,6 +136,7 @@ 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
deleted file mode 100644
index 554afd2..0000000
--- a/debian/patches/excludeSvnPluginFromCompilation.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-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 133364c..a6a68c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 11_disable_examples_tests.diff
-excludeSvnPluginFromCompilation.diff

-- 
KDevelop Platform packaging