diff options
| author | Thomas Backlund <tmb@mageia.org> | 2012-04-12 18:41:26 +0000 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2012-04-12 18:41:26 +0000 |
| commit | b11f3e39f2c0c3da7d6e7b59aebf1a838e079847 (patch) | |
| tree | 1ac9e0bf0b1bf330c50f964bfa2dfb5e68160a5c | |
| parent | 1b37d9ea5d565785e14fc7605076fd6c5387137f (diff) | |
| download | draklive-config-b11f3e39f2c0c3da7d6e7b59aebf1a838e079847.tar draklive-config-b11f3e39f2c0c3da7d6e7b59aebf1a838e079847.tar.gz draklive-config-b11f3e39f2c0c3da7d6e7b59aebf1a838e079847.tar.bz2 draklive-config-b11f3e39f2c0c3da7d6e7b59aebf1a838e079847.tar.xz draklive-config-b11f3e39f2c0c3da7d6e7b59aebf1a838e079847.zip | |
mozilla-thunderbird is now thunderbird
| -rw-r--r-- | config/auto_inst.cfg.pl | 8 | ||||
| -rw-r--r-- | config/settings-livecd.cfg | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index ff73bdd..2100ccc 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -161,8 +161,8 @@ $o = { if_($has_kde4, 'ufraw-gimp'), if_($has_kde4, 'marble-common'), if_($has_kde4, 'p7zip'), - #if_($has_kde4, 'mozilla-thunderbird'), #- we have kmail - if_($has_gnome, 'mozilla-thunderbird', 'pan'), #- we have evolution + #if_($has_kde4, 'thunderbird'), #- we have kmail + if_($has_gnome, 'thunderbird', 'pan'), #- we have evolution #'aspell-ro', # lack of space :( arbitrary choice # since it's the biggest dict we have 'cpqarrayd', @@ -216,8 +216,8 @@ $o = { 'mozilla-firefox-ext-google-toolbar', 'filezilla', #- FIXME: bump to level 5 in rpmsrate? 'nut-server', - 'mozilla-thunderbird', - if_($ENV{DRAKLIVE_REGION} eq 'all', map { "mozilla-thunderbird-$_" } qw(ca cs de el es es_AR eu fi fr gu_IN he hu it ja ko nb nl pa_IN pl pt_BR ru sk sl sv tr zh_CN)), + 'thunderbird', + if_($ENV{DRAKLIVE_REGION} eq 'all', map { "thunderbird-$_" } qw(ca cs de el es es_AR eu fi fr gu_IN he hu it ja ko nb nl pa_IN pl pt_BR ru sk sl sv tr zh_CN)), if_($ENV{DRAKLIVE_PRODUCT} =~ /guadec/i, 'fonts-ttf-gurmukhi', 'cheese', diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg index 6b2dd7c..a9afbae 100644 --- a/config/settings-livecd.cfg +++ b/config/settings-livecd.cfg @@ -1,5 +1,5 @@ #repository=/distrib/mageia/distrib/cauldron -repository=/home/bcd/build_bcd/pieces/cauldron +repository=/mnt/data/Linux/Mageia/cauldron # updates_repository=/distrib/mageia/distrib/cauldron # updates_repository=/home/bcd/build_bcd/pieces/cauldron additional_repository= @@ -13,5 +13,5 @@ product=LiveCD version=2-beta3 commercial=0 default_user=live -builddir=/home/draklive/var-data/build -chroot=/home/draklive/var-data/chroot +builddir=/mnt/work/ISO-Build/build +chroot=/mnt/work/ISO-Build/chroot |