Unity 8

Merge lp:~didrocks/unity8/suru-switch into lp:unity8

  1. suru-switch
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Superseded
Proposed branch: lp:~didrocks/unity8/suru-switch
Merge into: lp:unity8
Diff against target: 51 lines (+4/-4)
4 files modified
build (+1/-1)
cmake/modules/autopilot.cmake (+1/-1)
include/paths.h.in (+1/-1)
run (+1/-1)
To merge this branch: bzr merge lp:~didrocks/unity8/suru-switch
Reviewer Review Type Date Requested Status
Michał Sawicz Needs Fixing
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+206907@code.launchpad.net

This proposal has been superseded by a proposal from 2014-02-24.

Commit message

switch the default theme to suru

Description of the change

switch the default theme to suru.

This will go with the silo containing the new theme.

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

FAILED: Continuous integration, rev:719
http://jenkins.qa.ubuntu.com/job/unity8-ci/2336/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2947
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/857
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/861
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/861/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/857
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2886
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3282
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3282/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2949
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2949/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5351
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4034

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Please follow https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8

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

.bzr/branches/origin/trunk/cmake/modules/autopilot.cmake: COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks autopilot run ${TEST_SUITE}
.bzr/branches/origin/trunk/include/paths.h.in: ubuntuIconTheme = "ubuntu-mobile";
.bzr/branches/origin/trunk/build: ubuntu-mobile-icons \
.bzr/branches/origin/trunk/run: export UBUNTU_ICON_THEME=ubuntu-mobile

Still some things to update here.

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

Jeez ignore me please.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build'
2--- build 2014-01-29 19:12:48 +0000
3+++ build 2014-02-18 11:45:29 +0000
4@@ -48,7 +48,7 @@
5 qtdeclarative5-ubuntu-settings-components \
6 unity-notifications-impl \
7 qtdeclarative5-xmllistmodel-plugin \
8- ubuntu-mobile-icons \
9+ suru-icon-theme \
10 unity-scope-home \
11 unity-lens-applications \
12 unity-plugin-scopes \
13
14=== modified file 'cmake/modules/autopilot.cmake'
15--- cmake/modules/autopilot.cmake 2014-01-09 10:53:29 +0000
16+++ cmake/modules/autopilot.cmake 2014-02-18 11:45:29 +0000
17@@ -2,7 +2,7 @@
18
19 function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
20 add_custom_target(autopilot-${TEST_NAME}
21- COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks autopilot run ${TEST_SUITE}
22+ COMMAND LANG=C UBUNTU_ICON_THEME=suru QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks autopilot run ${TEST_SUITE}
23 WORKING_DIRECTORY ${WORKING_DIR}
24 DEPENDS fake_install
25 )
26
27=== modified file 'include/paths.h.in'
28--- include/paths.h.in 2013-12-17 16:04:47 +0000
29+++ include/paths.h.in 2014-02-18 11:45:29 +0000
30@@ -120,7 +120,7 @@
31 inline void resolveIconTheme() {
32 const char *ubuntuIconTheme = getenv("UBUNTU_ICON_THEME");
33 if (ubuntuIconTheme == NULL) {
34- ubuntuIconTheme = "ubuntu-mobile";
35+ ubuntuIconTheme = "suru";
36 }
37 QIcon::setThemeName(ubuntuIconTheme);
38 }
39
40=== modified file 'run'
41--- run 2013-12-17 14:56:25 +0000
42+++ run 2014-02-18 11:45:29 +0000
43@@ -60,7 +60,7 @@
44 # Force icon theme if running on the desktop, otherwise gnome theme (if running
45 # on Ubuntu Desktop) will be used and icons won't be found
46 if [ -n "$DESKTOP_SESSION" ]; then
47- export UBUNTU_ICON_THEME=ubuntu-mobile
48+ export UBUNTU_ICON_THEME=suru
49 fi
50
51 QML_PHONE_SHELL_ARGS=""

Subscribers

People subscribed via source and target branches