Indicator keyboard

Merge lp://staging/~attente/indicator-keyboard/1291962 into lp://staging/indicator-keyboard

  1. 1291962
  2. Merge into trunk
Proposed by William Hua
Status: Rejected
Rejected by: William Hua
Proposed branch: lp://staging/~attente/indicator-keyboard/1291962
Merge into: lp://staging/indicator-keyboard
Diff against target: 705 lines (+281/-134)
11 files modified
.bzrignore (+3/-1)
data/Makefile.am (+2/-2)
debian/control (+1/-0)
lib/Makefile.am (+7/-5)
lib/ibus-menu.vala (+22/-23)
lib/ibus-panel.vala (+26/-0)
lib/indicator-menu.vala (+128/-0)
lib/main.vala (+85/-98)
po/POTFILES.in (+1/-0)
po/POTFILES.skip (+1/-0)
po/indicator-keyboard.pot (+5/-5)
To merge this branch: bzr merge lp://staging/~attente/indicator-keyboard/1291962
Reviewer Review Type Date Requested Status
Ted Gould (community) Needs Information
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+212967@code.staging.launchpad.net

Commit message

Export separate menus for desktop and greeter.

Description of the change

Export separate menus for desktop and greeter.

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

PASSED: Continuous integration, rev:319
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/20/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-ci/53/rebuild

review: Approve (continuous-integration)
lp://staging/~attente/indicator-keyboard/1291962 updated
320. By William Hua

Merge 1290881.

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

PASSED: Continuous integration, rev:320
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/21/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-ci/54/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) wrote :

I think that this is wrong:

+Breaks: ibus (<< 1.5.5-1ubuntu3),

Will Ibus be broken or do we need a version of Ibus newer than that?

review: Needs Information
Revision history for this message
William Hua (attente) wrote :

IBus won't be broken, but we want to prevent this version of indicator-keyboard to be unpacked if the IBus on the user's system doesn't have the patch introduced by 1.5.5-1ubuntu3. I think that's what the Breaks relationship does based on https://www.debian.org/doc/debian-policy/ch-relationships.html#s-breaks.

Revision history for this message
Sebastien Bacher (seb128) wrote :

The other branch your merged in r320 landed to trunk, you might want to redo those changes based on trunk to have a diff easier to read (seems like some of the current one is from the other changes). One way to avoid that issue is to list the vcs you are based on/include as a prerequire (needs to resubmit the change though)

Revision history for this message
William Hua (attente) wrote :

Ok, I can re-submit a new branch. I only merged those in because I expected there to be merge conflicts with those other branches.

Revision history for this message
William Hua (attente) wrote :

Re-submitted as https://code.launchpad.net/~attente/indicator-keyboard/1291962-2/+merge/213346.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: