lp:~arnegoetje/ubuntu/maverick/ibus/merge-from-sid

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/maverick/ibus

Ubuntu branches: Pending requested 2010-08-06

Diff: 199228 lines api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #611224: Please merge ibus (1.3.7-1) from Debian Squeeze

Medium

Fix Released

Link a bug report

Related blueprints

27. By Arne Goetje on 2010-08-06

* Merge from Debian unstable (LP: #611224), remaining changes:
  - debian/control: Add python-appindicator recommends.
  - Patches (adjusted, to work with the new version):
    + 02_title_update.dpatch
    + 05_appindicator.dpatch
    + 06_show_menuitem.dpatch
* New upstream release.
* debian/control: bump standards version to 3.9.1.
* debian/libibus2.symbols: updated.
* debian/control: added im-config to Recommends (closes: #587269)
* New upstream release. (closes: #586976)
* debian/libibus2.symbols: updated.
* debian/patches/*: updated.
* debian/control: bump standards version to 3.9.0.
* debian/ibus.install: updated.
* debian/libibus-dev.install: updated.
* debian/control: replaces and breaks ibus (<< 1.3.6)
* New upstream release.
* debian/libibus2.symbols: updated.
* New upstream release.
* debian/libibus2.symbols: updated.
* New upstream release.
* New upstream release.
* debian/libibus2.symbols: updated.
* debian/control:
  - change maintainer to IME Packaging Team, add me to uploaders.
  - update Vcs-* fields.
* Fix "Please fix python-notify dependancy" (Closes: #577587)
  - debian/control: ibus depends on python-notify
* improve manpages (Closes: #562542)
  - debian/ibus.1 -> debian/ibus.7, and add setup information.
  - debian/ibus-daemon.1: updated.
  - debian/ibus-setup.1: updated.
  - debian/ibus-gconf.1, debian/ibus-ui-gtk.1, debian/ibus-x11.1: removed.
  - debian/ibus.manpages: updated.
* debian/source/format: 3.0.
  - remove dpatch, update debian/control, debian/rules, debian/patches
* New upstream release.
* New upstream release.
* debian/source/format: missing-debian-source-format
* debian/libibus2.symbols: updated.
* New upstream release.
* debian/control: bump standards version to 3.8.4.
* libibus1 -> libibus2 transition:
  - debian/control: updated
  - debian/libibus1.*: deleted
  - debian/libibus2.*: added
  - debian/rules: updated.

26. By Arne Goetje on 2010-08-06

Merging shared upstream rev into target branch.

25. By Arne Goetje on 2010-08-06

Merging shared upstream rev into target branch.

24. By Arne Goetje on 2010-08-06

Merging shared upstream rev into target branch.

23. By Arne Goetje on 2010-08-06

Merging shared upstream rev into target branch.

22. By Sebastien Bacher on 2010-08-04

* debian/patches/02_title_update.dpatch:
  - rename "IBus Preferences" to "Keyboard Input Methods",
    thanks Joel Auterson for the change (lp: #429986)

21. By Ikuya Awashiro on 2010-03-27

06_show_menuitem.dpatch: show languagebar correctry (LP: #533636)

20. By Jan Arne Petersen on 2010-03-05

05_appindicator.dpatch: Updated to show the default icon when there
is only an icon by absolute path provided by the selected input
method (lp: #528213)

19. By Sebastien Bacher on 2010-02-26

05_appindicator.dpatch: update from Jan Arne Petersen to fix the application
indicator menu not being displayed (lp: #528406)

18. By Martin Pitt on 2010-02-15

* Add 05_appindicator.dpatch: Add support for Application indicators. Patch
  by Jan Arne Petersen, thanks! (LP: #497878)
* debian/control: Add python-appindicator recommends.