diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-12-10 16:26:12 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-12-10 16:26:12 +0000 |
| commit | 080924207334f49e63c32e04546d8c4aa96413ad (patch) | |
| tree | 273afdb8489abc1f4d54094c49c780eb8cfc6ae9 | |
| parent | c82ffcb52f1b754355a0111f822112f0fe2d8d86 (diff) | |
| download | drakx-080924207334f49e63c32e04546d8c4aa96413ad.tar drakx-080924207334f49e63c32e04546d8c4aa96413ad.tar.gz drakx-080924207334f49e63c32e04546d8c4aa96413ad.tar.bz2 drakx-080924207334f49e63c32e04546d8c4aa96413ad.tar.xz drakx-080924207334f49e63c32e04546d8c4aa96413ad.zip | |
install ibus-qt4 if configuring ibus under KDE4 (#56311)
(backported from trunk)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/lang.pm | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index f50730652..7dad4a334 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -14,6 +14,7 @@ Version 12.77.1 - 18 November 2009 now has a HTML "close" button again - localedrake o fix configuring ibus (#56130) + o install 'ibus-qt4' if configuring ibus under KDE4 (#56311) - partitioning wizard: o only display Help button in install diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 44ee3e65d..34b3f123b 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,7 @@ - do not offer to upgrade/install in restore mode - locale settings o fix configuring ibus (#56130) + o install 'ibus-qt4' if configuring ibus under KDE4 (#56311) Version 12.77 - 30 October 2009 diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 0f3e5ccb4..a60ece802 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -678,7 +678,7 @@ my %IM_config = XIM_PROGRAM => 'ibus-daemon -d -x', XMODIFIERS => '@im=ibus', packages => { - generic => sub { qw(ibus-table ibus-m17n) }, + generic => sub { qw(ibus-table ibus-m17n), if_($is_kde4, 'ibus-qt4') }, ja => sub { qw(ibus-anthy) }, zh => sub { qw(ibus-pinyin ibus-chewing) }, ko => sub { qw(ibus-hangul) }, |