ubuntu/+source/im-config:applied/ubuntu/trusty

Last commit made on 2014-03-29
Get this branch:
git clone -b applied/ubuntu/trusty https://git.launchpad.net/ubuntu/+source/im-config
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/trusty
Repository:
lp:ubuntu/+source/im-config

Recent commits

15f34b3... by Gunnar Hjalmarsson on 2014-03-27

Import patches-applied version 0.24-1ubuntu4 to applied/ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 9dfa0b2e75fbc77f1bb5dc4e0edf9d14789f4230
Unapplied parent: e800872592b2b005bb36f1cfff81f137bd36b2ce

New changelog entries:
  * debian/patches/01_fcitx-default-if-installed.patch,
    debian/im-config.user-session.upstart:
    Make fcitx the system default if installed (LP: #1297831).

e800872... by Gunnar Hjalmarsson on 2014-03-27

Make fcitx the system default if installed (for Ubuntu Kylin)

Gbp-Pq: 01_fcitx-default-if-installed.patch.

bc01d3d... by Gunnar Hjalmarsson on 2014-03-27

Import patches-unapplied version 0.24-1ubuntu4 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: f5387510e80e93c42ad31bf184befaae0fd09bbf

New changelog entries:
  * debian/patches/01_fcitx-default-if-installed.patch,
    debian/im-config.user-session.upstart:
    Make fcitx the system default if installed (LP: #1297831).

9dfa0b2... by Gunnar Hjalmarsson on 2014-01-23

Import patches-applied version 0.24-1ubuntu3 to applied/ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 0dc59c03d4e41f11c9cc25ecb0da65969ff35b92
Unapplied parent: f5387510e80e93c42ad31bf184befaae0fd09bbf

New changelog entries:
  * debian/im-config.user-session.upstart:
    Description corrected (LP: #1271667).

f538751... by Gunnar Hjalmarsson on 2014-01-23

Import patches-unapplied version 0.24-1ubuntu3 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: b8d74682d88320beac60a94f96408562663d5979

New changelog entries:
  * debian/im-config.user-session.upstart:
    Description corrected (LP: #1271667).

0dc59c0... by Harald Sitter on 2014-01-16

Import patches-applied version 0.24-1ubuntu2 to applied/ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: dc8805997b504da9cb3771816fb2e0cd3ec5b1ef
Unapplied parent: b8d74682d88320beac60a94f96408562663d5979

New changelog entries:
  * Alternative depends for zenity: kde-baseapps-bin (contains kdialog)

b8d7468... by Harald Sitter on 2014-01-16

Import patches-unapplied version 0.24-1ubuntu2 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 4647d023c7b120f3484700aeef1836b43f2e6924

New changelog entries:
  * Alternative depends for zenity: kde-baseapps-bin (contains kdialog)

dc88059... by Gunnar Hjalmarsson on 2014-01-10

Import patches-applied version 0.24-1ubuntu1 to applied/ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: d358f59a80f2262cacb1366cc38d573106004627
Unapplied parent: 4647d023c7b120f3484700aeef1836b43f2e6924

New changelog entries:
  * Dropped patches:
    - 01_modify_system_default.patch (no longer needed)
    - 02_list_installed_input_methods.patch (applied upstream)
    - 03_kdialog_support.path (applied upstream)
  * Merge with Debian unstable, remaining Ubuntu changes:
    - debian/im-config.user-session.upstart
    - debian/rules: Install upstart job script
    - debian/postinst: Additional condition to be met to edit
      80im-switch.
  * The new version includes a bunch of PO files (LP: #1225305).

4647d02... by Gunnar Hjalmarsson on 2014-01-10

Import patches-unapplied version 0.24-1ubuntu1 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 156fe793c03b5e39809c9a8f3cd14d8b81c576ff

New changelog entries:
  * Dropped patches:
    - 01_modify_system_default.patch (no longer needed)
    - 02_list_installed_input_methods.patch (applied upstream)
    - 03_kdialog_support.path (applied upstream)
  * Merge with Debian unstable, remaining Ubuntu changes:
    - debian/im-config.user-session.upstart
    - debian/rules: Install upstart job script
    - debian/postinst: Additional condition to be met to edit
      80im-switch.
  * The new version includes a bunch of PO files (LP: #1225305).

d358f59... by osamu on 2014-01-09

Import patches-applied version 0.24-1 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 35d3d35dfb8690c40acfc07c14c48dbe8fb82b74
Unapplied parent: 156fe793c03b5e39809c9a8f3cd14d8b81c576ff

New changelog entries:
  * Fix typos in manpage
  * Fix changelog 0.23-1. Closes: #724024, #724309
  * Use safe tmp file kde menu.
  * Add many PO files from Ubuntu translation site.