Unity

Merge lp:~xnox/unity/drop-u1 into lp:unity

  1. drop-u1
  2. Merge into trunk
Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3755
Proposed branch: lp:~xnox/unity/drop-u1
Merge into: lp:unity
Diff against target: 25 lines (+0/-3)
2 files modified
com.canonical.Unity.gschema.xml (+0/-2)
debian/control (+0/-1)
To merge this branch: bzr merge lp:~xnox/unity/drop-u1
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Marco Trevisan (Treviño) Approve
Dimitri John Ledkov core-dev Approve
Review via email: mp+213851@code.launchpad.net

Commit message

Drop U1 default shortcuts & indicator-sync recommendation. (LP: #1300916)

Description of the change

Drop U1 default shortcuts & indicator-sync recommendation. (LP: #1300916)

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve (core-dev)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

:°(

Sadly approving...

review: Approve
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

I see unity got accepted into -proposed. Can this branch land, on it's own, today?

Revision history for this message
Charles Kerr (charlesk) wrote :

One addition, we should also remove the libsyncindicator.so reference from services/panel-service.c

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

FAILED: Continuous integration, rev:3749
http://jenkins.qa.ubuntu.com/job/unity-ci/845/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/381
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/377
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/379/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Tested from silo 5 in a live cd, ubuntuone control panel is correctly dropped / not present in the launcher.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'com.canonical.Unity.gschema.xml'
2--- com.canonical.Unity.gschema.xml 2014-03-21 01:11:02 +0000
3+++ com.canonical.Unity.gschema.xml 2014-04-02 14:17:25 +0000
4@@ -94,9 +94,7 @@
5 'application://libreoffice-calc.desktop',
6 'application://libreoffice-impress.desktop',
7 'application://ubuntu-software-center.desktop',
8- 'application://ubuntuone-installer.desktop',
9 'application://ubuntu-amazon-default.desktop',
10- 'application://UbuntuOneMusiconeubuntucom.desktop',
11 'application://unity-control-center.desktop',
12 'unity://running-apps',
13 'unity://expo-icon',
14
15=== modified file 'debian/control'
16--- debian/control 2014-03-09 20:15:33 +0000
17+++ debian/control 2014-04-02 14:17:25 +0000
18@@ -92,7 +92,6 @@
19 indicator-printers,
20 indicator-power,
21 indicator-session,
22- indicator-sync,
23 telepathy-indicator,
24 hud,
25 Breaks: unity-lens-applications (<< 5.12.0-0ubuntu2),