Merge lp:~smartboyhw/ubuntu/saucy/ibus-cangjie/fix-dependency-setup-maintainer-bugs into lp:ubuntu/saucy/ibus-cangjie

[Howard Chan]

This fixes a load of bugs existing in "ibus-cangjie" source package.

* Cherry-picked the patch a85d297bb395f38c4ec5022acc6d641a695b4ab4 for Make "Preferences" button work in "IBus Preferences" (LP: #1189083) as requested by upstream. Patch available at https://github.com/bochecha/ibus-cangjie/commit/a85d297bb395f38c4ec5022acc6d641a695b4ab4.patch

* Changed maintainer from Anthony Wong to Ubuntu Developers to fit Ubuntu packaging rules. (LP: #1167265)

* Added gir1.2-ibus-1.0 as a hard dependency of ibus-cangjie as users can't run the application
  without using it. (LP: #1189085)

[Andrew Starr-Bochicchio (andrewsomething)]

Looks good. Merged and uploaded.

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-14 02:55:52 +0000
+++ debian/changelog	2013-07-08 15:16:24 +0000
@@ -1,3 +1,14 @@
+ibus-cangjie (0.0.1~git20130325-0ubuntu2) UNRELEASED; urgency=low
+
+  * Fix maintainers field in debian/control to
+    Ubuntu Developers. (LP: #1167265)
+  * Add an dependency of gir1.2-ibus-1.0 (LP: #1189085)
+  * Cherry-pick patch setup: Declare the setup in the XML components
+    (upstream commit no.: a85d297bb395f38c4ec5022acc6d641a695b4ab4)
+    requested by upstream. (LP: #1189083)
+
+ -- Howard Chan <[e-mail]>  Mon, 08 Jul 2013 21:24:42 +0800
+
 ibus-cangjie (0.0.1~git20130325-0ubuntu1) raring; urgency=low
 
   * Initial release.

=== modified file 'debian/control'
--- debian/control	2013-03-14 02:55:52 +0000
+++ debian/control	2013-07-08 15:16:24 +0000
@@ -1,7 +1,7 @@
 Source: ibus-cangjie
 Section: utils
 Priority: optional
-Maintainer: Anthony Wong <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
                autotools-dev,
                intltool,
@@ -19,7 +19,8 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends},
          ibus (>= 1.4.1),
          python3-pycangjie,
-         python3-gi
+         python3-gi,
+         gir1.2-ibus-1.0
 Description: Cangjie and Quick input methods for IBus
  This is an IBus engine for users of the Cangjie and Quick input
  methods.

=== added directory 'debian/patches'
=== added file 'debian/patches/fix-ibus-preference-setup.patch'
--- debian/patches/fix-ibus-preference-setup.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ibus-preference-setup.patch	2013-07-08 15:16:24 +0000
@@ -0,0 +1,40 @@
+Description: setup: Declare the setup in the XML components
+ Tools like ibus-setup use this info to associate an engine with its 
+ setup dialog.
+Author: Mathieu Bridon <[e-mail]>
+Origin: upstream, https://github.com/bochecha/ibus-cangjie/commit/a85d297bb395f38c4ec5022acc6d641a695b4ab4.patch
+Bug: https://github.com/bochecha/ibus-cangjie/issues/24
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ibus-cangjie/+bug/1189083
+Last-Update: 2013-07-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -50,6 +50,7 @@
+ %.xml: %.xml.in
+ 	$(AM_V_GEN) \
+ 	( \
++		bindir=${bindir}; \
+ 		pkglibexecdir=${pkglibexecdir}; \
+ 		s=`cat $<`; \
+ 		eval "echo \"$${s}\""; \
+--- a/data/cangjie.xml.in.in
++++ b/data/cangjie.xml.in.in
+@@ -38,6 +38,7 @@
+       <symbol>倉頡</symbol>
+       <license>LGPLv3+</license>
+       <author>The IBus Cangjie authors</author>
++      <setup>${bindir}/ibus-setup-cangjie cangjie</setup>
+       <rank>0</rank>
+     </engine>
+   </engines>
+--- a/data/quick.xml.in.in
++++ b/data/quick.xml.in.in
+@@ -38,6 +38,7 @@
+       <symbol>速成</symbol>
+       <license>LGPLv3+</license>
+       <author>The IBus Cangjie authors</author>
++      <setup>${bindir}/ibus-setup-cangjie quick</setup>
+       <rank>0</rank>
+     </engine>
+   </engines>

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-07-08 15:16:24 +0000
@@ -0,0 +1,1 @@
+fix-ibus-preference-setup.patch