« back to all changes in this revision
Viewing changes to docs/reference/ibus/tmpl/ibustypes.sgml
- Committer: Bazaar Package Importer
- Date: 2011-08-11 17:00:57 UTC
- mfrom: (6.2.14 sid)
- Revision ID: james.westby@ubuntu.com-20110811170057-6dmbfs4s3cchzl7x
* Merge with Debian unstable. Remaining Ubuntu changes:
- Indicator support:
+ Add 05_appindicator.patch: Use an indicator rather than a notification
icon.
+ debian/control: Recommend python-appindicator.
- debian/control: Install im-switch instead of im-config by default.
- debian/README.source: Removed, it was outdated and no longer correct
- debian/patches/01_ubuntu_desktop: Fix "Desktop entry needs the
X-Ubuntu-Gettext-Domain key" (LP: #457632)
- debian/patches/02_title_update.patch: Rename "IBus Preferences" to
"Keyboard Input Methods"
- debian/patches/06_locale_parser.patch: Cherry-picked from upstream.
- Indicator support:
+ Add 05_appindicator.patch: Use an indicator rather than a notification
icon.
+ debian/control: Recommend python-appindicator.
- debian/control: Install im-switch instead of im-config by default.
- debian/README.source: Removed, it was outdated and no longer correct
- debian/patches/01_ubuntu_desktop: Fix "Desktop entry needs the
X-Ubuntu-Gettext-Domain key" (LP: #457632)
- debian/patches/02_title_update.patch: Rename "IBus Preferences" to
"Keyboard Input Methods"
- debian/patches/06_locale_parser.patch: Cherry-picked from upstream.
- files added:
- bindings/vala/ibus-1.0.deps
- src/tests
- files removed:
- bus/test-client.c
- files modified:
- .pc/02_title_update.patch/setup/main.py
added
removed
docs/reference/ibus/tmpl/ibustypes.sgml
