[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.1.1-1-13-ge85922c
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Sat Nov 30 18:02:47 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=e85922c
The following commit has been merged in the experimental branch:
commit e85922cac2845cb34f081acbaf32d7d2aafedabf
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Sat Nov 30 15:02:27 2013 -0300
No-op wrap-and-sort.
---
debian/control | 14 +++++-----
debian/qtdeclarative5-dialogs-plugin.install | 4 +--
debian/qtdeclarative5-examples.install | 40 ++++++++++++++--------------
debian/qtdeclarative5-private-dev.install | 16 +++++------
4 files changed, 36 insertions(+), 38 deletions(-)
diff --git a/debian/control b/debian/control
index 521c37f..a273f41 100644
--- a/debian/control
+++ b/debian/control
@@ -12,10 +12,9 @@ Build-Depends: debhelper (>= 9),
dpkg-dev (>= 1.16.1),
libqt5xmlpatterns5-private-dev (>= 5.2.0~beta1~),
pkg-kde-tools,
- qtbase5-private-dev (>= 5.2.0~beta1~),
- python
-Build-Depends-Indep: libqt5sql5-sqlite,
- qttools5-dev-tools (>= 5.2.0~beta1~)
+ python,
+ qtbase5-private-dev (>= 5.2.0~beta1~)
+Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.2.0~beta1~)
Standards-Version: 3.9.4
Homepage: http://qt-project.org/
Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtdeclarative.git
@@ -99,7 +98,7 @@ Package: qtdeclarative5-localstorage-plugin
Architecture: any
Multi-Arch: same
Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}, libqt5sql5-sqlite
+Depends: libqt5sql5-sqlite, ${misc:Depends}, ${shlibs:Depends}
Description: Qt 5 localstorage QML plugin
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -216,8 +215,7 @@ Package: qtdeclarative5-private-dev
Architecture: any
Section: libdevel
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: qtdeclarative5-dev (= ${binary:Version}),
- ${misc:Depends},
+Depends: qtdeclarative5-dev (= ${binary:Version}), ${misc:Depends}
Description: Qt 5 declarative private development files
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -276,7 +274,7 @@ Depends: libqt5qml5 (= ${binary:Version}),
libqt5quicktest5 (= ${binary:Version}),
${misc:Depends}
Recommends: qtbase5-dbg
-Suggests: qtdeclarative5-examples (= ${binary:Version}),
+Suggests: qtdeclarative5-examples (= ${binary:Version})
Description: Qt 5 declarative libraries debugging symbols
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/qtdeclarative5-dialogs-plugin.install b/debian/qtdeclarative5-dialogs-plugin.install
index f3c4472..29357a9 100644
--- a/debian/qtdeclarative5-dialogs-plugin.install
+++ b/debian/qtdeclarative5-dialogs-plugin.install
@@ -1,5 +1,5 @@
+usr/lib/*/qt5/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so
+usr/lib/*/qt5/qml/QtQuick/Dialogs/Private/qmldir
usr/lib/*/qt5/qml/QtQuick/Dialogs/libdialogplugin.so
usr/lib/*/qt5/qml/QtQuick/Dialogs/plugins.qmltypes
usr/lib/*/qt5/qml/QtQuick/Dialogs/qmldir
-usr/lib/*/qt5/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so
-usr/lib/*/qt5/qml/QtQuick/Dialogs/Private/qmldir
diff --git a/debian/qtdeclarative5-examples.install b/debian/qtdeclarative5-examples.install
index 818d537..f23bb1e 100644
--- a/debian/qtdeclarative5-examples.install
+++ b/debian/qtdeclarative5-examples.install
@@ -23,24 +23,24 @@ usr/lib/*/qt5/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfacto
usr/lib/*/qt5/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject
usr/lib/*/qt5/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc
usr/lib/*/qt5/examples/qml/networkaccessmanagerfactory/view.qml
-usr/lib/*/qt5/examples/qml/qmlextensionplugins/qmlextensionplugins.pro
-usr/lib/*/qt5/examples/qml/qmlextensionplugins/plugin.cpp
-usr/lib/*/qt5/examples/qml/qmlextensionplugins/plugins.qml
-usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/Clock.qml
-usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/libqmlqtimeexampleplugin.so
-usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/clock.png
-usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/center.png
-usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png
-usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/qmldir
-usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png
-usr/lib/*/qt5/examples/qml/qml-i18n/qml-i18n.qml
-usr/lib/*/qt5/examples/qml/qml-i18n/qml-i18n.qmlproject
-usr/lib/*/qt5/examples/qml/qml-i18n/doc/src/i18n.qdoc
usr/lib/*/qt5/examples/qml/qml-i18n/doc/images/qml-i18n-example.png
-usr/lib/*/qt5/examples/qml/qml-i18n/i18n/qml_en_AU.ts
+usr/lib/*/qt5/examples/qml/qml-i18n/doc/src/i18n.qdoc
usr/lib/*/qt5/examples/qml/qml-i18n/i18n/base.ts
+usr/lib/*/qt5/examples/qml/qml-i18n/i18n/qml_en_AU.ts
usr/lib/*/qt5/examples/qml/qml-i18n/i18n/qml_fr.ts
+usr/lib/*/qt5/examples/qml/qml-i18n/qml-i18n.qml
+usr/lib/*/qt5/examples/qml/qml-i18n/qml-i18n.qmlproject
usr/lib/*/qt5/examples/qml/qml.pro
+usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/Clock.qml
+usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/center.png
+usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/clock.png
+usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png
+usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/libqmlqtimeexampleplugin.so
+usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png
+usr/lib/*/qt5/examples/qml/qmlextensionplugins/imports/TimeExample/qmldir
+usr/lib/*/qt5/examples/qml/qmlextensionplugins/plugin.cpp
+usr/lib/*/qt5/examples/qml/qmlextensionplugins/plugins.qml
+usr/lib/*/qt5/examples/qml/qmlextensionplugins/qmlextensionplugins.pro
usr/lib/*/qt5/examples/qml/referenceexamples/adding/adding
usr/lib/*/qt5/examples/qml/referenceexamples/adding/adding.pro
usr/lib/*/qt5/examples/qml/referenceexamples/adding/adding.qrc
@@ -411,6 +411,7 @@ 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/Block.qml
usr/lib/*/qt5/examples/quick/demos/samegame/content/BlockEmitter.qml
usr/lib/*/qt5/examples/quick/demos/samegame/content/Button.qml
@@ -478,7 +479,6 @@ 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/samegame.js
usr/lib/*/qt5/examples/quick/demos/samegame/content/settings.js
-usr/lib/*/qt5/examples/quick/demos/samegame/content/+blackberry/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
@@ -751,14 +751,14 @@ usr/lib/*/qt5/examples/quick/positioners/positioners.pro
usr/lib/*/qt5/examples/quick/positioners/positioners.qml
usr/lib/*/qt5/examples/quick/positioners/positioners.qmlproject
usr/lib/*/qt5/examples/quick/positioners/positioners.qrc
-usr/lib/*/qt5/examples/quick/quick-accessibility/quick-accessibility.pro
-usr/lib/*/qt5/examples/quick/quick-accessibility/quick-accessibility
-usr/lib/*/qt5/examples/quick/quick-accessibility/accessibility.qrc
usr/lib/*/qt5/examples/quick/quick-accessibility/accessibility.qml
-usr/lib/*/qt5/examples/quick/quick-accessibility/content/Slider.qml
-usr/lib/*/qt5/examples/quick/quick-accessibility/content/Checkbox.qml
+usr/lib/*/qt5/examples/quick/quick-accessibility/accessibility.qrc
usr/lib/*/qt5/examples/quick/quick-accessibility/content/Button.qml
+usr/lib/*/qt5/examples/quick/quick-accessibility/content/Checkbox.qml
+usr/lib/*/qt5/examples/quick/quick-accessibility/content/Slider.qml
usr/lib/*/qt5/examples/quick/quick-accessibility/main.cpp
+usr/lib/*/qt5/examples/quick/quick-accessibility/quick-accessibility
+usr/lib/*/qt5/examples/quick/quick-accessibility/quick-accessibility.pro
usr/lib/*/qt5/examples/quick/quick.pro
usr/lib/*/qt5/examples/quick/righttoleft/layoutdirection/layoutdirection.qml
usr/lib/*/qt5/examples/quick/righttoleft/layoutdirection/layoutdirection.qmlproject
diff --git a/debian/qtdeclarative5-private-dev.install b/debian/qtdeclarative5-private-dev.install
index 40278fb..fe7a494 100644
--- a/debian/qtdeclarative5-private-dev.install
+++ b/debian/qtdeclarative5-private-dev.install
@@ -136,10 +136,10 @@ usr/include/qt5/QtQml/*/QtQml/private/qv4domerrors_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4engine_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4errorobject_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4executableallocator_p.h
-usr/include/qt5/QtQml/*/QtQml/private/qv4functionobject_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4function_p.h
-usr/include/qt5/QtQml/*/QtQml/private/qv4globalobject_p.h
+usr/include/qt5/QtQml/*/QtQml/private/qv4functionobject_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4global_p.h
+usr/include/qt5/QtQml/*/QtQml/private/qv4globalobject_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4identifier_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4identifiertable_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4include_p.h
@@ -153,19 +153,19 @@ usr/include/qt5/QtQml/*/QtQml/private/qv4jsir_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4jsonobject_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4lookup_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4managed_p.h
-usr/include/qt5/QtQml/*/QtQml/private/qv4mathobject_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4math_p.h
+usr/include/qt5/QtQml/*/QtQml/private/qv4mathobject_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4mm_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4numberobject_p.h
-usr/include/qt5/QtQml/*/QtQml/private/qv4objectiterator_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4object_p.h
+usr/include/qt5/QtQml/*/QtQml/private/qv4objectiterator_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4objectproto_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4property_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4qmlextensions_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4qobjectwrapper_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4regalloc_p.h
-usr/include/qt5/QtQml/*/QtQml/private/qv4regexpobject_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4regexp_p.h
+usr/include/qt5/QtQml/*/QtQml/private/qv4regexpobject_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4runtime_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4scopedvalue_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4script_p.h
@@ -174,8 +174,8 @@ usr/include/qt5/QtQml/*/QtQml/private/qv4serialize_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4sparsearray_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4sqlerrors_p.h
usr/include/qt5/QtQml/*/QtQml/private/qv4ssa_p.h
-usr/include/qt5/QtQml/*/QtQml/private/qv4stringobject_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
@@ -198,10 +198,10 @@ usr/include/qt5/QtQuick/*/QtQuick/private/qquickanimatedsprite_p.h
usr/include/qt5/QtQuick/*/QtQuick/private/qquickanimation_p.h
usr/include/qt5/QtQuick/*/QtQuick/private/qquickanimation_p_p.h
usr/include/qt5/QtQuick/*/QtQuick/private/qquickanimationcontroller_p.h
-usr/include/qt5/QtQuick/*/QtQuick/private/qquickanimatorcontroller_p.h
-usr/include/qt5/QtQuick/*/QtQuick/private/qquickanimatorjob_p.h
usr/include/qt5/QtQuick/*/QtQuick/private/qquickanimator_p.h
usr/include/qt5/QtQuick/*/QtQuick/private/qquickanimator_p_p.h
+usr/include/qt5/QtQuick/*/QtQuick/private/qquickanimatorcontroller_p.h
+usr/include/qt5/QtQuick/*/QtQuick/private/qquickanimatorjob_p.h
usr/include/qt5/QtQuick/*/QtQuick/private/qquickapplication_p.h
usr/include/qt5/QtQuick/*/QtQuick/private/qquickbehavior_p.h
usr/include/qt5/QtQuick/*/QtQuick/private/qquickborderimage_p.h
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list