[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.11.3-2-14-gf4910ac

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6a658651d3d6abca5cd6f9eed9fcb6d9072fd2ef
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Dec 9 18:52:43 2013 -0300

    Update qt4_designer_plugins_path.diff, install qt4 plugins in ma paths.
---
 debian/changelog                              |  2 ++
 debian/patches/qt4_designer_plugins_path.diff | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57d0d31..8fdf0fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 kde4libs (4:4.11.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Update qt4_designer_plugins_path.diff, install qt4 plugins in ma
+    paths.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Dec 2013 16:25:22 +0100
 
diff --git a/debian/patches/qt4_designer_plugins_path.diff b/debian/patches/qt4_designer_plugins_path.diff
index 4d0f8a2..c0c31bb 100644
--- a/debian/patches/qt4_designer_plugins_path.diff
+++ b/debian/patches/qt4_designer_plugins_path.diff
@@ -1,38 +1,40 @@
---- a/kdewidgets/CMakeLists.txt
-+++ b/kdewidgets/CMakeLists.txt
-@@ -54,7 +54,7 @@ if(QT_QTDESIGNER_FOUND)
+Index: kde4libs/kdewidgets/CMakeLists.txt
+===================================================================
+--- kde4libs.orig/kdewidgets/CMakeLists.txt	2013-12-09 18:37:13.198890655 -0300
++++ kde4libs/kdewidgets/CMakeLists.txt	2013-12-09 18:50:29.870518988 -0300
+@@ -54,7 +54,7 @@
                           )
    endif(NOT WIN32)
  
 -  install(TARGETS kdewidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
-+  install(TARGETS kdewidgets  DESTINATION /usr/lib/qt4/plugins/designer )
++  install(TARGETS kdewidgets  DESTINATION /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt4/plugins/designer )
  
    # deprecated widgets
    if(NOT KDE_NO_DEPRECATED)
-@@ -83,7 +83,7 @@ if(QT_QTDESIGNER_FOUND)
+@@ -83,7 +83,7 @@
                             )
      endif(NOT WIN32)
  
 -    install(TARGETS kdedeprecated  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
-+    install(TARGETS kdedeprecated  DESTINATION /usr/lib/qt4/plugins/designer )
++    install(TARGETS kdedeprecated  DESTINATION /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt4/plugins/designer )
    endif(NOT KDE_NO_DEPRECATED)
  
  
-@@ -117,7 +117,7 @@ if(QT_QTDESIGNER_FOUND)
+@@ -117,7 +117,7 @@
                           )
    endif(NOT WIN32)
  
 -  install(TARGETS kdewebkitwidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
-+  install(TARGETS kdewebkitwidgets  DESTINATION /usr/lib/qt4/plugins/designer )
++  install(TARGETS kdewebkitwidgets  DESTINATION /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt4/plugins/designer )
  
  
    if (QT_QT3SUPPORT_FOUND)
-@@ -152,7 +152,7 @@ if(QT_QTDESIGNER_FOUND)
+@@ -152,7 +152,7 @@
                               )
       endif(NOT WIN32)
  
 -     install(TARGETS kde3supportwidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
-+     install(TARGETS kde3supportwidgets  DESTINATION /usr/lib/qt4/plugins/designer )
++     install(TARGETS kde3supportwidgets  DESTINATION /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt4/plugins/designer )
    endif (QT_QT3SUPPORT_FOUND)
  endif (QT_QTDESIGNER_FOUND)
  

-- 
KDE Development Platform Libraries module packaging