[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.1.1-1-15-g603588b

Sat Nov 30 18:34:28 UTC 2013

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=603588b

The following commit has been merged in the experimental branch:
commit 603588bd2aa470ade2dfd57ef7581ed31538cee5
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Nov 30 15:34:11 2013 -0300

    Adjust install files.
---
 debian/changelog                          |  1 +
 debian/qtdeclarative5-dev-tools.install   |  1 -
 debian/qtdeclarative5-dev.install         | 11 +++++++----
 debian/qtdeclarative5-examples.install    |  6 ++++--
 debian/qtdeclarative5-private-dev.install |  7 +++----
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2ae7eb..5931dcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ qtdeclarative-opensource-src (5.2.0~rc1-1) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add python as build dependency.
   * Bump other Qt build-dependecies to 5.2.0~rc1.
+  * Adjust install files.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 26 Oct 2013 10:56:35 +0400
 
diff --git a/debian/qtdeclarative5-dev-tools.install b/debian/qtdeclarative5-dev-tools.install
index e9558f9..cf7cae2 100644
--- a/debian/qtdeclarative5-dev-tools.install
+++ b/debian/qtdeclarative5-dev-tools.install
@@ -5,4 +5,3 @@ usr/lib/*/qt5/bin/qmlmin
 usr/lib/*/qt5/bin/qmlplugindump
 usr/lib/*/qt5/bin/qmlprofiler
 usr/lib/*/qt5/bin/qmltestrunner
-usr/lib/*/qt5/bin/v4
diff --git a/debian/qtdeclarative5-dev.install b/debian/qtdeclarative5-dev.install
index 6be9535..3d36ad6 100644
--- a/debian/qtdeclarative5-dev.install
+++ b/debian/qtdeclarative5-dev.install
@@ -2,7 +2,6 @@ usr/include/qt5/QtQml/QJSEngine
 usr/include/qt5/QtQml/QJSValue
 usr/include/qt5/QtQml/QJSValueIterator
 usr/include/qt5/QtQml/QJSValueList
-usr/include/qt5/QtQml/QQmlAbstractUrlInterceptor
 usr/include/qt5/QtQml/QQmlApplicationEngine
 usr/include/qt5/QtQml/QQmlAttachedPropertiesFunc
 usr/include/qt5/QtQml/QQmlComponent
@@ -37,7 +36,6 @@ usr/include/qt5/QtQml/qjsengine.h
 usr/include/qt5/QtQml/qjsvalue.h
 usr/include/qt5/QtQml/qjsvalueiterator.h
 usr/include/qt5/QtQml/qqml.h
-usr/include/qt5/QtQml/qqmlabstracturlinterceptor.h
 usr/include/qt5/QtQml/qqmlapplicationengine.h
 usr/include/qt5/QtQml/qqmlcomponent.h
 usr/include/qt5/QtQml/qqmlcontext.h
@@ -130,6 +128,8 @@ usr/include/qt5/QtQuickTest/quicktest.h
 usr/include/qt5/QtQuickTest/quicktestglobal.h
 usr/lib/*/cmake/Qt5Qml/Qt5QmlConfig.cmake
 usr/lib/*/cmake/Qt5Qml/Qt5QmlConfigVersion.cmake
+usr/lib/*/cmake/Qt5Qml/Qt5Qml_QTcpServerConnection.cmake
+usr/lib/*/cmake/Qt5Qml/Qt5Qml_QtQuick2Plugin.cmake
 usr/lib/*/cmake/Qt5Quick/Qt5QuickConfig.cmake
 usr/lib/*/cmake/Qt5Quick/Qt5QuickConfigVersion.cmake
 usr/lib/*/cmake/Qt5QuickTest/Qt5QuickTestConfig.cmake
@@ -151,7 +151,10 @@ usr/lib/*/pkgconfig/Qt5Quick.pc
 usr/lib/*/pkgconfig/Qt5QuickParticles.pc
 usr/lib/*/pkgconfig/Qt5QuickTest.pc
 usr/share/qt5/mkspecs/modules/qt_lib_qml.pri
-usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools.pri
+usr/share/qt5/mkspecs/modules/qt_lib_qml_private.pri
+usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri
 usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri
+usr/share/qt5/mkspecs/modules/qt_lib_qmltest_private.pri
 usr/share/qt5/mkspecs/modules/qt_lib_quick.pri
-usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri
+usr/share/qt5/mkspecs/modules/qt_lib_quick_private.pri
+usr/share/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri
diff --git a/debian/qtdeclarative5-examples.install b/debian/qtdeclarative5-examples.install
index f23bb1e..483c21e 100644
--- a/debian/qtdeclarative5-examples.install
+++ b/debian/qtdeclarative5-examples.install
@@ -411,7 +411,8 @@ usr/lib/*/qt5/examples/quick/demos/rssnews/doc/images/qtquick-demo-rssnews-small
 usr/lib/*/qt5/examples/quick/demos/rssnews/doc/src/rssnews.qdoc
 usr/lib/*/qt5/examples/quick/demos/rssnews/rssnews.qml
 usr/lib/*/qt5/examples/quick/demos/rssnews/rssnews.qmlproject
-usr/lib/*/qt5/examples/quick/demos/samegame/content/+blackberry/settings.js
+usr/lib/*/qt5/examples/quick/demos/samegame/content/+blackberry/Settings.qml
+usr/lib/*/qt5/examples/quick/demos/samegame/content/BBSettings.qml
 usr/lib/*/qt5/examples/quick/demos/samegame/content/Block.qml
 usr/lib/*/qt5/examples/quick/demos/samegame/content/BlockEmitter.qml
 usr/lib/*/qt5/examples/quick/demos/samegame/content/Button.qml
@@ -422,6 +423,7 @@ usr/lib/*/qt5/examples/quick/demos/samegame/content/PaintEmitter.qml
 usr/lib/*/qt5/examples/quick/demos/samegame/content/PrimaryPack.qml
 usr/lib/*/qt5/examples/quick/demos/samegame/content/PuzzleBlock.qml
 usr/lib/*/qt5/examples/quick/demos/samegame/content/SamegameText.qml
+usr/lib/*/qt5/examples/quick/demos/samegame/content/Settings.qml
 usr/lib/*/qt5/examples/quick/demos/samegame/content/SimpleBlock.qml
 usr/lib/*/qt5/examples/quick/demos/samegame/content/SmokeText.qml
 usr/lib/*/qt5/examples/quick/demos/samegame/content/gfx/background-puzzle.png
@@ -477,8 +479,8 @@ usr/lib/*/qt5/examples/quick/demos/samegame/content/levels/level6.qml
 usr/lib/*/qt5/examples/quick/demos/samegame/content/levels/level7.qml
 usr/lib/*/qt5/examples/quick/demos/samegame/content/levels/level8.qml
 usr/lib/*/qt5/examples/quick/demos/samegame/content/levels/level9.qml
+usr/lib/*/qt5/examples/quick/demos/samegame/content/qmldir
 usr/lib/*/qt5/examples/quick/demos/samegame/content/samegame.js
-usr/lib/*/qt5/examples/quick/demos/samegame/content/settings.js
 usr/lib/*/qt5/examples/quick/demos/samegame/main.cpp
 usr/lib/*/qt5/examples/quick/demos/samegame/samegame
 usr/lib/*/qt5/examples/quick/demos/samegame/samegame.pro
diff --git a/debian/qtdeclarative5-private-dev.install b/debian/qtdeclarative5-private-dev.install
index fe7a494..5ca8f7a 100644
--- a/debian/qtdeclarative5-private-dev.install
+++ b/debian/qtdeclarative5-private-dev.install
@@ -176,9 +176,6 @@ usr/include/qt5/QtQml/*/QtQml/private/qv4sqlerrors_p.h
 usr/include/qt5/QtQml/*/QtQml/private/qv4ssa_p.h
 usr/include/qt5/QtQml/*/QtQml/private/qv4string_p.h
 usr/include/qt5/QtQml/*/QtQml/private/qv4stringobject_p.h
-usr/include/qt5/QtQml/*/QtQml/private/qv4unwindhelper_arm_p.h
-usr/include/qt5/QtQml/*/QtQml/private/qv4unwindhelper_dw2_p.h
-usr/include/qt5/QtQml/*/QtQml/private/qv4unwindhelper_p.h
 usr/include/qt5/QtQml/*/QtQml/private/qv4util_p.h
 usr/include/qt5/QtQml/*/QtQml/private/qv4value_def_p.h
 usr/include/qt5/QtQml/*/QtQml/private/qv4value_p.h
@@ -188,6 +185,7 @@ usr/include/qt5/QtQml/*/QtQml/private/qv8debug_p.h
 usr/include/qt5/QtQml/*/QtQml/private/qv8engine_p.h
 usr/include/qt5/QtQml/*/QtQml/private/qv8profiler_p.h
 usr/include/qt5/QtQml/*/QtQml/private/qv8profilerservice_p.h
+usr/include/qt5/QtQml/5.2.0/QtQml/private/qqmlabstracturlinterceptor_p.h
 usr/include/qt5/QtQuick/*/QtQuick/private/designerwindowmanager_p.h
 usr/include/qt5/QtQuick/*/QtQuick/private/qquickaccessibleattached_p.h
 usr/include/qt5/QtQuick/*/QtQuick/private/qquickanchors_p.h
@@ -313,7 +311,6 @@ usr/include/qt5/QtQuick/*/QtQuick/private/qsgdepthstencilbuffer_p.h
 usr/include/qt5/QtQuick/*/QtQuick/private/qsgdistancefieldglyphnode_p.h
 usr/include/qt5/QtQuick/*/QtQuick/private/qsgdistancefieldglyphnode_p_p.h
 usr/include/qt5/QtQuick/*/QtQuick/private/qsgdistancefieldutil_p.h
-usr/include/qt5/QtQuick/*/QtQuick/private/qsgflashnode_p.h
 usr/include/qt5/QtQuick/*/QtQuick/private/qsggeometry_p.h
 usr/include/qt5/QtQuick/*/QtQuick/private/qsgnode_p.h
 usr/include/qt5/QtQuick/*/QtQuick/private/qsgnodeupdater_p.h
@@ -328,6 +325,8 @@ usr/include/qt5/QtQuick/*/QtQuick/private/qsgthreadedrenderloop_p.h
 usr/include/qt5/QtQuick/*/QtQuick/private/qsgwindowsrenderloop_p.h
 usr/include/qt5/QtQuick/*/QtQuick/private/qtquick2_p.h
 usr/include/qt5/QtQuick/*/QtQuick/private/qtquickglobal_p.h
+usr/include/qt5/QtQuick/5.2.0/QtQuick/private/qsgmaterialshader_p.h
+usr/include/qt5/QtQuick/5.2.0/QtQuick/private/qsgshadersourcebuilder_p.h
 usr/include/qt5/QtQuickParticles/*/QtQuickParticles/private/qquickage_p.h
 usr/include/qt5/QtQuickParticles/*/QtQuickParticles/private/qquickangledirection_p.h
 usr/include/qt5/QtQuickParticles/*/QtQuickParticles/private/qquickcumulativedirection_p.h

-- 
qtdeclarative packaging

