Merge lp:~brunonova/ubuntu/trusty/ibus/lp1240198_2 into lp:ubuntu/trusty-proposed/ibus

Proposed by Bruno Nova
Status: Merged
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp:~brunonova/ubuntu/trusty/ibus/lp1240198_2
Merge into: lp:ubuntu/trusty-proposed/ibus
Diff against target: 8 lines (+1/-0)
1 file modified
debian/ibus.install (+1/-0)
To merge this branch: bzr merge lp:~brunonova/ubuntu/trusty/ibus/lp1240198_2
Reviewer Review Type Date Requested Status
Aron Xu Approve
Ubuntu Development Team Pending
Review via email: mp+278226@code.launchpad.net

Description of the change

The other merge request (https://code.launchpad.net/~brunonova/ubuntu/trusty/ibus/lp1240198/+merge/241742) was merged into trusty-proposed.
However, the commit in trusty-proposed is missing the change in debian/ibus.install for some reason, so it doesn't work.
This commit adds that change, which should fix the issue.

debian/changelog and other files weren't touched.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Aron: can you take a look at this?

Revision history for this message
Aron Xu (happyaron) wrote :

Yes this is correct!

review: Approve
Revision history for this message
Iain Lane (laney) wrote :

See my comments on the other MP

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/ibus.install'
2--- debian/ibus.install 2013-09-11 23:56:01 +0000
3+++ debian/ibus.install 2015-11-20 22:24:41 +0000
4@@ -9,3 +9,4 @@
5 usr/share/icons/*
6 usr/share/locale/*
7 usr/share/man/*
8+data/dconf/10_ibus.gschema.override usr/share/glib-2.0/schemas/

Subscribers

People subscribed via source and target branches

to all changes: