Merge lp:~kelemeng/ibus/bug907322 into lp:ubuntu/precise/ibus

Proposed by Gabor Kelemen
Status: Merged
Merged at revision: 47
Proposed branch: lp:~kelemeng/ibus/bug907322
Merge into: lp:ubuntu/precise/ibus
Diff against target: 48 lines (+1/-22)
3 files modified
debian/patches/01_ubuntu_desktop (+0/-20)
debian/patches/02_title_update.patch (+1/-1)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~kelemeng/ibus/bug907322
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+87754@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'debian/patches/01_ubuntu_desktop'
2--- debian/patches/01_ubuntu_desktop 2010-07-06 16:02:22 +0000
3+++ debian/patches/01_ubuntu_desktop 1970-01-01 00:00:00 +0000
4@@ -1,20 +0,0 @@
5---- a/bus/ibus.desktop.in
6-+++ b/bus/ibus.desktop.in
7-@@ -3,6 +3,7 @@
8- _Name=IBus
9- _GenericName=Input Method Framework
10- _Comment=Start IBus Input Method Framework
11-+X-Ubuntu-Gettext-Domain=ibus
12- Exec=ibus-daemon --xim
13- Icon=ibus
14- Terminal=false
15---- a/setup/ibus-setup.desktop.in
16-+++ b/setup/ibus-setup.desktop.in
17-@@ -2,6 +2,7 @@
18- Encoding=UTF-8
19- _Name=IBus Preferences
20- _Comment=Set IBus Preferences
21-+X-Ubuntu-Gettext-Domain=ibus
22- Exec=ibus-setup
23- Icon=ibus-setup
24- Terminal=false
25
26=== modified file 'debian/patches/02_title_update.patch'
27--- debian/patches/02_title_update.patch 2010-08-13 13:48:19 +0000
28+++ debian/patches/02_title_update.patch 2012-01-06 13:54:05 +0000
29@@ -15,9 +15,9 @@
30 -_Comment=Set IBus Preferences
31 +_Name=Keyboard Input Methods
32 +_Comment=Adjust methods for keyboard input.
33- X-Ubuntu-Gettext-Domain=ibus
34 Exec=ibus-setup
35 Icon=ibus-setup
36+ Terminal=false
37 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ibus-1.2.0.20091215~/setup/main.py ibus-1.2.0.20091215/setup/main.py
38 --- ibus-1.2.0.20091215~/setup/main.py 2009-12-04 08:55:50.000000000 +0100
39 +++ ibus-1.2.0.20091215/setup/main.py 2010-08-04 18:14:41.000000000 +0200
40
41=== modified file 'debian/patches/series'
42--- debian/patches/series 2011-12-19 20:33:54 +0000
43+++ debian/patches/series 2012-01-06 13:54:05 +0000
44@@ -1,4 +1,3 @@
45-01_ubuntu_desktop
46 02_title_update.patch
47 05_appindicator.patch
48 proper-gtk-plugin-path.patch

Subscribers

People subscribed via source and target branches

to all changes: