[SCM] KDE Web Development module packaging branch, master, updated. debian/4.12.3-2-4-gc3fed35

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b608712a3deda4efd63a35bc5640fb92c5790636
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Jul 14 14:54:00 2014 +0200

    New patch: kommanderwidgets-to-plugin.patch and Update install files
---
 debian/changelog                                |  4 +-
 debian/kommander.install                        |  3 +-
 debian/not-installed                            |  1 -
 debian/patches/kommanderwidgets-to-plugin.patch | 52 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 5 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2a02053..ec9d4c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 kdewebdev (4:4.12.3-3) UNRELEASED; urgency=medium
 
-  * 
+  * New patch: kommanderwidgets-to-plugin.patch (Closes: #631671) Thanks
+    to Jim Scadden
+  * Update install files.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 14 Jul 2014 14:48:30 +0200
 
diff --git a/debian/kommander.install b/debian/kommander.install
index 5798fe2..33e5454 100644
--- a/debian/kommander.install
+++ b/debian/kommander.install
@@ -1,6 +1,5 @@
 usr/bin/kommander
 usr/lib/libkommandercore.so.4
 usr/lib/libkommandercore.so.4.2.0
-usr/lib/libkommanderwidgets.so.4
-usr/lib/libkommanderwidgets.so.4.2.0
+usr/lib/kde4/kommanderwidgets.so
 usr/share/applnk/.hidden/kommander.desktop
diff --git a/debian/not-installed b/debian/not-installed
index 619caba..ae3a6ea 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -5,6 +5,5 @@
 ./usr/include/specials.h
 ./usr/lib/libklinkstatuscommon.so
 ./usr/lib/libkommandercore.so
-./usr/lib/libkommanderwidgets.so
 ./usr/share/dbus-1/interfaces/org.kde.kdewebdev.klinkstatus.SearchManager.xml
 ./usr/share/dbus-1/interfaces/org.kde.kfilereplace.xml
diff --git a/debian/patches/kommanderwidgets-to-plugin.patch b/debian/patches/kommanderwidgets-to-plugin.patch
new file mode 100644
index 0000000..7a15716
--- /dev/null
+++ b/debian/patches/kommanderwidgets-to-plugin.patch
@@ -0,0 +1,52 @@
+--- a/kommander/widgets/CMakeLists.txt
++++ b/kommander/widgets/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ 
+ ########### next target ###############
+ 
+-SET(kommanderwidgets_LIB_SRCS
++SET(kommanderwidgets_PART_SRCS
+ aboutdialog.cpp
+ fontdialog.cpp
+ buttongroup.cpp
+@@ -50,7 +50,7 @@
+ wizard.cpp
+ )
+ 
+-KDE4_ADD_LIBRARY(kommanderwidgets SHARED ${kommanderwidgets_LIB_SRCS})
++kde4_add_plugin(kommanderwidgets ${kommanderwidgets_PART_SRCS})
+ 
+ ########### next target ###############
+ 
+@@ -98,9 +98,7 @@
+  ${KDE4_KIO_LIBS} 
+ )
+ 
+-SET_TARGET_PROPERTIES(kommanderwidgets PROPERTIES VERSION 4.2.0 SOVERSION 4 )
+-INSTALL(TARGETS kommanderwidgets ${INSTALL_TARGETS_DEFAULT_ARGS})
+-
++install(TARGETS kommanderwidgets DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
+ ########### install files ###############
+ 
+--- a/kommander/executor/CMakeLists.txt
++++ b/kommander/executor/CMakeLists.txt
+@@ -24,7 +24,6 @@
+ TARGET_LINK_LIBRARIES(
+   kommander
+   kommandercore
+-  kommanderwidgets
+   ${KDE4_KDEUI_LIBS}
+ )
+ 
+--- a/kommander/lib/kommanderfactory.cpp
++++ b/kommander/lib/kommanderfactory.cpp
+@@ -410,7 +410,7 @@
+     KConfig config ( "kommanderrc" );
+     KConfigGroup cfg ( &config, "plugins" );
+     QStringList plugins;
+-    plugins << "libkommanderwidgets";
++    plugins << "kommanderwidgets";
+     plugins += cfg.readEntry ( "plugins", QStringList() );
+     kDebug() << "Plugins: " << plugins;
+     QStringList::Iterator it;
diff --git a/debian/patches/series b/debian/patches/series
index f206d60..854dc83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 no_need_to_have_interpreter_to_install_examples.diff
+kommanderwidgets-to-plugin.patch

-- 
KDE Web Development module packaging