diff options
| author | Joerg Schirottke <master@kanotix.com> | 2016-08-09 20:54:15 +0200 |
|---|---|---|
| committer | Holger Paradies <retabell@gmx.de> | 2016-08-10 05:10:30 +0200 |
| commit | 432a78ca53b83aea13f1feea6426578895547b42 (patch) | |
| tree | 7b0f46dccea9b61356d62f441807871d05c51432 | |
| parent | 6fc9e906e8560d14a07c70ae5ae9db3c9dce70ec (diff) | |
| download | kanotix-432a78ca53b83aea13f1feea6426578895547b42.zip kanotix-432a78ca53b83aea13f1feea6426578895547b42.tar.gz | |
wheezy: use firefox-esr instead of firefox
| -rwxr-xr-x | auto/config | 6 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/08-appdefaults | 1 | ||||
| -rw-r--r-- | config/lists/firefox | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/auto/config b/auto/config index b7a6697..265635d 100755 --- a/auto/config +++ b/auto/config @@ -98,7 +98,11 @@ 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" -grep -wq firefox <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" firefox" +if grep -wq firefox <<<"$LB_PACKAGES_LISTS"; then + if [ "$LB_DISTRIBUTION" != "wheezy" ]; then + LB_REPOSITORIES+=" firefox" + fi +fi 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/chroot_local-hooks/08-appdefaults b/config/chroot_local-hooks/08-appdefaults index 8081410..4e54e83 100755 --- a/config/chroot_local-hooks/08-appdefaults +++ b/config/chroot_local-hooks/08-appdefaults @@ -4,6 +4,7 @@ update-alternatives --set pager /usr/bin/most || true update-alternatives --set x-window-manager /usr/bin/openbox || true update-alternatives --set x-window-manager /usr/bin/kwin || true update-alternatives --set x-www-browser /usr/bin/iceweasel || true +update-alternatives --set x-www-browser /usr/bin/firefox-esr || true update-alternatives --set x-www-browser /usr/bin/firefox || true update-alternatives --set x-session-manager /usr/bin/startlxde || true update-alternatives --set x-session-manager /usr/bin/startkde || true diff --git a/config/lists/firefox b/config/lists/firefox index 9e7a837..081c718 100644 --- a/config/lists/firefox +++ b/config/lists/firefox @@ -1 +1,6 @@ +#if DISTRIBUTION wheezy +firefox-esr-l10n-de +#endif +#nif DISTRIBUTION wheezy firefox-l10n-de +#endif |