summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2011-05-28 23:07:05 +0000
committerOlivier Blin <blino@mageia.org>2011-05-28 23:07:05 +0000
commitc13746bef871d58b273677fccdda6aa4523ad238 (patch)
tree075f9188e5bbb56f18b0626856c9fcb0d15e988a
parent2b391c5db25c7fc933add5e9be4f721f7059b4b0 (diff)
downloaddraklive-config-c13746bef871d58b273677fccdda6aa4523ad238.tar
draklive-config-c13746bef871d58b273677fccdda6aa4523ad238.tar.gz
draklive-config-c13746bef871d58b273677fccdda6aa4523ad238.tar.bz2
draklive-config-c13746bef871d58b273677fccdda6aa4523ad238.tar.xz
draklive-config-c13746bef871d58b273677fccdda6aa4523ad238.zip
do not skip en_GB packages for int or europe images
-rw-r--r--config/auto_inst.cfg.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 34b87d9..b827ad6 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -85,7 +85,6 @@ $o = {
'kerry',
'kdebase4-workspace-googlegadgets',
'nepomuk-scribo', 'soprano-plugin-virtuoso',
- 'kde-l10n-en_GB', 'firefox-en_GB',
if_($ENV{DRAKLIVE_LANGS} !~ /\bpt\b/ && $ENV{DRAKLIVE_REGION} ne 'all',
#- do not install pt translations if only pt_BR is explicitely selected
'kde-l10n-pt', 'firefox-pt_PT', 'libreoffice-langpack-pt_PT', 'myspell-pt_PT',
@@ -95,6 +94,9 @@ $o = {
#- (the br package require locales-fr so it is auto-selected if fr is available)
'libreoffice-langpack-br',
),
+ if_($ENV{DRAKLIVE_REGION} !~ /\b(int|europe\d*)\b/,
+ 'kde-l10n-en_GB', 'firefox-en_GB',
+ ),
if_($ENV{DRAKLIVE_PRODUCT} !~ /liveusb-rw/i, 'task-printing-scanning'),
'qtradio', 'kradio',
'system-config-printer',