diff -Nru qtcreator-3.0.1/debian/changelog qtcreator-3.0.1/debian/changelog --- qtcreator-3.0.1/debian/changelog 2014-03-13 14:23:37.000000000 +0000 +++ qtcreator-3.0.1/debian/changelog 2014-04-09 09:01:17.000000000 +0000 @@ -1,3 +1,10 @@ +qtcreator (3.0.1-0ubuntu4) trusty; urgency=medium + + [ Zeller Benjamin ] + * Replace qnx, valgrind and remotelinux plugins with derived versiond + + -- Zoltán Balogh Wed, 09 Apr 2014 11:23:44 +0300 + qtcreator (3.0.1-0ubuntu3) trusty; urgency=medium * Rebuild against Qt Webkit 5.1.1 diff -Nru qtcreator-3.0.1/debian/control qtcreator-3.0.1/debian/control --- qtcreator-3.0.1/debian/control 2014-03-13 14:38:05.000000000 +0000 +++ qtcreator-3.0.1/debian/control 2014-04-09 07:48:50.000000000 +0000 @@ -71,6 +71,9 @@ qtbase5-dev-tools, qtcreator-doc, qtcreator-plugin-cmake, + qtcreator-plugin-remotelinux, + qtcreator-plugin-valgrind, + qtcreator-plugin-qnx, qtdeclarative5-dev, xterm | x-terminal-emulator, Breaks: qtcreator-plugin-ubuntu (<= 2.9.0~), diff -Nru qtcreator-3.0.1/debian/patches/disable_cmake_plugin.diff qtcreator-3.0.1/debian/patches/disable_cmake_plugin.diff --- qtcreator-3.0.1/debian/patches/disable_cmake_plugin.diff 2014-03-06 10:24:44.000000000 +0000 +++ qtcreator-3.0.1/debian/patches/disable_cmake_plugin.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -Description: Disable CMake plugin in order to use alternative one - This patch disables QtC's current upstream CMake plugin so that - qtcreator-plugin-cmake can be installed instead. - . - The Ubuntu's CMake plugin will be presented to upstream when it's - fully functional, to consider how to get the improvements to be part - of a future release of Qt Creator. -Author: Benjamin Zeller -Author: Zoltan Balogh - -=== modified file 'src/plugins/plugins.pro' ---- a/src/plugins/plugins.pro 2013-12-02 09:16:15 +0000 -+++ b/src/plugins/plugins.pro 2014-03-06 10:19:13 +0000 -@@ -24,7 +24,6 @@ - debugger \ - help \ - cpaster \ -- cmakeprojectmanager \ - autotoolsprojectmanager \ - fakevim \ - designer \ - -=== modified file 'src/plugins/plugins.qbs' ---- a/src/plugins/plugins.qbs 2013-12-02 09:15:30 +0000 -+++ b/src/plugins/plugins.qbs 2014-03-06 10:19:13 +0000 -@@ -13,7 +13,6 @@ - "bookmarks/bookmarks.qbs", - "classview/classview.qbs", - "clearcase/clearcase.qbs", -- "cmakeprojectmanager/cmakeprojectmanager.qbs", - "coreplugin/coreplugin.qbs", - "coreplugin/images/logo/logo.qbs", - "cpaster/cpaster.qbs", - diff -Nru qtcreator-3.0.1/debian/patches/disable_plugins.diff qtcreator-3.0.1/debian/patches/disable_plugins.diff --- qtcreator-3.0.1/debian/patches/disable_plugins.diff 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-3.0.1/debian/patches/disable_plugins.diff 2014-04-09 07:48:19.000000000 +0000 @@ -0,0 +1,65 @@ +Description: Disable plugins in order to use alternative one + This patch disables QtC's current upstream CMake,Valgrind,Qnx and + Remotelinux plugin so that qtcreator-plugin-[cmake|valgrind|qnx|remotelinux] + can be installed instead. + . + The Ubuntu's plugins will be presented to upstream when it's + fully functional, to consider how to get the improvements to be part + of a future release of Qt Creator. +Author: Benjamin Zeller +Author: Zoltan Balogh + +=== modified file 'src/plugins/plugins.pro' +--- a/src/plugins/plugins.pro 2014-03-06 10:25:09 +0000 ++++ b/src/plugins/plugins.pro 2014-03-31 08:57:03 +0000 +@@ -24,7 +24,6 @@ + debugger \ + help \ + cpaster \ +- cmakeprojectmanager \ + autotoolsprojectmanager \ + fakevim \ + designer \ +@@ -41,11 +40,8 @@ + analyzerbase \ + qmljstools \ + macros \ +- remotelinux \ + android \ +- valgrind \ + todo \ +- qnx \ + clearcase \ + baremetal \ + ios + +=== modified file 'src/plugins/plugins.qbs' +--- a/src/plugins/plugins.qbs 2014-03-06 10:25:09 +0000 ++++ b/src/plugins/plugins.qbs 2014-03-31 08:57:31 +0000 +@@ -13,7 +13,6 @@ + "bookmarks/bookmarks.qbs", + "classview/classview.qbs", + "clearcase/clearcase.qbs", +- "cmakeprojectmanager/cmakeprojectmanager.qbs", + "coreplugin/coreplugin.qbs", + "coreplugin/images/logo/logo.qbs", + "cpaster/cpaster.qbs", +@@ -46,17 +45,14 @@ + "qmljstools/qmljstools.qbs", + "qmlprofiler/qmlprofiler.qbs", + "qmlprojectmanager/qmlprojectmanager.qbs", +- "qnx/qnx.qbs", + "qmakeprojectmanager/qmakeprojectmanager.qbs", + "qtsupport/qtsupport.qbs", +- "remotelinux/remotelinux.qbs", + "resourceeditor/resourceeditor.qbs", + "subversion/subversion.qbs", + "tasklist/tasklist.qbs", + "texteditor/texteditor.qbs", + "todo/todo.qbs", + "updateinfo/updateinfo.qbs", +- "valgrind/valgrind.qbs", + "vcsbase/vcsbase.qbs", + "welcome/welcome.qbs" + ].concat(project.additionalPlugins) + diff -Nru qtcreator-3.0.1/debian/patches/series qtcreator-3.0.1/debian/patches/series --- qtcreator-3.0.1/debian/patches/series 2014-03-06 10:19:35.000000000 +0000 +++ qtcreator-3.0.1/debian/patches/series 2014-04-09 07:48:19.000000000 +0000 @@ -5,4 +5,4 @@ # Ubuntu patches rpath_nonlinux.diff -disable_cmake_plugin.diff +disable_plugins.diff diff -Nru qtcreator-3.0.1/debian/qtcreator.install qtcreator-3.0.1/debian/qtcreator.install --- qtcreator-3.0.1/debian/qtcreator.install 2014-03-06 10:19:13.000000000 +0000 +++ qtcreator-3.0.1/debian/qtcreator.install 2014-04-09 07:48:19.000000000 +0000 @@ -24,8 +24,6 @@ usr/lib/*/qtcreator/libqbscore.so.1.1 usr/lib/*/qtcreator/libqbscore.so.1.1.1 usr/lib/*/qtcreator/libzeroconf.* -usr/lib/*/qtcreator/plugins/BlackBerry/Qnx.pluginspec -usr/lib/*/qtcreator/plugins/BlackBerry/libQnx.so usr/lib/*/qtcreator/plugins/QtProject/AnalyzerBase.pluginspec usr/lib/*/qtcreator/plugins/QtProject/Android.pluginspec usr/lib/*/qtcreator/plugins/QtProject/AutotoolsProjectManager.pluginspec @@ -64,13 +62,11 @@ usr/lib/*/qtcreator/plugins/QtProject/QmlProfiler.pluginspec usr/lib/*/qtcreator/plugins/QtProject/QmlProjectManager.pluginspec usr/lib/*/qtcreator/plugins/QtProject/QtSupport.pluginspec -usr/lib/*/qtcreator/plugins/QtProject/RemoteLinux.pluginspec usr/lib/*/qtcreator/plugins/QtProject/ResourceEditor.pluginspec usr/lib/*/qtcreator/plugins/QtProject/Subversion.pluginspec usr/lib/*/qtcreator/plugins/QtProject/TaskList.pluginspec usr/lib/*/qtcreator/plugins/QtProject/TextEditor.pluginspec usr/lib/*/qtcreator/plugins/QtProject/Todo.pluginspec -usr/lib/*/qtcreator/plugins/QtProject/Valgrind.pluginspec usr/lib/*/qtcreator/plugins/QtProject/VcsBase.pluginspec usr/lib/*/qtcreator/plugins/QtProject/Welcome.pluginspec usr/lib/*/qtcreator/plugins/QtProject/libAnalyzerBase.so @@ -111,13 +107,11 @@ usr/lib/*/qtcreator/plugins/QtProject/libQmlProfiler.so usr/lib/*/qtcreator/plugins/QtProject/libQmlProjectManager.so usr/lib/*/qtcreator/plugins/QtProject/libQtSupport.so -usr/lib/*/qtcreator/plugins/QtProject/libRemoteLinux.so usr/lib/*/qtcreator/plugins/QtProject/libResourceEditor.so usr/lib/*/qtcreator/plugins/QtProject/libSubversion.so usr/lib/*/qtcreator/plugins/QtProject/libTaskList.so usr/lib/*/qtcreator/plugins/QtProject/libTextEditor.so usr/lib/*/qtcreator/plugins/QtProject/libTodo.so -usr/lib/*/qtcreator/plugins/QtProject/libValgrind.so usr/lib/*/qtcreator/plugins/QtProject/libVcsBase.so usr/lib/*/qtcreator/plugins/QtProject/libWelcome.so usr/lib/*/qtcreator/plugins/Sander/BareMetal.pluginspec @@ -805,18 +799,6 @@ usr/share/qtcreator/templates/shared/icon80.png usr/share/qtcreator/templates/shared/manifest.aegis usr/share/qtcreator/templates/wizards/README.txt -usr/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml -usr/share/qtcreator/templates/wizards/bb-bardescriptor/wizard.xml -usr/share/qtcreator/templates/wizards/bb-cascades-app/assets/main.qml -usr/share/qtcreator/templates/wizards/bb-cascades-app/bar-descriptor.xml -usr/share/qtcreator/templates/wizards/bb-cascades-app/icon.png -usr/share/qtcreator/templates/wizards/bb-cascades-app/project.pro -usr/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.cpp -usr/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.h -usr/share/qtcreator/templates/wizards/bb-cascades-app/src/main.cpp -usr/share/qtcreator/templates/wizards/bb-cascades-app/wizard.xml -usr/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml -usr/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/wizard.xml usr/share/qtcreator/templates/wizards/codesnippet/main.cpp usr/share/qtcreator/templates/wizards/codesnippet/project.pro usr/share/qtcreator/templates/wizards/codesnippet/wizard.xml diff -Nru qtcreator-3.0.1/debian/rules qtcreator-3.0.1/debian/rules --- qtcreator-3.0.1/debian/rules 2014-03-06 14:59:13.000000000 +0000 +++ qtcreator-3.0.1/debian/rules 2014-04-09 07:48:19.000000000 +0000 @@ -48,7 +48,7 @@ dh_auto_install --destdir=debian/tmp/usr dh_auto_build -- install_docs INSTALL_ROOT=$(CURDIR)/debian/tmp/usr mkdir -p debian/tmp/usr/src/qtcreator/ - find | egrep -v '^\.\/doc|^\.\/share|^\.\/\.pc|^\.\/debian|^\.\/tests|^\.\/share|cmakeprojectmanager' | grep "\.pri\$$\|\.h\$$\|\.xsl\$$" | xargs -I{} cp --parents -r "{}" debian/tmp/usr/src/qtcreator + find | egrep -v '^\.\/doc|^\.\/share|^\.\/\.pc|^\.\/debian|^\.\/tests|^\.\/share|cmakeprojectmanager|valgrind|qnx|remotelinux|Qnx' | grep "\.pri\$$\|\.h\$$\|\.xsl\$$" | xargs -I{} cp --parents -r "{}" debian/tmp/usr/src/qtcreator cd debian/tmp/usr/src/qtcreator; cp -r builddir/* .; rm -R builddir override_dh_auto_clean: