-
Committer:
Package Import Robot
-
Author(s):
Martin Pitt
-
Date:
2012-03-06 09:45:51 UTC
-
mfrom:
(6.2.20 sid)
-
Revision ID:
package-import@ubuntu.com-20120306094551-2oj8nro3h3uesu8a
Tags: 1.4.1-1ubuntu1
* Merge from Debian unstable, 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.