rev 13987 - in trunk/packages/qt-creator/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-03-05 09:50:10 +0000 (Thu, 05 Mar 2009)
New Revision: 13987

Added:
   trunk/packages/qt-creator/debian/patches/01_fix_target_path.diff
Modified:
   trunk/packages/qt-creator/debian/patches/series
   trunk/packages/qt-creator/debian/rules
Log:
Use a patch to fix install target path and drop DEB_MAKE_INSTALL_TARGET.
This is an upstream bug and should be fixed upstream.


Added: trunk/packages/qt-creator/debian/patches/01_fix_target_path.diff
===================================================================
--- trunk/packages/qt-creator/debian/patches/01_fix_target_path.diff	                        (rev 0)
+++ trunk/packages/qt-creator/debian/patches/01_fix_target_path.diff	2009-03-05 09:50:10 UTC (rev 13987)
@@ -0,0 +1,32 @@
+--- a/src/app/app.pro
++++ b/src/app/app.pro
+@@ -16,7 +16,7 @@ linux-* {
+     ISGCC33=$$(GCC33)
+     !equals(ISGCC33, 1):QT += svg dbus
+ 
+-    target.path  = /bin
++    target.path  = $$[QT_INSTALL_BINS]
+     INSTALLS    += target
+ 
+ }
+--- a/src/qworkbenchlibrary.pri
++++ b/src/qworkbenchlibrary.pri
+@@ -14,6 +14,6 @@ TARGET = $$qtLibraryTarget($$TARGET)
+ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+ 
+ linux-* {
+-	target.path = /lib/qtcreator
++	target.path = $$[QT_INSTALL_LIBS]/qtcreator
+ 	INSTALLS += target
+     }
+--- a/src/qworkbenchplugin.pri
++++ b/src/qworkbenchplugin.pri
+@@ -54,7 +54,7 @@ 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
+     INSTALLS += target pluginspec

Modified: trunk/packages/qt-creator/debian/patches/series
===================================================================
--- trunk/packages/qt-creator/debian/patches/series	2009-03-05 08:50:53 UTC (rev 13986)
+++ trunk/packages/qt-creator/debian/patches/series	2009-03-05 09:50:10 UTC (rev 13987)
@@ -1,2 +1,3 @@
+01_fix_target_path.diff
 02_remove_qtcreator_rpath.diff
 03_fix_doc_tools_path.diff

Modified: trunk/packages/qt-creator/debian/rules
===================================================================
--- trunk/packages/qt-creator/debian/rules	2009-03-05 08:50:53 UTC (rev 13986)
+++ trunk/packages/qt-creator/debian/rules	2009-03-05 09:50:10 UTC (rev 13987)
@@ -6,7 +6,6 @@
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_DH_SHLIBDEPS_ARGS := -l$(DEB_DESTDIR)/usr/lib/qtcreator/
-DEB_MAKE_INSTALL_TARGET := install INSTALL_ROOT=$(DEB_DESTDIR)/usr
 
 binary-install/qt-creator::
 	install -D -p -m 0644 debian/qtcreator.desktop \