[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.3.0-3-2-gf824be3

Timo Jyrinki timo at moszumanska.debian.org
Wed May 28 05:54:54 UTC 2014


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

The following commit has been merged in the experimental branch:
commit f824be39a043d363de51d8831ed3549e1e0e4133
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed May 28 05:54:20 2014 +0000

    Move a Quick Widgets private header to qtdeclarative5-private-dev.
---
 debian/changelog                          | 3 +++
 debian/control                            | 4 ++--
 debian/qtdeclarative5-dev.install         | 8 +++++++-
 debian/qtdeclarative5-private-dev.install | 1 +
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d4e4e0..aa9c5d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtdeclarative-opensource-src (5.3.0-4) UNRELEASED; urgency=medium
 
+  [ Timo Jyrinki ]
+  * Move a Quick Widgets private header to qtdeclarative5-private-dev.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 28 May 2014 05:48:28 +0000
 
 qtdeclarative-opensource-src (5.3.0-3) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 90ef519..d7630fb 100644
--- a/debian/control
+++ b/debian/control
@@ -235,8 +235,8 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: qtdeclarative5-dev (= ${binary:Version}), ${misc:Depends}
-Breaks: qtdeclarative5-dev (<< 5.2.0-5~)
-Replaces: qtdeclarative5-dev (<< 5.2.0-5~)
+Breaks: qtdeclarative5-dev (<< 5.3.0-4~)
+Replaces: qtdeclarative5-dev (<< 5.3.0-4~)
 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.
diff --git a/debian/qtdeclarative5-dev.install b/debian/qtdeclarative5-dev.install
index ab91284..e5c346a 100644
--- a/debian/qtdeclarative5-dev.install
+++ b/debian/qtdeclarative5-dev.install
@@ -128,7 +128,13 @@ usr/include/*/qt5/QtQuickTest/QtQuickTestVersion
 usr/include/*/qt5/QtQuickTest/qtquicktestversion.h
 usr/include/*/qt5/QtQuickTest/quicktest.h
 usr/include/*/qt5/QtQuickTest/quicktestglobal.h
-usr/include/*/qt5/QtQuickWidgets
+usr/include/*/qt5/QtQuickWidgets/QQuickWidget
+usr/include/*/qt5/QtQuickWidgets/QtQuickWidgets
+usr/include/*/qt5/QtQuickWidgets/QtQuickWidgetsDepends
+usr/include/*/qt5/QtQuickWidgets/QtQuickWidgetsVersion
+usr/include/*/qt5/QtQuickWidgets/qquickwidget.h
+usr/include/*/qt5/QtQuickWidgets/qtquickwidgetsglobal.h
+usr/include/*/qt5/QtQuickWidgets/qtquickwidgetsversion.h
 usr/lib/*/cmake/Qt5Qml/Qt5QmlConfig.cmake
 usr/lib/*/cmake/Qt5Qml/Qt5QmlConfigVersion.cmake
 usr/lib/*/cmake/Qt5Qml/Qt5Qml_QTcpServerConnection.cmake
diff --git a/debian/qtdeclarative5-private-dev.install b/debian/qtdeclarative5-private-dev.install
index 7aec752..c6ae42b 100644
--- a/debian/qtdeclarative5-private-dev.install
+++ b/debian/qtdeclarative5-private-dev.install
@@ -375,6 +375,7 @@ usr/include/*/qt5/QtQuickParticles/*/QtQuickParticles/private/qtquickparticlesgl
 usr/include/*/qt5/QtQuickTest/*/QtQuickTest/private/qtestoptions_p.h
 usr/include/*/qt5/QtQuickTest/*/QtQuickTest/private/quicktestevent_p.h
 usr/include/*/qt5/QtQuickTest/*/QtQuickTest/private/quicktestresult_p.h
+usr/include/*/qt5/QtQuickWidgets/*/QtQuickWidgets/private/qquickwidget_p.h
 usr/lib/*/qt5/mkspecs/modules/qt_lib_qml_private.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_qmltest_private.pri

-- 
qtdeclarative packaging



More information about the pkg-kde-commits mailing list