summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-12-10 14:29:20 +0000
committerThierry Vignaud <tv@mandriva.org>2009-12-10 14:29:20 +0000
commitd9aa0db843c3703c150c8e32991ded7735c33f3c (patch)
tree8f6ae8aff13d04f9020f441ee4bbbeca9cddd218
parent02a2ae320fcfd69b562974ddfec209bb891a5606 (diff)
downloaddrakx-backup-do-not-use-d9aa0db843c3703c150c8e32991ded7735c33f3c.tar
drakx-backup-do-not-use-d9aa0db843c3703c150c8e32991ded7735c33f3c.tar.gz
drakx-backup-do-not-use-d9aa0db843c3703c150c8e32991ded7735c33f3c.tar.bz2
drakx-backup-do-not-use-d9aa0db843c3703c150c8e32991ded7735c33f3c.tar.xz
drakx-backup-do-not-use-d9aa0db843c3703c150c8e32991ded7735c33f3c.zip
drop support for configuring KDE3
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/lang.pm11
3 files changed, 6 insertions, 7 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 2509833c0..c7f3b9e47 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
- diskdrake
o fix setting volume label instead of MBR's one for FAT fses (#52853)
- localedrake
+ o drop support for configuring KDE3
o fix configuring ibus (#56130)
Version 13.0 - 1 December 2009
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 63bff51a1..827912fea 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- fix crash introduced by 'do not stay chdired in /mnt/var/cache/urpmi'
- locale setting
+ o drop support for configuring KDE3
o fix configuring ibus (#56130)
- 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 0f3e5ccb4..cdb774c84 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -571,7 +571,7 @@ my @IM_i18n_fields = (
#- XIM server; or a Qt plugin if exists)
);
-my ($is_kde3, $is_kde4);
+my ($is_kde4);
# keep the 'packages' field in sync with share/rpmsrate:
my %IM_config =
@@ -603,7 +603,7 @@ my %IM_config =
XMODIFIERS => '@im=gcin',
langs => 'zh',
packages => {
- common => sub { if_($is_kde3, 'gcin-qt3'), if_($is_kde4, 'gcin-qt4') },
+ common => sub { if_($is_kde4, 'gcin-qt4') },
generic => sub { qw(gcin) },
},
},
@@ -645,7 +645,6 @@ my %IM_config =
XIM_PROGRAM => 'scim -d',
XMODIFIERS => '@im=SCIM',
packages => {
- common => sub { if_($is_kde3, 'scim-qtimm') },
generic => sub { qw(scim-m17n scim-tables) },
am => sub { qw(scim-tables) },
ja => sub { qw(scim-anthy scim-input-pad scim-tomoe) },
@@ -662,7 +661,7 @@ my %IM_config =
XMODIFIERS => '@im=SCIM',
default_for_lang => 'am ja ko th vi zh_CN zh_TW',
packages => {
- common => sub { if_($is_kde3, 'scim-bridge-qt3'), if_($is_kde4, 'scim-bridge-qt4') },
+ common => sub { if_($is_kde4, 'scim-bridge-qt4') },
generic => sub { qw(scim-m17n scim-tables) },
am => sub { qw(scim-tables) },
ja => sub { qw(scim-anthy scim-input-pad scim-tomoe) },
@@ -689,7 +688,6 @@ my %IM_config =
XIM_PROGRAM => 'skim -d',
XMODIFIERS => '@im=SCIM',
packages => {
- common => sub { if_($is_kde3, 'scim-qtimm') },
generic => sub { qw(skim-scim-tables scim-m17n) },
am => sub { qw(skim-scim-tables) },
ja => sub { qw(skim-scim-anthy scim-input-pad scim-tomoe) },
@@ -706,7 +704,7 @@ my %IM_config =
XMODIFIERS => '@im=uim',
langs => 'ja',
packages => {
- common => sub { if_($is_kde3, 'uim-qtimmodule'), if_($is_kde4, 'uim-qt4immodule') },
+ common => sub { if_($is_kde4, 'uim-qt4immodule') },
generic => sub { qw(uim-gtk uim) },
},
},
@@ -773,7 +771,6 @@ sub IM2packages {
if ($locale->{IM}) {
require any;
my @sessions = any::sessions();
- $is_kde3 = member('KDE', @sessions);
$is_kde4 = member('KDE4', @sessions);
my $per_lang = $IM_config{$locale->{IM}}{packages} || {};
my $main_lang = analyse_locale_name($locale->{lang})->{main};