rev 13988 - trunk/packages/qt-creator/debian/patches

[Fathi Boudra]

Author: fabo
Date: 2009-03-05 10:39:48 +0000 (Thu, 05 Mar 2009)
New Revision: 13988

Modified:
   trunk/packages/qt-creator/debian/patches/01_fix_target_path.diff
Log:
Update target path patch.


Modified: trunk/packages/qt-creator/debian/patches/01_fix_target_path.diff
===================================================================
--- trunk/packages/qt-creator/debian/patches/01_fix_target_path.diff	2009-03-05 09:50:10 UTC (rev 13987)
+++ trunk/packages/qt-creator/debian/patches/01_fix_target_path.diff	2009-03-05 10:39:48 UTC (rev 13988)
@@ -21,12 +21,61 @@
      }
 --- a/src/qworkbenchplugin.pri
 +++ b/src/qworkbenchplugin.pri
-@@ -54,7 +54,7 @@ contains(QT_CONFIG, reduce_exports):CONF
+@@ -54,8 +54,8 @@ contains(QT_CONFIG, reduce_exports):CONF
  CONFIG += plugin plugin_with_soname
  
  linux-* {
 -    target.path = /lib/qtcreator/plugins/$$PROVIDER
 +    target.path = $$[QT_INSTALL_LIBS]/qtcreator/plugins/$$PROVIDER
      pluginspec.files += $${TARGET}.pluginspec
-     pluginspec.path = /lib/qtcreator/plugins/$$PROVIDER
+-    pluginspec.path = /lib/qtcreator/plugins/$$PROVIDER
++    pluginspec.path = $$[QT_INSTALL_LIBS]/qtcreator/plugins/$$PROVIDER
      INSTALLS += target pluginspec
+ }
+--- a/src/plugins/coreplugin/coreplugin.pro
++++ b/src/plugins/coreplugin/coreplugin.pro
+@@ -170,7 +170,7 @@ contains(QT_CONFIG, webkit) {
+ 
+ linux-* {
+     images.files = images/qtcreator_logo_*.png
+-    images.path  = /share/pixmaps
++    images.path  = $$[QT_INSTALL_PREFIX]/share/pixmaps
+ 
+     INSTALLS += images
+ }
+--- a/share/share.pri
++++ b/share/share.pri
+@@ -43,20 +43,20 @@ win32|linux-* {
+ linux-* {
+     keymaps.files           += $$PWD/qtcreator/schemes/MS_Visual_C++.kms
+     keymaps.files           += $$PWD/qtcreator/schemes/Xcode.kms
+-    keymaps.path             = /share/qtcreator/schemes
++    keymaps.path             = $$[QT_INSTALL_PREFIX]/share/qtcreator/schemes
+ 
+     gdbsupport.files        += $$PWD/qtcreator/gdbmacros/LICENSE.LGPL
+     gdbsupport.files        += $$PWD/qtcreator/gdbmacros/LGPL_EXCEPTION.TXT
+     gdbsupport.files        += $$PWD/qtcreator/gdbmacros/gdbmacros.cpp
+     gdbsupport.files        += $$PWD/qtcreator/gdbmacros/gdbmacros.pro
+-    gdbsupport.path          = /share/qtcreator/gdbmacros
++    gdbsupport.path          = $$[QT_INSTALL_PREFIX]/share/qtcreator/gdbmacros
+ 
+     designertemplates.files += $$PWD/qtcreator/designer/templates.xml
+     designertemplates.files += $$PWD/qtcreator/designer/templates/*
+-    designertemplates.path   = /share/qtcreator/designer/templates
++    designertemplates.path   = $$[QT_INSTALL_PREFIX]/share/qtcreator/designer/templates
+ 
+     snippets.files          += $$PWD/qtcreator/snippets/*.snp
+-    snippets.path            = /share/qtcreator/snippets
++    snippets.path            = $$[QT_INSTALL_PREFIX]/share/qtcreator/snippets
+ 
+     projecttemplates.files  += $$PWD/qtcreator/templates/qt4project/mywidget_form.h
+     projecttemplates.files  += $$PWD/qtcreator/templates/qt4project/main.cpp
+@@ -64,7 +64,7 @@ linux-* {
+     projecttemplates.files  += $$PWD/qtcreator/templates/qt4project/mywidget.h
+     projecttemplates.files  += $$PWD/qtcreator/templates/qt4project/widget.ui
+     projecttemplates.files  += $$PWD/qtcreator/templates/qt4project/mywidget_form.cpp
+-    projecttemplates.path    = /share/qtcreator/templates/qt4project
++    projecttemplates.path    = $$[QT_INSTALL_PREFIX]/share/qtcreator/templates/qt4project
+ 
+     INSTALLS += \
+        keymaps \