diffstat of debian/ for qtchooser_26-3 qtchooser_26-3ubuntu2 changelog | 41 +++++++++++++++++++++++++++++++++++++++++ control | 8 +++++--- 2 files changed, 46 insertions(+), 3 deletions(-) diff -Nru qtchooser-26/debian/changelog qtchooser-26/debian/changelog --- qtchooser-26/debian/changelog 2013-05-13 20:23:55.000000000 +0000 +++ qtchooser-26/debian/changelog 2013-08-07 14:43:08.000000000 +0000 @@ -1,3 +1,18 @@ +qtchooser (26-3ubuntu2) saucy; urgency=low + + * Make the package Multi-Arch: foreign. LP: #1209239. + Note, this is for installation only, choosing the defaults for the + foreign architecture is not yet implemented. + + -- Matthias Klose Wed, 07 Aug 2013 16:40:09 +0200 + +qtchooser (26-3ubuntu1) saucy; urgency=low + + * Merge with Debian experimental (LP: #1179995), remaining Ubuntu change: + - Break qt4 (<= 4:4.8.4+dfsg-0ubuntu3~), not (<= 4:4.8.4+dfsg-1~). + + -- Dmitry Shachnev Tue, 14 May 2013 19:13:13 +0400 + qtchooser (26-3) experimental; urgency=low [ Pino Toscano ] @@ -39,3 +54,29 @@ - create-a-system-default-path.patch -- Lisandro Damián Nicanor Pérez Meyer Sun, 24 Mar 2013 13:55:31 -0300 + +qtchooser (0.0.1~git20121229.g8f08405-0ubuntu3) raring; urgency=low + + * Fix FTBFS that I caused in the last update because qmake wasn't + in the Build-Depends + + -- Michael Terry Tue, 12 Feb 2013 10:29:47 -0500 + +qtchooser (0.0.1~git20121229.g8f08405-0ubuntu2) raring; urgency=low + + * debian/patches/enable-tests.patch, debian/rules: + - Enable running tests during the build. Fix an upstream building + issue by manually creating a Makefile when running tests. + + -- Michael Terry Tue, 12 Feb 2013 10:06:10 -0500 + +qtchooser (0.0.1~git20121229.g8f08405-0ubuntu1) raring; urgency=low + + * Initial release. + * Proposed upstream patch: + - create-a-system-default-path.patch + * Cherry-pick from upstream: + - add_qdoc_and_qdoc3.patch + - add_license_files.patch + + -- Timo Jyrinki Wed, 06 Feb 2013 12:48:19 +0000 diff -Nru qtchooser-26/debian/control qtchooser-26/debian/control --- qtchooser-26/debian/control 2013-05-06 23:29:06.000000000 +0000 +++ qtchooser-26/debian/control 2013-08-07 14:42:06.000000000 +0000 @@ -1,7 +1,8 @@ Source: qtchooser Section: libdevel Priority: extra -Maintainer: Debian Qt/KDE Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Timo Jyrinki , Lisandro Damián Nicanor Pérez Meyer Build-Depends: debhelper (>= 9), libqt4-dev @@ -12,9 +13,10 @@ Package: qtchooser Architecture: any +Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: libqt4-dev-bin (<= 4:4.8.4+dfsg-1~), qt4-designer (<= 4:4.8.4+dfsg-1~), qt4-dev-tools (<= 4:4.8.4+dfsg-1~), qt4-linguist-tools (<= 4:4.8.4+dfsg-1~), qt4-qmake (<= 4:4.8.4+dfsg-1~), qt4-qtconfig (<= 4:4.8.4+dfsg-1~), qdbus (<= 4:4.8.4+dfsg-1~), qt4-qmlviewer (<= 4:4.8.4+dfsg-1~), qtcreator (<= 2.6.0) -Replaces: libqt4-dev-bin (<= 4:4.8.4+dfsg-1~), qt4-designer (<= 4:4.8.4+dfsg-1~), qt4-dev-tools (<= 4:4.8.4+dfsg-1~), qt4-linguist-tools (<= 4:4.8.4+dfsg-1~), qt4-qmake (<= 4:4.8.4+dfsg-1~), qt4-qtconfig (<= 4:4.8.4+dfsg-1~), qdbus (<= 4:4.8.4+dfsg-1~), qt4-qmlviewer (<= 4:4.8.4+dfsg-1~), qtcreator (<= 2.6.0) +Breaks: libqt4-dev-bin (<= 4:4.8.4+dfsg-0ubuntu3~), qt4-designer (<= 4:4.8.4+dfsg-0ubuntu3~), qt4-dev-tools (<= 4:4.8.4+dfsg-0ubuntu3~), qt4-linguist-tools (<= 4:4.8.4+dfsg-0ubuntu3~), qt4-qmake (<= 4:4.8.4+dfsg-0ubuntu3~), qt4-qtconfig (<= 4:4.8.4+dfsg-0ubuntu3~), qdbus (<= 4:4.8.4+dfsg-0ubuntu3~), qt4-qmlviewer (<= 4:4.8.4+dfsg-0ubuntu3~), qtcreator (<= 2.6.0) +Replaces: libqt4-dev-bin (<= 4:4.8.4+dfsg-0ubuntu3~), qt4-designer (<= 4:4.8.4+dfsg-0ubuntu3~), qt4-dev-tools (<= 4:4.8.4+dfsg-0ubuntu3~), qt4-linguist-tools (<= 4:4.8.4+dfsg-0ubuntu3~), qt4-qmake (<= 4:4.8.4+dfsg-0ubuntu3~), qt4-qtconfig (<= 4:4.8.4+dfsg-0ubuntu3~), qdbus (<= 4:4.8.4+dfsg-0ubuntu3~), qt4-qmlviewer (<= 4:4.8.4+dfsg-0ubuntu3~), qtcreator (<= 2.6.0) Suggests: qt4-default, qt5-default Description: Wrapper to select between Qt development binary versions Qt is a cross-platform C++ application framework. Qt's primary feature