Timo Jyrinki has proposed merging lp:~timo-jyrinki/kubuntu-packaging/qtxmlpatterns_sync_debian_521 into lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src.
Commit message: * Sync with Debian, no remaining differences - Change doc building together with qttools and qtdeclarative Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtxmlpatterns_sync_debian_521/+merge/208535 -- https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtxmlpatterns_sync_debian_521/+merge/208535 Your team Kubuntu Packagers is requested to review the proposed merge of lp:~timo-jyrinki/kubuntu-packaging/qtxmlpatterns_sync_debian_521 into lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src.
=== modified file 'debian/changelog' --- debian/changelog 2014-02-13 06:56:22 +0000 +++ debian/changelog 2014-02-27 05:51:00 +0000 @@ -1,16 +1,30 @@ -qtxmlpatterns-opensource-src (5.2.1-0ubuntu1) UNRELEASED; urgency=low - - [ Lisandro Damián Nicanor Pérez Meyer ] - * Properly adjust build dependencies. +qtxmlpatterns-opensource-src (5.2.1-2ubuntu1) UNRELEASED; urgency=low + + [ Timo Jyrinki ] + * New upstream release. + * Sync with Debian 5.2.1-2, no remaining differences. The below change + is from 5.2.1-3. + + [ Dmitry Shachnev ] + * Stop building qtxmlpatterns5-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. + + -- Timo Jyrinki <[email protected]> Thu, 13 Feb 2014 06:55:56 +0000 + +qtxmlpatterns-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:11:33 -0300 + +qtxmlpatterns-opensource-src (5.2.1-1) experimental; urgency=medium + * New upstream release. * Refresh and fix disable_network_tests.patch. * No symbols changed. - [ Timo Jyrinki ] - * New upstream release. - * Sync with Debian 5.2.1-1, no remaining differences - - -- Timo Jyrinki <[email protected]> Thu, 13 Feb 2014 06:55:56 +0000 + -- Lisandro Damián Nicanor Pérez Meyer <[email protected]> Sun, 09 Feb 2014 23:11:41 -0300 qtxmlpatterns-opensource-src (5.2.0-3) unstable; urgency=medium === modified file 'debian/control' --- debian/control 2014-02-10 12:26:24 +0000 +++ debian/control 2014-02-27 05:51:00 +0000 @@ -16,7 +16,6 @@ qtbase5-private-dev (>= 5.2.1+dfsg~), xauth, xvfb -Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.2.1~) Standards-Version: 3.9.5 Homepage: http://qt-project.org/ Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtxmlpatterns.git @@ -101,17 +100,6 @@ This package contains the debugging symbols for the Qt 5 XML patterns libraries. -Package: qtxmlpatterns5-doc -Priority: extra -Architecture: all -Section: doc -Depends: ${misc:Depends} -Description: Qt 5 XML patterns 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 XML patterns libraries. - Package: qtxmlpatterns5-doc-html Priority: extra Architecture: all === removed file 'debian/qtxmlpatterns5-doc.install' --- debian/qtxmlpatterns5-doc.install 2013-08-30 06:38:28 +0000 +++ debian/qtxmlpatterns5-doc.install 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -usr/share/qt5/doc/qtxmlpatterns.qch === modified file 'debian/rules' --- debian/rules 2014-02-10 12:26:24 +0000 +++ debian/rules 2014-02-27 05:51:00 +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 @@ -30,7 +30,7 @@ rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la 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
