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

[Gabor Kelemen]

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== removed file 'debian/patches/01_ubuntu_desktop'
--- debian/patches/01_ubuntu_desktop	2010-07-06 16:02:22 +0000
+++ debian/patches/01_ubuntu_desktop	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
---- a/bus/ibus.desktop.in
-+++ b/bus/ibus.desktop.in
-@@ -3,6 +3,7 @@
- _Name=IBus
- _GenericName=Input Method Framework
- _Comment=Start IBus Input Method Framework
-+X-Ubuntu-Gettext-Domain=ibus
- Exec=ibus-daemon --xim
- Icon=ibus
- Terminal=false
---- a/setup/ibus-setup.desktop.in
-+++ b/setup/ibus-setup.desktop.in
-@@ -2,6 +2,7 @@
- Encoding=UTF-8
- _Name=IBus Preferences
- _Comment=Set IBus Preferences
-+X-Ubuntu-Gettext-Domain=ibus
- Exec=ibus-setup
- Icon=ibus-setup
- Terminal=false
 
=== modified file 'debian/patches/02_title_update.patch'
--- debian/patches/02_title_update.patch	2010-08-13 13:48:19 +0000
+++ debian/patches/02_title_update.patch	2012-01-06 13:54:05 +0000
@@ -15,9 +15,9 @@
 -_Comment=Set IBus Preferences
 +_Name=Keyboard Input Methods
 +_Comment=Adjust methods for keyboard input.
- X-Ubuntu-Gettext-Domain=ibus
  Exec=ibus-setup
  Icon=ibus-setup
+ Terminal=false
 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
 --- ibus-1.2.0.20091215~/setup/main.py	2009-12-04 08:55:50.000000000 +0100
 +++ ibus-1.2.0.20091215/setup/main.py	2010-08-04 18:14:41.000000000 +0200
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-12-19 20:33:54 +0000
+++ debian/patches/series	2012-01-06 13:54:05 +0000
@@ -1,4 +1,3 @@
-01_ubuntu_desktop
 02_title_update.patch
 05_appindicator.patch
 proper-gtk-plugin-path.patch