Timo Jyrinki has proposed merging
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_sync_debian_521-3 into
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
Requested reviews:
Kubuntu Packagers (kubuntu-packagers)
For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_sync_debian_521-3/+merge/208333
--
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_sync_debian_521-3/+merge/208333
Your team Kubuntu Packagers is requested to review the proposed merge of
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_sync_debian_521-3 into
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog 2014-02-24 05:34:24 +0000
+++ debian/changelog 2014-02-26 11:10:41 +0000
@@ -1,8 +1,8 @@
-qtdeclarative-opensource-src (5.2.1-0ubuntu1) UNRELEASED; urgency=low
+qtdeclarative-opensource-src (5.2.1-3ubuntu1) UNRELEASED; urgency=low
[ Timo Jyrinki ]
* New upstream release. (LP: #1253603) (LP: #1242629)
- * Bump build deps to 5.2.0
+ * Bump build deps to 5.2.1
* Drop a patch that upstream has fixed in another way:
- rendering_performance_fix_lp1092358.patch
* Drop patches submitted and merged upstream:
@@ -27,7 +27,7 @@
* Add qtdeclarative5-settings-plugin package
* Add new binaries like v4, qml, and update otherwise .install files
* Temporarily compile with CONFIG+=debug
- * Resync with Debian 5.2.0-1
+ * Resync with Debian 5.2.1-3
* Update to a new stable branch release (LP: #1259145) (LP: #1257322)
(LP: #1258057)
* Temporarily lower pkg-kde-tools dependency until it's synced
@@ -61,6 +61,34 @@
-- Timo Jyrinki <[email protected]> Thu, 13 Feb 2014 06:56:48 +0000
+qtdeclarative-opensource-src (5.2.1-3) experimental; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Stop building qtdeclarative5-doc from this source, it will be
+ built from qttools-opensource-src instead. This allows us to drop
+ qttools5-dev-tools build-dependency and get rid of dependency loop.
+ * Update debian/libqt5qml5.symbols from buildds’ logs.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[email protected]> Tue, 11 Feb 2014 13:30:50 -0300
+
+qtdeclarative-opensource-src (5.2.1-2) experimental; urgency=medium
+
+ * Bump Qt build dependencies.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[email protected]> Mon, 10 Feb 2014 13:23:01 -0300
+
+qtdeclarative-opensource-src (5.2.1-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Update symbols files with:
+ - buildd's logs.
+ - Current build. There are private simbols missing: bump qtdeclarative-abi
+ to 5-2-1.
+ - Mark private symbols as such.
+ * Adjust qtdeclarative5-private-dev: new file present.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[email protected]> Mon, 10 Feb 2014 12:35:35 -0300
+
qtdeclarative-opensource-src (5.2.0-8) unstable; urgency=medium
* Update symbols files with buildd's logs.
=== modified file 'debian/control'
--- debian/control 2014-02-10 15:33:35 +0000
+++ debian/control 2014-02-26 11:10:41 +0000
@@ -11,11 +11,10 @@
Timo Jyrinki <[email protected]>
Build-Depends: debhelper (>= 9),
dpkg-dev (>= 1.16.1),
- libqt5xmlpatterns5-private-dev (>= 5.2.1-0~),
- pkg-kde-tools (>= 0.15.8~),
+ libqt5xmlpatterns5-private-dev (>= 5.2.1~),
+ pkg-kde-tools (>= 0.15.12~),
python,
qtbase5-private-dev (>= 5.2.1+dfsg~)
-Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.2.1-0~)
Standards-Version: 3.9.5
Homepage: http://qt-project.org/
Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtdeclarative.git
@@ -78,7 +77,9 @@
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: qtdeclarative5-privatewidgets-plugin,
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Qt 5 Dialogs 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.
@@ -276,7 +277,8 @@
qtdeclarative5-particles-plugin,
qtdeclarative5-test-plugin,
qtdeclarative5-xmllistmodel-plugin,
- ${misc:Depends}, ${shlibs:Depends}
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Qt 5 declarative examples
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -301,17 +303,6 @@
.
This package contains the debugging symbols for the Qt 5 declarative libraries.
-Package: qtdeclarative5-doc
-Priority: extra
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: Qt 5 declarative documentation
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the documentation for the Qt 5 declarative libraries.
-
Package: qtdeclarative5-doc-html
Priority: extra
Architecture: all
=== removed file 'debian/qtdeclarative5-doc.install'
--- debian/qtdeclarative5-doc.install 2013-12-17 09:01:49 +0000
+++ debian/qtdeclarative5-doc.install 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/share/qt5/doc/qtqml.qch
-usr/share/qt5/doc/qtquick.qch
-usr/share/qt5/doc/qtquickdialogs.qch
=== modified file 'debian/rules'
--- debian/rules 2014-01-08 17:39:50 +0000
+++ debian/rules 2014-02-26 11:10:41 +0000
@@ -17,7 +17,7 @@
qmake QT_BUILD_PARTS+=tests
override_dh_auto_build-indep:
- dh_auto_build -Smakefile -- docs
+ dh_auto_build -Smakefile -- html_docs
override_dh_auto_install-arch:
dh_auto_install
@@ -41,7 +41,7 @@
\) -print0 | xargs -0 chmod a-x
override_dh_auto_install-indep:
- make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+ make INSTALL_ROOT=$(CURDIR)/debian/tmp install_html_docs
override_dh_install:
dh_install --fail-missing
--
kubuntu-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
