lp:~ubuntu-branches/ubuntu/oneiric/ibus/oneiric-201108121834

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/oneiric/ibus

Colin Watson: Disapprove on 2011-09-07

Diff: 51 lines (+1/-25) (has conflicts)

4 files modified

.pc/.version (+0/-1)
.pc/01_ubuntu_desktop/bus/ibus.desktop.in (+0/-14)
.pc/01_ubuntu_desktop/setup/ibus-setup.desktop.in (+0/-10)
debian/ibus-gtk3.install (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

35. By Barry Warsaw on 2011-08-11

* 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.
* New upstream release
* Fix "Switch to dh_python2" (Closes: #635023)
* Use dh in debian/rules

34. By Barry Warsaw on 2011-07-21

Switch to dh_python2. (LP: 788514)

33. By Martin Pitt on 2011-07-11

releasing version 1.3.9-2ubuntu1

32. By Martin Pitt on 2011-07-11

merge with Debian

31. By Sebastien Bacher on 2011-05-23

* Resynchronize on Debian
* debian/control:
  - recommends python-appindicator.
  - re-order recommends on ibus to install im-switch by default.
* debian/README.source
  - Removed, it was outdated and no longer correct
* debian/patches/02_title_update.patch:
  - rename "IBus Preferences" to "Keyboard Input Methods"
* debian/patches/05_appindicator.patch:
  - use an indicator rather than a notification icon
* debian/patches/06_locale_parser.patch:
  - cherry-picked from upstream

30. By Stéphane Graber on 2011-03-04

releasing version 1.3.9-0ubuntu3

29. By Nobuto Murata on 2011-02-19

* debian/patches/06_locale_parser.patch:
  - cherry-picked from upstream
  - use LC_CTYPE instead of LC_ALL in
    bus_ibus_impl_set_default_preload_engines (LP: #716314)

28. By Michael Terry on 2011-01-07

* New upstream release
* debian/patches/05_appindicator.patch:
  - Refresh to apply

27. By Sebastien Bacher on 2010-11-17

* Resynchronize on Debian
* debian/control:
  - recommends python-appindicator.
* debian/README.source
  - Removed, it was outdated and no longer correct
* debian/patches/02_title_update.patch:
  - rename "IBus Preferences" to "Keyboard Input Methods"
* debian/patches/05_appindicator.patch:
  - use an indicator rather than a notification icon
* debian/patches/06_show_menuitem.patch:
  - dropped this Ubuntu patch since the bug seems to indicate the issue is
    solved in the new upstream versions, reopen a bug if that's not the case

26. By Ken VanDine on 2010-11-16

Version bump for natty upload