Unity 8

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

  1. qt-renames-no-dee
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 859
Merged at revision: 880
Proposed branch: lp:~saviq/unity8/qt-renames-no-dee
Merge into: lp:unity8
Prerequisite: lp:~saviq/unity8/split-common
Diff against target: 56 lines (+5/-7)
2 files modified
build (+1/-2)
debian/control (+4/-5)
To merge this branch: bzr merge lp:~saviq/unity8/qt-renames-no-dee
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
Timo Jyrinki Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+217444@code.launchpad.net

This proposal supersedes a proposal from 2014-04-28.

Commit message

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

Description of the change

 * 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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in debian/control
1 conflicts encountered.

review: Needs Fixing
lp:~saviq/unity8/qt-renames-no-dee updated
858. By Michał Sawicz

Merge trunk.

Revision history for this message
Michał Sawicz (saviq) wrote :

Merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 updated
859. By Michał Sawicz

Undo qtmultimedia rename, not there yet.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

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

review: Approve
Revision history for this message
Albert Astals Cid (aacid) wrote :

 * 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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'build'
--- build 2014-04-02 12:08:51 +0000
+++ build 2014-04-30 10:42:12 +0000
@@ -43,13 +43,12 @@
43 gsettings-desktop-schemas \43 gsettings-desktop-schemas \
44 gsettings-ubuntu-schemas \44 gsettings-ubuntu-schemas \
45 qmenumodel-qml \45 qmenumodel-qml \
46 qtdeclarative5-dee-plugin \46 qml-module-qtquick-xmllistmodel \
47 qtdeclarative5-gsettings1.0 \47 qtdeclarative5-gsettings1.0 \
48 qtdeclarative5-ubuntu-ui-toolkit-plugin \48 qtdeclarative5-ubuntu-ui-toolkit-plugin \
49 qtdeclarative5-ubuntu-settings-components \49 qtdeclarative5-ubuntu-settings-components \
50 qtdeclarative5-ubuntu-thumbnailer0.1 \50 qtdeclarative5-ubuntu-thumbnailer0.1 \
51 unity-notifications-impl \51 unity-notifications-impl \
52 qtdeclarative5-xmllistmodel-plugin \
53 ubuntu-mobile-icons \52 ubuntu-mobile-icons \
54 unity-scope-home \53 unity-scope-home \
55 unity-lens-applications \54 unity-lens-applications \
5655
=== 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 @@
26 python3-all:any,26 python3-all:any,
27 python3-setuptools,27 python3-setuptools,
28 python:any (>= 2.7),28 python:any (>= 2.7),
29 qml-module-qtquick-xmllistmodel,
30 qml-module-qtquick2,
31 qml-module-qttest,
29 qt5-default,32 qt5-default,
30 qtbase5-dev,33 qtbase5-dev,
31 qtbase5-dev-tools,34 qtbase5-dev-tools,
@@ -34,11 +37,8 @@
34 qtdeclarative5-dev-tools,37 qtdeclarative5-dev-tools,
35 qtdeclarative5-private-dev,38 qtdeclarative5-private-dev,
36 qtdeclarative5-qtmultimedia-plugin,39 qtdeclarative5-qtmultimedia-plugin,
37 qtdeclarative5-qtquick2-plugin,
38 qtdeclarative5-test-plugin,
39 qtdeclarative5-ubuntu-settings-components,40 qtdeclarative5-ubuntu-settings-components,
40 qtdeclarative5-ubuntu-ui-toolkit-plugin,41 qtdeclarative5-ubuntu-ui-toolkit-plugin,
41 qtdeclarative5-xmllistmodel-plugin,
42 ttf-ubuntu-font-family,42 ttf-ubuntu-font-family,
43Standards-Version: 3.9.443Standards-Version: 3.9.4
44Homepage: http://launchpad.net/unity44Homepage: http://launchpad.net/unity
@@ -76,10 +76,9 @@
76 libglib2.0-bin,76 libglib2.0-bin,
77 libunity-mir1 (>= 0.4),77 libunity-mir1 (>= 0.4),
78 qmenumodel-qml (>= 0.2.7),78 qmenumodel-qml (>= 0.2.7),
79 qtdeclarative5-dee-plugin,79 qml-module-qtquick-xmllistmodel,
80 qtdeclarative5-gsettings1.0,80 qtdeclarative5-gsettings1.0,
81 qtdeclarative5-ubuntu-settings-components,81 qtdeclarative5-ubuntu-settings-components,
82 qtdeclarative5-xmllistmodel-plugin,
83 unity-launcher-impl-3,82 unity-launcher-impl-3,
84 unity8-common (= ${source:Version}),83 unity8-common (= ${source:Version}),
85 unity8-private (= ${binary:Version}),84 unity8-private (= ${binary:Version}),

Subscribers

People subscribed via source and target branches