~ubuntu-branches/ubuntu/trusty/ibus/trusty-proposed

Viewing all changes in revision 40.

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha, Jeremy Bicha, William Hua
  • Date: 2013-07-28 19:27:13 UTC
  • mfrom: (1.5.1) (17.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130728192713-qg0wzsqj2qnng5m7
[ Jeremy Bicha ]
* Merge from Debian unstable. Remaining changes:
  - debian/control:
    + Recommend ibus-gtk | ibus-qt4, ibus-gtk3 | ibus-qt4 instead of
      recommending all of them
    + Suggest ibus-clutter instead of recommending it
    + Depend on dconf-cli instead of dconf-tools
  - debian/rules:
    + Build with dh_translations. Add dh-translations build dependency.
    + Use --disable-silent-rules
  - Add 02_title_update.patch: Rename "IBus Preferences" to "Keyboard Input
    Methods"
  - add ibus-530711-preload-sys.patch: Set default IMEngine.
  - debian/libibus-1.0-5.symbols: Add symbols for above patch
* New upstream release. Applied patches dropped:
  - the 0001 - 0017 backport patches
  - the format-security patches
* Dropped changes:
  - debian/patches/05_appindicator.patch and python-appindicator recommends:
    + For Saucy, we'll be using indicator-keyboard instead.

[ William Hua ]
* debian/patches/ibus-541492-xkb.patch:
  - Patch from Fedora, needed for the 530711 patch to apply cleanly
* debian/patches/ibus-530711-preload-sys.patch: Refreshed (from Fedora)
* debian/patches/disable-input-trigger.patch:
  - Prevent IBus from capturing input source key bindings.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: