From 351563047cba50d994e254d0231194716785e013 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez <ruben@trisquel.info> Date: Thu, 16 Jul 2015 10:31:39 -0500 Subject: [PATCH] Abrowser: Remove Google API key before adding extra lines to mozconfig --- helpers/make-firefox | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helpers/make-firefox b/helpers/make-firefox index 303879ed..b9aafb5d 100644 --- a/helpers/make-firefox +++ b/helpers/make-firefox @@ -42,6 +42,10 @@ sed 's%https://www.mozilla.org/legal/privacy/%https://trisquel.info/legal%' -i . #sed 's%https://www.mozilla.org/firefox/central/%https://trisquel.info/browser%' -i browser/base/content/browser-appmenu.inc +# Remove Google API key +rm debian/ga debian/go +sed '/Google API/,$ d' debian/config/mozconfig.in -i + # Enable gst support [ $REVISION = "6.0" ] && apt-get install -y --force-yes libgstreamermm-0.10-dev [ $REVISION = "6.0" ] && echo "ac_add_options --enable-gstreamer=0.10" >> debian/config/mozconfig.in @@ -50,10 +54,6 @@ sed 's/1204/60/g; s/1210/65/g; s/1404/70/g' -i debian/config/mozconfig.in debian sed 's/com.ubuntu/org.trisquel/' -i debian/config/mozconfig.in -# Remove Google API key -rm debian/ga debian/go -sed '/Google API/,$ d' debian/config/mozconfig.in -i - # Disable DRM support echo ac_add_options --disable-eme >> debian/config/mozconfig.in sed '/gmp-clearkey/d' -i ./debian/firefox.install.in -- GitLab