Merge lp:~saviq/unity8/packaging-and-cleanup into lp:unity8

[Michał Sawicz]

Add ubuntu-settings-components to build script.
Revert workaround for bug #1268578, got fixed upstream.
Drop GenericName from unity8.desktop.

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

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes. Only tooling/packaging changes, not affecting functionality.

 * 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:618
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~saviq/unity8/packaging-and-cleanup/+merge/203829/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/2162/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2721
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2487/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1035
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/684
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/686
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/686/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/684
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2382
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2723
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2723/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2488
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2488/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4924/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3453

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

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, tested build dependency install. Tested create_interactive_notification script still works

 * Did CI run pass? If not, please explain why.
FAILED unity8.shell.tests.test_system_integration.SystemIntegrationTests.test_networkmanager_integration
Not related to these tests changes.

review: Approve

[Sebastien Bacher (seb128)]

looks good, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:618
http://jenkins.qa.ubuntu.com/job/unity8-ci/2189/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1062
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/711
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/713
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/713/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/711
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2793
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2793/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2547
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2547/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4974
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3511

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

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Also saucy has the needed qtdeclarative5-private-dev change in SDK Release PPA:

https://launchpadlibrarian.net/159906274/qtdeclarative-opensource-src_5.0.2-6ubuntu4_5.0.2-6ubuntu5~saucy1~test1.diff.gz

[lp:~saviq/unity8/packaging-and-cleanup]

619. By Michał Sawicz on 2014-01-31

No need for v8 in the end - assume SDK release PPA.

[Timo Jyrinki (timo-jyrinki)]

Thanks. Now it should be fine (just the original qtdeclarative5-private-dev build dependency). SDK PPA has the update qtdeclarative for all past Ubuntu versions.

I adjusted the commit message removing the V8 note.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:619
http://jenkins.qa.ubuntu.com/job/unity8-ci/2192/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2795
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2550
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1065
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/714
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/716
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/716/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/714
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2445
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2797
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2797/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2551
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2551/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4978
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3515

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

review: Needs Fixing (continuous-integration)

=== modified file 'build'
--- build	2013-11-22 10:24:22 +0000
+++ build	2014-01-31 10:30:52 +0000
@@ -45,6 +45,7 @@
                          qtdeclarative5-dee-plugin \
                          qtdeclarative5-gsettings1.0 \
                          qtdeclarative5-ubuntu-ui-toolkit-plugin \
+                         qtdeclarative5-ubuntu-settings-components \
                          unity-notifications-impl \
                          qtdeclarative5-xmllistmodel-plugin \
                          ubuntu-mobile-icons \

=== modified file 'data/unity8.desktop.in'
--- data/unity8.desktop.in	2013-12-17 14:37:33 +0000
+++ data/unity8.desktop.in	2014-01-31 10:30:52 +0000
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Type=Application
 Name=Unity 8
-GenericName=unity8
 Comment=The converged Unity shell
 Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8
 Terminal=false

=== modified file 'tests/autopilot/unity8/shell/emulators/create_interactive_notification.py'
--- tests/autopilot/unity8/shell/emulators/create_interactive_notification.py	2014-01-13 14:25:33 +0000
+++ tests/autopilot/unity8/shell/emulators/create_interactive_notification.py	2014-01-31 10:30:52 +0000
@@ -87,7 +87,7 @@
             action_id,
             action_label,
             action_callback,
-            (None, ),
+            None,
             None
         )