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

Proposed by William Hua
Status: Needs review
Proposed branch: lp:~attente/ubuntu/saucy/ibus-anthy/move-typelib
Merge into: lp:ubuntu/saucy/ibus-anthy
Diff against target: 40 lines (+11/-2)
3 files modified
debian/changelog (+8/-0)
debian/ibus-anthy.install (+1/-1)
debian/rules (+2/-1)
To merge this branch: bzr merge lp:~attente/ubuntu/saucy/ibus-anthy/move-typelib
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
Review via email: mp+178402@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

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

review: Approve
Revision history for this message
Jeremy Bicha (jbicha) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-07-14 01:01:12 +0000
3+++ debian/changelog 2013-08-02 23:43:28 +0000
4@@ -1,3 +1,11 @@
5+ibus-anthy (1.5.3-1ubuntu1) UNRELEASED; urgency=low
6+
7+ * debian/rules:
8+ - Move typelibs directory and force regeneration of
9+ engine/_config.py.
10+
11+ -- William Hua <william.hua@canonical.com> Fri, 02 Aug 2013 19:32:54 -0400
12+
13 ibus-anthy (1.5.3-1) experimental; urgency=low
14
15 [ Osamu Aoki ]
16
17=== modified file 'debian/ibus-anthy.install'
18--- debian/ibus-anthy.install 2013-07-14 01:01:12 +0000
19+++ debian/ibus-anthy.install 2013-08-02 23:43:28 +0000
20@@ -1,5 +1,5 @@
21 usr/lib/*/*.so.*
22-usr/lib/*/girepository-1.0/*
23+usr/lib/girepository-1.0/*
24 usr/lib/ibus/*
25 usr/share/applications/*
26 usr/share/ibus-anthy/*
27
28=== modified file 'debian/rules'
29--- debian/rules 2013-07-14 01:01:12 +0000
30+++ debian/rules 2013-08-02 23:43:28 +0000
31@@ -3,7 +3,8 @@
32 dh $@ --with python2 --with autotools-dev
33
34 override_dh_auto_configure:
35- dh_auto_configure -- --libexecdir=/usr/lib/ibus
36+ -rm -f $(CURDIR)/engine/_config.py
37+ dh_auto_configure -- --libexecdir=/usr/lib/ibus --with-anthygobject-typelibsdir=/usr/lib/girepository-1.0
38
39 override_dh_python2:
40 dh_python2 --no-guessing-versions

Subscribers

People subscribed via source and target branches

to all changes: