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

[Fathi Boudra]

Author: fabo
Date: 2009-03-05 07:02:17 +0000 (Thu, 05 Mar 2009)
New Revision: 13983

Added:
   trunk/packages/qt-creator/debian/installed
   trunk/packages/qt-creator/debian/patches/02_remove_qtcreator_rpath.diff
Removed:
   trunk/packages/qt-creator/debian/qt-creator.install
Modified:
   trunk/packages/qt-creator/debian/patches/series
   trunk/packages/qt-creator/debian/rules
Log:
Add rpath patch.
Use install command instead of mkdir && cp.


Copied: trunk/packages/qt-creator/debian/installed (from rev 13982, trunk/packages/qt-creator/debian/qt-creator.install)
===================================================================
--- trunk/packages/qt-creator/debian/installed	                        (rev 0)
+++ trunk/packages/qt-creator/debian/installed	2009-03-05 07:02:17 UTC (rev 13983)
@@ -0,0 +1,66 @@
+usr/bin/qtcreator
+usr/lib/Nokia/BinEditor.pluginspec
+usr/lib/Nokia/Bookmarks.pluginspec
+usr/lib/Nokia/CMakeProjectManager.pluginspec
+usr/lib/Nokia/CodePaster.pluginspec
+usr/lib/Nokia/Core.pluginspec
+usr/lib/Nokia/CppEditor.pluginspec
+usr/lib/Nokia/CppTools.pluginspec
+usr/lib/Nokia/Debugger.pluginspec
+usr/lib/Nokia/FakeVim.pluginspec
+usr/lib/Nokia/Find.pluginspec
+usr/lib/Nokia/Help.pluginspec
+usr/lib/Nokia/Perforce.pluginspec
+usr/lib/Nokia/ProjectExplorer.pluginspec
+usr/lib/Nokia/Qt4ProjectManager.pluginspec
+usr/lib/Nokia/QtScriptEditor.pluginspec
+usr/lib/Nokia/QuickOpen.pluginspec
+usr/lib/Nokia/ScmGit.pluginspec
+usr/lib/Nokia/Subversion.pluginspec
+usr/lib/Nokia/TextEditor.pluginspec
+usr/lib/Nokia/VCSBase.pluginspec
+usr/lib/Nokia/libBinEditor.so
+usr/lib/Nokia/libBinEditor.so.*
+usr/lib/Nokia/libBookmarks.so
+usr/lib/Nokia/libBookmarks.so.*
+usr/lib/Nokia/libCMakeProjectManager.so
+usr/lib/Nokia/libCMakeProjectManager.so.*
+usr/lib/Nokia/libCodePaster.so
+usr/lib/Nokia/libCodePaster.so.*
+usr/lib/Nokia/libCore.so
+usr/lib/Nokia/libCore.so.*
+usr/lib/Nokia/libCppEditor.so
+usr/lib/Nokia/libCppEditor.so.*
+usr/lib/Nokia/libCppTools.so
+usr/lib/Nokia/libCppTools.so.*
+usr/lib/Nokia/libDebugger.so
+usr/lib/Nokia/libDebugger.so.*
+usr/lib/Nokia/libFakeVim.so
+usr/lib/Nokia/libFakeVim.so.*
+usr/lib/Nokia/libFind.so
+usr/lib/Nokia/libFind.so.*
+usr/lib/Nokia/libHelp.so
+usr/lib/Nokia/libHelp.so.*
+usr/lib/Nokia/libPerforce.so
+usr/lib/Nokia/libPerforce.so.*
+usr/lib/Nokia/libProjectExplorer.so
+usr/lib/Nokia/libProjectExplorer.so.*
+usr/lib/Nokia/libQt4ProjectManager.so
+usr/lib/Nokia/libQt4ProjectManager.so.*
+usr/lib/Nokia/libQtScriptEditor.so
+usr/lib/Nokia/libQtScriptEditor.so.*
+usr/lib/Nokia/libQuickOpen.so
+usr/lib/Nokia/libQuickOpen.so.*
+usr/lib/Nokia/libScmGit.so
+usr/lib/Nokia/libScmGit.so.*
+usr/lib/Nokia/libSubversion.so
+usr/lib/Nokia/libSubversion.so.*
+usr/lib/Nokia/libTextEditor.so
+usr/lib/Nokia/libTextEditor.so.*
+usr/lib/Nokia/libVCSBase.so
+usr/lib/Nokia/libVCSBase.so.*
+usr/lib/libAggregation.so.*
+usr/lib/libCPlusPlus.so.*
+usr/lib/libExtensionSystem.so.*
+usr/lib/libQtConcurrent.so.*
+usr/lib/libUtils.so.*

Added: trunk/packages/qt-creator/debian/patches/02_remove_qtcreator_rpath.diff
===================================================================
--- trunk/packages/qt-creator/debian/patches/02_remove_qtcreator_rpath.diff	                        (rev 0)
+++ trunk/packages/qt-creator/debian/patches/02_remove_qtcreator_rpath.diff	2009-03-05 07:02:17 UTC (rev 13983)
@@ -0,0 +1,11 @@
+--- a/src/app/app.pro
++++ b/src/app/app.pro
+@@ -28,8 +28,6 @@ DESTDIR = ../../bin
+
+ SOURCES += main.cpp
+
+-include(../rpath.pri)
+-
+ win32 {
+         RC_FILE = qtcreator.rc
+ }

Modified: trunk/packages/qt-creator/debian/patches/series
===================================================================
--- trunk/packages/qt-creator/debian/patches/series	2009-03-04 22:14:33 UTC (rev 13982)
+++ trunk/packages/qt-creator/debian/patches/series	2009-03-05 07:02:17 UTC (rev 13983)
@@ -1 +1,2 @@
+02_remove_qtcreator_rpath.diff
 kubuntu_01_no_docs.diff

Deleted: trunk/packages/qt-creator/debian/qt-creator.install

Modified: trunk/packages/qt-creator/debian/rules
===================================================================
--- trunk/packages/qt-creator/debian/rules	2009-03-04 22:14:33 UTC (rev 13982)
+++ trunk/packages/qt-creator/debian/rules	2009-03-05 07:02:17 UTC (rev 13983)
@@ -9,12 +9,12 @@
 DEB_MAKE_INSTALL_TARGET := install INSTALL_ROOT=$(DEB_DESTDIR)/usr
 
 binary-install/qt-creator::
-	mkdir -p $(DEB_DESTDIR)/usr/share/applications
-	cp debian/qtcreator.desktop $(DEB_DESTDIR)/usr/share/applications/
-	mkdir -p $(DEB_DESTDIR)/usr/share/mime/packages
-	cp debian/Nokia-QtCreator.xml $(DEB_DESTDIR)/usr/share/mime/packages/
+	install -D -p -m 0644 debian/qtcreator.desktop \
+		$(DEB_DESTDIR)/usr/share/applications/qtcreator.desktop
+	install -D -p -m 0644 debian/Nokia-QtCreator.xml \
+		$(DEB_DESTDIR)/usr/share/mime/packages/Nokia-QtCreator.xml
 	dh_desktop -p$(cdbs_curpkg)
 
-clean:: 
+clean::
 	rm -rf lib/ bin/
 	find . -name Makefile | xargs rm -f