Merge lp:~attente/ubuntu/saucy/ibus-anthy/move-typelib into lp:ubuntu/saucy/ibus-anthy

[William Hua]

ibus-engine-anthy doesn't run properly due to the Anthy-9000.typelib being installed in the wrong directory. This fixes it, as well as forces the regeneration of engine/_config.py so that it doesn't point to /usr/local.

ibus-engine-anthy doesn't run properly due to the Anthy-9000.typelib being installed in the wrong directory. This fixes it, as well as forces the regeneration of engine/_config.py so that it doesn't point to /usr/local.

[Brandon Schaefer (brandontschaefer)]

LGTM. Confirmed this if fixing the issue of not being able to use ibus-anthy!

review: Approve

[Jeremy Bícha (jbicha)]

Alternatively, you could use dh-autoreconf to regenerate all the files like _config.py (because if that file is broken, who knows if another file is too?). I verified that all the 1.3, 1.4, and 1.5 series tarballs have this problem.

Unmerged revisions

20. By William Hua on 2013-08-02

* debian/rules:
  - Move typelibs directory and force regeneration of
    engine/_config.py.

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-14 01:01:12 +0000
+++ debian/changelog	2013-08-02 23:43:28 +0000
@@ -1,3 +1,11 @@
+ibus-anthy (1.5.3-1ubuntu1) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - Move typelibs directory and force regeneration of
+      engine/_config.py.
+
+ -- William Hua <[e-mail]>  Fri, 02 Aug 2013 19:32:54 -0400
+
 ibus-anthy (1.5.3-1) experimental; urgency=low
 
   [ Osamu Aoki ]
 
=== modified file 'debian/ibus-anthy.install'
--- debian/ibus-anthy.install	2013-07-14 01:01:12 +0000
+++ debian/ibus-anthy.install	2013-08-02 23:43:28 +0000
@@ -1,5 +1,5 @@
 usr/lib/*/*.so.*
-usr/lib/*/girepository-1.0/*
+usr/lib/girepository-1.0/*
 usr/lib/ibus/*
 usr/share/applications/*
 usr/share/ibus-anthy/*
 
=== modified file 'debian/rules'
--- debian/rules	2013-07-14 01:01:12 +0000
+++ debian/rules	2013-08-02 23:43:28 +0000
@@ -3,7 +3,8 @@
 	dh  $@ --with python2 --with autotools-dev
 
 override_dh_auto_configure:
-	dh_auto_configure -- --libexecdir=/usr/lib/ibus
+	-rm -f $(CURDIR)/engine/_config.py
+	dh_auto_configure -- --libexecdir=/usr/lib/ibus --with-anthygobject-typelibsdir=/usr/lib/girepository-1.0
 
 override_dh_python2:
 	dh_python2 --no-guessing-versions