~ubuntu-branches/ubuntu/saucy/ibus/saucy

Viewing all changes in revision 52.

  • Committer: Package Import Robot
  • Author(s): AWASHIRO Ikuya
  • Date: 2012-07-30 17:01:16 UTC
  • mfrom: (6.2.26 sid)
  • Revision ID: package-import@ubuntu.com-20120730170116-70zbk2g13f78ru1h
Tags: 1.4.1-7ubuntu1
* Merge from Debian unstable (LP: #854333), remaining changes:
  - debian/control: Install im-switch instead of im-config by default.
  - debian/rules: Build with dh_translations. Add dh-translations build
    dependency.
  - Add 02_title_update.patch: Rename "IBus Preferences" to "Keyboard Input
    Methods"
  - Add 05_appindicator.patch: Use an indicator rather than a notification
    icon. Add python-appindicator recommends.
  - debian/control: Recommends on ibus-gtk, ibus-qt4, ibus-clutter need to
    be alternatives, because we want derivatives to be able to pick the ones
    they need.
  - add ibus-530711-preload-sys.patch: Set default IMEngine.
    Taken from Fedora:
    https://bugzilla.redhat.com/show_bug.cgi?id=530711

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: