[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-2-67-g7b2ec67

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 7b2ec67a944304a00d2a59d0acef3991acaa623d
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Dec 18 13:51:48 2010 +0100

    Refreshed 13_qt4_designer_plugins_path.diff, moved Qt Designer plugins to kdelibs5-plugins.
---
 debian/changelog                                 |    4 +++
 debian/control                                   |    5 ++-
 debian/kdelibs5-dev.install                      |    4 ---
 debian/kdelibs5-plugins.install                  |    4 +++
 debian/patches/13_qt4_designer_plugins_path.diff |   24 ++++++++++++++++++++-
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19f801a..f374c6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,10 @@ kde4libs (4:4.5.86-0r1) UNRELEASED; urgency=low
   * Disable 23_solid_no_double_build.diff, produces FTBFS.
   * Update installed files.
   * kdelibs5-data breaks/replaces kdebase-runtime-data (<< 4:4.5.85).
+  * Refreshed 13_qt4_designer_plugins_path.diff, thanks to Pino Toscano.
+  * Moved Qt Designer plugins to kdelibs5-plugins, they could be used by plasma
+    js bindings to dynamically create ui files. Thanks to Pino Toscano for
+    pointing the problem.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Dec 2010 14:54:10 +0100
 
diff --git a/debian/control b/debian/control
index 308aaea..90051aa 100644
--- a/debian/control
+++ b/debian/control
@@ -516,8 +516,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
  kdelibs-bin (= ${binary:Version}),
  dbus-x11, shared-mime-info (>= 0.30), xdg-utils
 Recommends: ttf-dejavu, kdebase-runtime (>= 4:4.5), kaboom (>= 1.0.5)
-Replaces: kdelibs5 (<< 4:4.4.0), kdelibs-bin (<< 4:4.1.74)
-Breaks: kdelibs5 (<< 4:4.4.0), kdelibs-bin (<< 4:4.1.74), kdelibs5-data (<< 4:4.2.2)
+Replaces: kdelibs5 (<< 4:4.4.0), kdelibs-bin (<< 4:4.1.74), kdelibs5-dev (<< 4:4.5.86)
+Breaks: kdelibs5 (<< 4:4.4.0), kdelibs-bin (<< 4:4.1.74), kdelibs5-dev (<< 4:4.5.86),
+ kdelibs5-data (<< 4:4.2.2)
 Description: core plugins for KDE Applications
  This package contains core plugins for KDE Applications used by KDE
  Applications and KDE Development Platform libraries at runtime. This package
diff --git a/debian/kdelibs5-dev.install b/debian/kdelibs5-dev.install
index c30e4d9..4eb2086 100644
--- a/debian/kdelibs5-dev.install
+++ b/debian/kdelibs5-dev.install
@@ -1860,8 +1860,6 @@ usr/include/threadweaver/WeaverInterface.h
 usr/include/threadweaver/WeaverObserver.h
 usr/include/threadweaver/threadweaver_export.h
 usr/lib/kde4/libexec/kauth-policy-gen
-usr/lib/kde4/plugins/designer/kdedeprecated.so
-usr/lib/kde4/plugins/designer/kdewebkitwidgets.so
 usr/lib/kde4/plugins/script/libkrossqtsplugin.so
 usr/lib/libkcmutils.so
 usr/lib/libkde3support.so
@@ -1900,8 +1898,6 @@ usr/lib/libnepomukutils.so
 usr/lib/libplasma.so
 usr/lib/libsolid.so
 usr/lib/libthreadweaver.so
-usr/lib/qt4/plugins/designer/kde3supportwidgets.so
-usr/lib/qt4/plugins/designer/kdewidgets.so
 usr/share/dbus-1/interfaces/org.freedesktop.PowerManagement.Inhibit.xml
 usr/share/dbus-1/interfaces/org.freedesktop.PowerManagement.xml
 usr/share/dbus-1/interfaces/org.kde.JobView.xml
diff --git a/debian/kdelibs5-plugins.install b/debian/kdelibs5-plugins.install
index 46291bd..8ae8769 100644
--- a/debian/kdelibs5-plugins.install
+++ b/debian/kdelibs5-plugins.install
@@ -66,3 +66,7 @@ usr/lib/kde4/spellcheckplugin.so
 usr/lib/libkdeinit4_kconf_update.so
 usr/lib/libkdeinit4_kio_http_cache_cleaner.so
 usr/lib/libkdeinit4_klauncher.so
+usr/lib/qt4/plugins/designer/kde3supportwidgets.so
+usr/lib/qt4/plugins/designer/kdedeprecated.so
+usr/lib/qt4/plugins/designer/kdewebkitwidgets.so
+usr/lib/qt4/plugins/designer/kdewidgets.so
diff --git a/debian/patches/13_qt4_designer_plugins_path.diff b/debian/patches/13_qt4_designer_plugins_path.diff
index 492e68a..e720d73 100644
--- a/debian/patches/13_qt4_designer_plugins_path.diff
+++ b/debian/patches/13_qt4_designer_plugins_path.diff
@@ -1,5 +1,7 @@
---- a/kdewidgets/CMakeLists.txt
-+++ b/kdewidgets/CMakeLists.txt
+Index: kde4libs/kdewidgets/CMakeLists.txt
+===================================================================
+--- kde4libs.orig/kdewidgets/CMakeLists.txt	2010-12-18 13:02:55.710619796 +0100
++++ kde4libs/kdewidgets/CMakeLists.txt	2010-12-18 13:11:17.282071131 +0100
 @@ -54,7 +54,7 @@
                           )
    endif(NOT WIN32)
@@ -9,6 +11,24 @@
  
    # deprecated widgets
    if(NOT KDE_NO_DEPRECATED)
+@@ -84,7 +84,7 @@
+                            )
+     endif(NOT WIN32)
+ 
+-    install(TARGETS kdedeprecated  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
++    install(TARGETS kdedeprecated  DESTINATION /usr/lib/qt4/plugins/designer )
+   endif(NOT KDE_NO_DEPRECATED)
+ 
+ 
+@@ -119,7 +119,7 @@
+                          )
+   endif(NOT WIN32)
+ 
+-  install(TARGETS kdewebkitwidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
++  install(TARGETS kdewebkitwidgets  DESTINATION /usr/lib/qt4/plugins/designer )
+ 
+ 
+   if (QT_QT3SUPPORT_FOUND)
 @@ -154,7 +154,7 @@
                               )
       endif(NOT WIN32)

-- 
KDE Development Platform Libraries module packaging