summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Paradies <retabell@gmx.de>2017-06-24 19:51:20 +0200
committerHolger Paradies <retabell@gmx.de>2017-06-24 22:08:38 +0200
commitfc86b52ec981ff8d2b715e9a0b406b3df7e772e9 (patch)
tree7313a64d3d11d79d865045015cc54c503cedce47
parentfad4370addaf6f5b2028122373d7ffb281afa59c (diff)
downloadkanotix-fc86b52ec981ff8d2b715e9a0b406b3df7e772e9.zip
kanotix-fc86b52ec981ff8d2b715e9a0b406b3df7e772e9.tar.gz
select firefox-esr from debian
Jessie and Stretch backports of Firefox release and beta are gone because of the requirement of rust to build them, which is not available in Jessie or Stretch
-rwxr-xr-xauto/config6
-rw-r--r--config/lists/extra-es2
-rw-r--r--config/lists/extra-it2
-rw-r--r--config/lists/firefox5
4 files changed, 3 insertions, 12 deletions
diff --git a/auto/config b/auto/config
index 450acd6..146e85f 100755
--- a/auto/config
+++ b/auto/config
@@ -106,11 +106,7 @@ if grep -wq steam <<<"$LB_PACKAGES_LISTS"; then
fi
grep -wq wine-staging <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" wine-staging"
grep -wq iceweasel <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" iceweasel"
-if grep -wq firefox <<<"$LB_PACKAGES_LISTS"; then
- if [ "$LB_DISTRIBUTION" != "wheezy" ]; then
- LB_REPOSITORIES+=" firefox"
- fi
-fi
+grep -wq firefox <<<"$LB_PACKAGES_LISTS"
grep -wq silverlight <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" silverlight"
grep -wq spotify <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" spotify"
grep -wq dropbox <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" dropbox"
diff --git a/config/lists/extra-es b/config/lists/extra-es
index 178b196..43c8fe7 100644
--- a/config/lists/extra-es
+++ b/config/lists/extra-es
@@ -1,7 +1,7 @@
# default packages
thunderbird-l10n-es-es
-firefox-l10n-es-es
+firefox-esr-l10n-es-es
lightning-l10n-es-es
kde-l10n-es
diff --git a/config/lists/extra-it b/config/lists/extra-it
index b52e199..769001a 100644
--- a/config/lists/extra-it
+++ b/config/lists/extra-it
@@ -1,7 +1,7 @@
# default packages
thunderbird-l10n-it
-firefox-l10n-it
+firefox-esr-l10n-it
lightning-l10n-it
kde-l10n-it
diff --git a/config/lists/firefox b/config/lists/firefox
index 081c718..75343e8 100644
--- a/config/lists/firefox
+++ b/config/lists/firefox
@@ -1,6 +1 @@
-#if DISTRIBUTION wheezy
firefox-esr-l10n-de
-#endif
-#nif DISTRIBUTION wheezy
-firefox-l10n-de
-#endif