summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-12-10 14:29:22 +0000
committerThierry Vignaud <tv@mandriva.org>2009-12-10 14:29:22 +0000
commit4a69902599b171e27e93cedd80d6496e0509d477 (patch)
tree195a499dfad18e67ba3d574a9f41300969a97640 /perl-install
parentd9aa0db843c3703c150c8e32991ded7735c33f3c (diff)
downloaddrakx-4a69902599b171e27e93cedd80d6496e0509d477.tar
drakx-4a69902599b171e27e93cedd80d6496e0509d477.tar.gz
drakx-4a69902599b171e27e93cedd80d6496e0509d477.tar.bz2
drakx-4a69902599b171e27e93cedd80d6496e0509d477.tar.xz
drakx-4a69902599b171e27e93cedd80d6496e0509d477.zip
install ibus-qt4 if configuring ibus under KDE4 (#56311)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/lang.pm2
3 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c7f3b9e47..26d05c2ab 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,7 @@
- localedrake
o drop support for configuring KDE3
o fix configuring ibus (#56130)
+ o install 'ibus-qt4' if configuring ibus under KDE4 (#56311)
Version 13.0 - 1 December 2009
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 827912fea..ba19af620 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,7 @@
- locale setting
o drop support for configuring KDE3
o fix configuring ibus (#56130)
+ o install 'ibus-qt4' if configuring ibus under KDE4 (#56311)
- partitioning wizard:
o fix setting volume label instead of MBR's one for FAT fses (#52853)
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index cdb774c84..be1b8784d 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -677,7 +677,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) },