[SCM] qtcreator packaging branch, master, updated. debian/2.7.0-1-29-gc8e1b26
Lisandro Damián Nicanor Pérez
lisandro at alioth.debian.org
Sun Sep 1 01:08:17 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=c8e1b26
The following commit has been merged in the master branch:
commit c8e1b26fc6c7ffa6c3de2983d8487aa620a6dcae
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Sat Aug 31 22:07:46 2013 -0300
Adjust install files.
---
debian/changelog | 1 +
debian/qtcreator-data.install | 88 ++++++++++++++++++++++++++++++++++++++--
debian/qtcreator.install | 2 -
debian/qtcreator.install.linux | 11 +++--
4 files changed, 93 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d3305e0..47c0124 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ qtcreator (2.8.1-1) UNRELEASED; urgency=low
* Update watch file.
* Refresh patches.
* Remove 03_fix_DOCPATH.diff, no longer needed.
+ * Adjust install files.
[ Pino Toscano ]
* Switch Homepage to a qt-project.org page.
diff --git a/debian/qtcreator-data.install b/debian/qtcreator-data.install
index c325a04..8a3ed62 100644
--- a/debian/qtcreator-data.install
+++ b/debian/qtcreator-data.install
@@ -15,12 +15,12 @@ usr/share/qtcreator/designer/templates/Main_Window.ui
usr/share/qtcreator/designer/templates/Widget.ui
usr/share/qtcreator/dumper/LGPL_EXCEPTION.TXT
usr/share/qtcreator/dumper/LICENSE.LGPL
-usr/share/qtcreator/dumper/bridge.py
usr/share/qtcreator/dumper/dumper.cpp
usr/share/qtcreator/dumper/dumper.h
usr/share/qtcreator/dumper/dumper.pro
-usr/share/qtcreator/dumper/dumper.py
usr/share/qtcreator/dumper/dumper_p.h
+usr/share/qtcreator/dumper/gbridge.py
+usr/share/qtcreator/dumper/lbridge.py
usr/share/qtcreator/dumper/pdumper.py
usr/share/qtcreator/dumper/qttypes.py
usr/share/qtcreator/dumper/test/dumpertest.pro
@@ -53,6 +53,73 @@ usr/share/qtcreator/glsl/glsl_120_common.glsl
usr/share/qtcreator/glsl/glsl_es_100.frag
usr/share/qtcreator/glsl/glsl_es_100.vert
usr/share/qtcreator/glsl/glsl_es_100_common.glsl
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/FileInfo/fileinfo.js
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/Probes/BinaryProbe.qbs
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/Probes/IncludeProbe.qbs
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/Probes/PathProbe.qbs
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/Probes/utils.js
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/base/Application.qbs
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/base/CppApplication.qbs
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/base/DynamicLibrary.qbs
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/base/QmlApp.qbs
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/base/StaticLibrary.qbs
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/base/qmlapplicationviewer/qmlapplicationviewer.h
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/base/qmlapplicationviewer/qmlapplicationviewer_qt4.cpp
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/base/qmlapplicationviewer/qmlapplicationviewer_qt4.h
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/base/qmlapplicationviewer/qmlapplicationviewer_qt5.cpp
+usr/share/qtcreator/qbs/share/qbs/imports/qbs/base/qmlapplicationviewer/qmlapplicationviewer_qt5.h
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/QtModule.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/axcontainer/axcontainer.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/axserver/axserver.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/concurrent/concurrent.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/core/core.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/core/moc.js
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/dbus/dbus.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/declarative/declarative.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/designer/designer.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/designercomponents/designercomponents.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/enginio/enginio.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/gui/gui.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/help/help.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/jsonstream/jsonstream.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/multimedia/multimedia.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/multimediawidgets/multimediawidgets.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/network/network.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/opengl/opengl.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/phonon/phonon.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/printsupport/printsupport.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/qml/qml.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/qtfunctions.js
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/quick/quick.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/script/script.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/sql/sql.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/svg/svg.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/test/test.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/webkit/webkit.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/webkitwidgets/webkitwidgets.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/widgets/widgets.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/xml/xml.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/Qt/xmlpatterns/xmlpatterns.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/CppModule.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/DarwinGCC.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/GenericGCC.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/UnixGCC.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/bundle-tools.js
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/darwin-tools.js
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/gcc.js
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/genericunix-gcc.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/ios-gcc.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/linux-gcc.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/msvc.js
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/osx-gcc.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/path-tools.js
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/windows-mingw.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/windows-msvc.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/cpp/windows.js
+usr/share/qtcreator/qbs/share/qbs/modules/qbs/common.qbs
+usr/share/qtcreator/qbs/share/qbs/modules/utils.js
usr/share/qtcreator/qml-type-descriptions/builtins.qmltypes
usr/share/qtcreator/qml-type-descriptions/qbs-bundle.json
usr/share/qtcreator/qml-type-descriptions/qmlproject-bundle.json
@@ -247,6 +314,7 @@ usr/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h
usr/share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h
usr/share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
usr/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h
+usr/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceglobal.h
usr/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp
usr/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/Info.plist.in
@@ -262,7 +330,11 @@ usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.cpp
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.h
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
+usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp
+usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.h
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri
+usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp
+usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
@@ -291,11 +363,13 @@ usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserv
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
+usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickwindownodeinstance.cpp
+usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickwindownodeinstance.h
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h
-usr/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
usr/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro
+usr/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp
usr/share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc
usr/share/qtcreator/qml/qmlpuppet/qmlpuppet/Info.plist.in
usr/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp
@@ -343,9 +417,9 @@ usr/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserve
usr/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.h
usr/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/servernodeinstance.cpp
usr/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/servernodeinstance.h
-usr/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp
usr/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
usr/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro
+usr/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppetmain.cpp
usr/share/qtcreator/qml/qmlpuppet/qmlpuppet_utilities.pri
usr/share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/AlignmentHorizontalButtons.qml
usr/share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/AlignmentVerticalButtons.qml
@@ -484,12 +558,14 @@ usr/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ItemPane.qml
usr/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ListViewSpecifics.qml
usr/share/qtcreator/qmldesigner/propertyeditor/QtQuick/MouseAreaSpecifics.qml
usr/share/qtcreator/qmldesigner/propertyeditor/QtQuick/PathViewSpecifics.qml
+usr/share/qtcreator/qmldesigner/propertyeditor/QtQuick/QtObjectPane.qml
usr/share/qtcreator/qmldesigner/propertyeditor/QtQuick/RectangleColorGroupBox.qml
usr/share/qtcreator/qmldesigner/propertyeditor/QtQuick/RectangleSpecifics.qml
usr/share/qtcreator/qmldesigner/propertyeditor/QtQuick/RowSpecifics.qml
usr/share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextEditSpecifics.qml
usr/share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextInputSpecifics.qml
usr/share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextSpecifics.qml
+usr/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Window/WindowPane.qml
usr/share/qtcreator/qmldesigner/propertyeditor/QtQuick/emptyPane.qml
usr/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml
usr/share/qtcreator/qmlicons/Qt/16x16/BorderImage.png
@@ -587,6 +663,9 @@ usr/share/qtcreator/templates/qml/qtquick1_1/template.xml
usr/share/qtcreator/templates/qml/qtquick2/main.qml
usr/share/qtcreator/templates/qml/qtquick2/main.qmlproject
usr/share/qtcreator/templates/qml/qtquick2/template.xml
+usr/share/qtcreator/templates/qml/qtquickcontrols/main.qml
+usr/share/qtcreator/templates/qml/qtquickcontrols/main.qmlproject
+usr/share/qtcreator/templates/qml/qtquickcontrols/template.xml
usr/share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.cpp
usr/share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.h
usr/share/qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro
@@ -682,6 +761,7 @@ usr/share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec.in
usr/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp
usr/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.h
usr/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
+usr/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_dependencies.pri
usr/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_global.h
usr/share/qtcreator/templates/wizards/qtcreatorplugin/mypluginconstants.h
usr/share/qtcreator/templates/wizards/qtcreatorplugin/qtcreator_logo_24.png
diff --git a/debian/qtcreator.install b/debian/qtcreator.install
index 4ed5642..6032af6 100644
--- a/debian/qtcreator.install
+++ b/debian/qtcreator.install
@@ -1,13 +1,11 @@
debian/qtcreator.desktop usr/share/applications/
usr/bin/qmlpuppet
usr/bin/qtcreator
-usr/bin/qtcreator.sh
usr/bin/qtcreator_process_stub
usr/bin/qtpromaker
usr/bin/sdktool
usr/lib/*/qtcreator/libAggregation.*
usr/lib/*/qtcreator/libCPlusPlus.*
-usr/lib/*/qtcreator/libDebuggingHelper.*
usr/lib/*/qtcreator/libExtensionSystem.*
usr/lib/*/qtcreator/libGLSL.*
usr/lib/*/qtcreator/libLanguageUtils.*
diff --git a/debian/qtcreator.install.linux b/debian/qtcreator.install.linux
index ea98849..93df61c 100644
--- a/debian/qtcreator.install.linux
+++ b/debian/qtcreator.install.linux
@@ -1,13 +1,11 @@
debian/qtcreator.desktop usr/share/applications/
usr/bin/qmlpuppet
usr/bin/qtcreator
-usr/bin/qtcreator.sh
usr/bin/qtcreator_process_stub
usr/bin/qtpromaker
usr/bin/sdktool
usr/lib/*/qtcreator/libAggregation.*
usr/lib/*/qtcreator/libCPlusPlus.*
-usr/lib/*/qtcreator/libDebuggingHelper.*
usr/lib/*/qtcreator/libExtensionSystem.*
usr/lib/*/qtcreator/libGLSL.*
usr/lib/*/qtcreator/libLanguageUtils.*
@@ -18,7 +16,10 @@ usr/lib/*/qtcreator/libQmlJS.*
usr/lib/*/qtcreator/libQtcSsh.so
usr/lib/*/qtcreator/libQtcSsh.so.*
usr/lib/*/qtcreator/libUtils.*
-usr/lib/*/qtcreator/libptracepreload.*
+usr/lib/*/qtcreator/libqbscore.so
+usr/lib/*/qtcreator/libqbscore.so.1
+usr/lib/*/qtcreator/libqbscore.so.1.0
+usr/lib/*/qtcreator/libqbscore.so.1.0.0
usr/lib/*/qtcreator/libzeroconf.*
usr/lib/*/qtcreator/plugins/BlackBerry/Qnx.pluginspec
usr/lib/*/qtcreator/plugins/BlackBerry/libQnx.so
@@ -52,6 +53,8 @@ usr/lib/*/qtcreator/plugins/QtProject/Madde.pluginspec
usr/lib/*/qtcreator/plugins/QtProject/Mercurial.pluginspec
usr/lib/*/qtcreator/plugins/QtProject/Perforce.pluginspec
usr/lib/*/qtcreator/plugins/QtProject/ProjectExplorer.pluginspec
+usr/lib/*/qtcreator/plugins/QtProject/PythonEditor.pluginspec
+usr/lib/*/qtcreator/plugins/QtProject/QbsProjectManager.pluginspec
usr/lib/*/qtcreator/plugins/QtProject/QmlDesigner.pluginspec
usr/lib/*/qtcreator/plugins/QtProject/QmlJSEditor.pluginspec
usr/lib/*/qtcreator/plugins/QtProject/QmlJSTools.pluginspec
@@ -98,6 +101,8 @@ usr/lib/*/qtcreator/plugins/QtProject/libMadde.so
usr/lib/*/qtcreator/plugins/QtProject/libMercurial.so
usr/lib/*/qtcreator/plugins/QtProject/libPerforce.so
usr/lib/*/qtcreator/plugins/QtProject/libProjectExplorer.so
+usr/lib/*/qtcreator/plugins/QtProject/libPythonEditor.so
+usr/lib/*/qtcreator/plugins/QtProject/libQbsProjectManager.so
usr/lib/*/qtcreator/plugins/QtProject/libQmlDesigner.so
usr/lib/*/qtcreator/plugins/QtProject/libQmlJSEditor.so
usr/lib/*/qtcreator/plugins/QtProject/libQmlJSTools.so
--
qtcreator packaging
More information about the pkg-kde-commits
mailing list