From 3cdf146e8251ff6b49a1ceff30e6af2cb9184e14 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 5 Mar 2014 12:29:03 +0100 Subject: Separate localegroups as own profiles (only 'all' for now). --- Makefile | 8 +++++++- profiles/desktop-email | 4 ++-- profiles/desktop-email-all | 2 ++ profiles/desktop-office | 4 +--- profiles/desktop-office-all | 3 +++ profiles/desktop-web | 4 ++-- profiles/desktop-web-all | 2 ++ 7 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 profiles/desktop-email-all create mode 100644 profiles/desktop-office-all create mode 100644 profiles/desktop-web-all diff --git a/Makefile b/Makefile index 5d08655..4cec782 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,14 @@ profiles = desktop desktoptopics = email office web +lcgroups = all desktoptopiclists = $(patsubst %,profiles/desktop-%,$(desktoptopics)) desktoptweaks = tweaks/base tweaks/desktop basefiles = $(patsubst %,content/%/base/preseed.cfg,$(profiles)) topicfiles = $(patsubst %,content/desktop/%/preseed.cfg,$(desktoptopics)) +lcgroupfiles = $(foreach lcgroup,$(lcgroups),\ + $(patsubst %,content/desktop/%-$(lcgroup)/preseed.cfg,$(desktoptopics))) mainfiles = $(patsubst %,content/%/preseed.cfg,$(profiles)) -allfiles = $(basefiles) $(topicfiles) $(mainfiles) +allfiles = $(basefiles) $(topicfiles) $(lcgroupfiles) $(mainfiles) mdfiles = content/MD5SUMS shafiles = $(patsubst %,content/SHA%SUMS,1 256 512) checksumfiles = $(mdfiles) $(shafiles) @@ -20,6 +23,9 @@ $(basefiles): content/%/base/preseed.cfg : skel/preseed.cfg.in profiles/% profil $(topicfiles): content/desktop/%/preseed.cfg : skel/preseed.cfg.in profiles/desktop profiles/desktop-% profiles/desktop-z $(desktoptweaks) bin/pkglist2preseed $(filter skel/%,$^) $@ "$(filter profiles/%,$^)" "$(filter tweaks/%,$^)" +$(lcgroupfiles): content/desktop/%/preseed.cfg : skel/preseed.cfg.in profiles/desktop profiles/desktop-% profiles/desktop-z $(desktoptweaks) + bin/pkglist2preseed $(filter skel/%,$^) $@ "$(filter profiles/%,$^)" "$(filter tweaks/%,$^)" + $(mainfiles): content/%/preseed.cfg : skel/preseed.cfg.in profiles/% $(desktoptopiclists) profiles/%-z $(desktoptweaks) bin/pkglist2preseed $(filter skel/%,$^) $@ "$(filter profiles/%,$^)" "$(filter tweaks/%,$^)" diff --git a/profiles/desktop-email b/profiles/desktop-email index 3fd2b30..4edd421 100644 --- a/profiles/desktop-email +++ b/profiles/desktop-email @@ -1,3 +1,3 @@ ## email -# include Icedove email with all locales and PGP plugin -icedove icedove-l10n-all enigmail +# include Icedove email with PGP plugin +icedove enigmail diff --git a/profiles/desktop-email-all b/profiles/desktop-email-all new file mode 100644 index 0000000..06ea121 --- /dev/null +++ b/profiles/desktop-email-all @@ -0,0 +1,2 @@ +# include all Icedove locales +icedove-l10n-all diff --git a/profiles/desktop-office b/profiles/desktop-office index 4b9ca2c..12de536 100644 --- a/profiles/desktop-office +++ b/profiles/desktop-office @@ -1,7 +1,5 @@ -# include LibreOffice core (except Galaxy theme) with all locales +# include LibreOffice core (except Galaxy theme) libreoffice-gtk -libreoffice-style-galaxy -#$(for lang in ar ast be bg br bs ca cs cy da da de dz el en-gb eo es et eu fa fi fr ga gl he hr hu id in is it ja ka km ko ku lt lv mk mn nb ne nl nn oc om pl pt pt-br ro ru rw si sk sl sr sv tg th tr ug uk uz vi za zh-cn zh-tw; do echo libreoffice-l10n-$lang; done) -libreoffice-l10n-ar libreoffice-l10n-ast libreoffice-l10n-be libreoffice-l10n-bg libreoffice-l10n-br libreoffice-l10n-bs libreoffice-l10n-ca libreoffice-l10n-cs libreoffice-l10n-cy libreoffice-l10n-da libreoffice-l10n-da libreoffice-l10n-de libreoffice-l10n-dz libreoffice-l10n-el libreoffice-l10n-en-gb libreoffice-l10n-eo libreoffice-l10n-es libreoffice-l10n-et libreoffice-l10n-eu libreoffice-l10n-fa libreoffice-l10n-fi libreoffice-l10n-fr libreoffice-l10n-ga libreoffice-l10n-gl libreoffice-l10n-he libreoffice-l10n-hr libreoffice-l10n-hu libreoffice-l10n-id libreoffice-l10n-in libreoffice-l10n-is libreoffice-l10n-it libreoffice-l10n-ja libreoffice-l10n-ka libreoffice-l10n-km libreoffice-l10n-ko libreoffice-l10n-ku libreoffice-l10n-lt libreoffice-l10n-lv libreoffice-l10n-mk libreoffice-l10n-mn libreoffice-l10n-nb libreoffice-l10n-ne libreoffice-l10n-nl libreoffice-l10n-nn libreoffice-l10n-oc libreoffice-l10n-om libreoffice-l10n-pl libreoffice-l10n-pt libreoffice-l10n-pt-br libreoffice-l10n-ro libreoffice-l10n-ru libreoffice-l10n-rw libreoffice-l10n-si libreoffice-l10n-sk libreoffice-l10n-sl libreoffice-l10n-sr libreoffice-l10n-sv libreoffice-l10n-tg libreoffice-l10n-th libreoffice-l10n-tr libreoffice-l10n-ug libreoffice-l10n-uk libreoffice-l10n-uz libreoffice-l10n-vi libreoffice-l10n-za libreoffice-l10n-zh-cn libreoffice-l10n-zh-tw # include LibreOffice Calc and Writer (except Java support or email composer) libreoffice-calc libreoffice-writer -libreoffice-java-common -libreoffice-emailmerge # include LibreOffice Impress with OpenGL plugin diff --git a/profiles/desktop-office-all b/profiles/desktop-office-all new file mode 100644 index 0000000..08ff036 --- /dev/null +++ b/profiles/desktop-office-all @@ -0,0 +1,3 @@ +# include all LibreOffice locales +#$(for lang in ar ast be bg br bs ca cs cy da da de dz el en-gb eo es et eu fa fi fr ga gl he hr hu id in is it ja ka km ko ku lt lv mk mn nb ne nl nn oc om pl pt pt-br ro ru rw si sk sl sr sv tg th tr ug uk uz vi za zh-cn zh-tw; do echo libreoffice-l10n-$lang; done) +libreoffice-l10n-ar libreoffice-l10n-ast libreoffice-l10n-be libreoffice-l10n-bg libreoffice-l10n-br libreoffice-l10n-bs libreoffice-l10n-ca libreoffice-l10n-cs libreoffice-l10n-cy libreoffice-l10n-da libreoffice-l10n-da libreoffice-l10n-de libreoffice-l10n-dz libreoffice-l10n-el libreoffice-l10n-en-gb libreoffice-l10n-eo libreoffice-l10n-es libreoffice-l10n-et libreoffice-l10n-eu libreoffice-l10n-fa libreoffice-l10n-fi libreoffice-l10n-fr libreoffice-l10n-ga libreoffice-l10n-gl libreoffice-l10n-he libreoffice-l10n-hr libreoffice-l10n-hu libreoffice-l10n-id libreoffice-l10n-in libreoffice-l10n-is libreoffice-l10n-it libreoffice-l10n-ja libreoffice-l10n-ka libreoffice-l10n-km libreoffice-l10n-ko libreoffice-l10n-ku libreoffice-l10n-lt libreoffice-l10n-lv libreoffice-l10n-mk libreoffice-l10n-mn libreoffice-l10n-nb libreoffice-l10n-ne libreoffice-l10n-nl libreoffice-l10n-nn libreoffice-l10n-oc libreoffice-l10n-om libreoffice-l10n-pl libreoffice-l10n-pt libreoffice-l10n-pt-br libreoffice-l10n-ro libreoffice-l10n-ru libreoffice-l10n-rw libreoffice-l10n-si libreoffice-l10n-sk libreoffice-l10n-sl libreoffice-l10n-sr libreoffice-l10n-sv libreoffice-l10n-tg libreoffice-l10n-th libreoffice-l10n-tr libreoffice-l10n-ug libreoffice-l10n-uk libreoffice-l10n-uz libreoffice-l10n-vi libreoffice-l10n-za libreoffice-l10n-zh-cn libreoffice-l10n-zh-tw diff --git a/profiles/desktop-web b/profiles/desktop-web index e72f537..56cd560 100644 --- a/profiles/desktop-web +++ b/profiles/desktop-web @@ -1,2 +1,2 @@ -# include Iceweasel web browser with all locales and security plugins -iceweasel iceweasel-l10n-all xul-ext-noscript xul-ext-cookie-monster +# include Iceweasel web browser with security plugins +iceweasel xul-ext-noscript xul-ext-cookie-monster diff --git a/profiles/desktop-web-all b/profiles/desktop-web-all new file mode 100644 index 0000000..0b95dbb --- /dev/null +++ b/profiles/desktop-web-all @@ -0,0 +1,2 @@ +# include all Iceweasel locales +iceweasel-l10n-all -- cgit v1.2.3