Merge lp:~saviq/unity8/qt-renames-no-dee into lp:unity8

[Michał Sawicz]

Adapt to Debian Qt package renames and drop unneeded Dee plugin dependency.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
New qtdeclarative needs to land.

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

 * Did you make sure that your branch does not contain spurious tags?
Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Yes.

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:857
http://jenkins.qa.ubuntu.com/job/unity8-ci/2875/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/468/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1739/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1396/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1400/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1396/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4728/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2875/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in debian/control
1 conflicts encountered.

review: Needs Fixing

[lp:~saviq/unity8/qt-renames-no-dee]

858. By Michał Sawicz on 2014-04-30

Merge trunk.

[Michał Sawicz (saviq)]

Merged.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:858
http://jenkins.qa.ubuntu.com/job/unity8-ci/2885/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/516/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1749/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1406/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1410/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1406/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4786/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2885/rebuild

review: Needs Fixing (continuous-integration)

[lp:~saviq/unity8/qt-renames-no-dee]

859. By Michał Sawicz on 2014-04-30

Undo qtmultimedia rename, not there yet.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:859
http://jenkins.qa.ubuntu.com/job/unity8-ci/2887/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/522/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1751/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1412/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4792/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2887/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Looks good now as the qtmultimedia one is not yet in archives indeed!

review: Approve

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, still builds

 * Did CI run pass? If not, please explain why.
No, it's using trusty instead of utopic

review: Approve

=== modified file 'build'
--- build	2014-04-02 12:08:51 +0000
+++ build	2014-04-30 10:42:12 +0000
@@ -43,13 +43,12 @@
                          gsettings-desktop-schemas \
                          gsettings-ubuntu-schemas \
                          qmenumodel-qml \
-                         qtdeclarative5-dee-plugin \
+                         qml-module-qtquick-xmllistmodel \
                          qtdeclarative5-gsettings1.0 \
                          qtdeclarative5-ubuntu-ui-toolkit-plugin \
                          qtdeclarative5-ubuntu-settings-components \
                          qtdeclarative5-ubuntu-thumbnailer0.1 \
                          unity-notifications-impl \
-                         qtdeclarative5-xmllistmodel-plugin \
                          ubuntu-mobile-icons \
                          unity-scope-home \
                          unity-lens-applications \

=== modified file 'debian/control'
--- debian/control	2014-04-29 15:08:05 +0000
+++ debian/control	2014-04-30 10:42:12 +0000
@@ -26,6 +26,9 @@
                python3-all:any,
                python3-setuptools,
                python:any (>= 2.7),
+               qml-module-qtquick-xmllistmodel,
+               qml-module-qtquick2,
+               qml-module-qttest,
                qt5-default,
                qtbase5-dev,
                qtbase5-dev-tools,
@@ -34,11 +37,8 @@
                qtdeclarative5-dev-tools,
                qtdeclarative5-private-dev,
                qtdeclarative5-qtmultimedia-plugin,
-               qtdeclarative5-qtquick2-plugin,
-               qtdeclarative5-test-plugin,
                qtdeclarative5-ubuntu-settings-components,
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
-               qtdeclarative5-xmllistmodel-plugin,
                ttf-ubuntu-font-family,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/unity
@@ -76,10 +76,9 @@
          libglib2.0-bin,
          libunity-mir1 (>= 0.4),
          qmenumodel-qml (>= 0.2.7),
-         qtdeclarative5-dee-plugin,
+         qml-module-qtquick-xmllistmodel,
          qtdeclarative5-gsettings1.0,
          qtdeclarative5-ubuntu-settings-components,
-         qtdeclarative5-xmllistmodel-plugin,
          unity-launcher-impl-3,
          unity8-common (= ${source:Version}),
          unity8-private (= ${binary:Version}),