summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-19 07:04:21 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-05-19 09:33:32 -0400
commit6b7e6ab840319495969ce616d7de59a472ab496f (patch)
tree2f9f312d912c8d537fa7c9f418d22bd55ec3ad8a
parent7dbb2f4624e9df80b2aec3ad476347d2ea37e0ef (diff)
downloaddrakx-6b7e6ab840319495969ce616d7de59a472ab496f.tar
drakx-6b7e6ab840319495969ce616d7de59a472ab496f.tar.gz
drakx-6b7e6ab840319495969ce616d7de59a472ab496f.tar.bz2
drakx-6b7e6ab840319495969ce616d7de59a472ab496f.tar.xz
drakx-6b7e6ab840319495969ce616d7de59a472ab496f.zip
don't try to install scim-googlepinyin (mga#6681)
it has never been imported in Mageia...
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/lang.pm4
3 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5ada56703..9c5508188 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -4,6 +4,8 @@
o fix crash (mga#13627)
o fix crash with --windows_import (mga9347)
o fix an error with --testing (mga#13363)
+- localedrake:
+ o don't try to install non existant scim-googlepinyin (mga#6681)
Version 16.97 - 18 May 2015
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 97f2a732f..ae7d7497a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- don't try to install non existant scim-googlepinyin (mga#6681)
+
Version 16.97 - 18 May 2015
(just to be sure draklive-install fix for mga15257 doesn't break anything)
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 57482ae67..f9ab88892 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -852,7 +852,7 @@ my %IM_config =
ko => sub { qw(scim-hangul) },
th => sub { qw(scim-thai) },
vi => sub { qw(scim-m17n) },
- zh => sub { qw(scim-googlepinyin scim-tables-zh scim-chewing) },
+ zh => sub { qw(scim-tables-zh scim-chewing) },
},
},
@@ -868,7 +868,7 @@ my %IM_config =
ko => sub { qw(scim-hangul) },
th => sub { qw(scim-thai) },
vi => sub { qw(scim-m17n) },
- zh => sub { qw(scim-googlepinyin scim-tables-zh scim-chewing) },
+ zh => sub { qw(scim-tables-zh scim-chewing) },
},
},
'ibus' => {