From b10214842b939e00bd08abf222fdc438c55d3039 Mon Sep 17 00:00:00 2001
From: Santiago Rodriguez <santi@trisquel.info>
Date: Fri, 16 Oct 2015 12:36:41 +0200
Subject: [PATCH] firefox: update default search motor configuration option
---
helpers/DATA/firefox/settings.js | 6 ++++--
helpers/make-firefox | 6 +++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/helpers/DATA/firefox/settings.js b/helpers/DATA/firefox/settings.js
index 4f150450..86836732 100644
--- a/helpers/DATA/firefox/settings.js
+++ b/helpers/DATA/firefox/settings.js
@@ -9,8 +9,10 @@ pref("pfs.filehint.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETY
// I'm feeling Ducky.
pref("keyword.URL", "https://duckduckgo.com/?t=trisquel&q=!+");
-pref("browser.search.defaultenginename", "DuckDuckGo (SSL)");
-pref("browser.search.order.extra.duckduckgo", "DuckDuckGo (SSL)");
+pref("browser.search.defaultenginename", "DuckDuckGo");
+pref("browser.search.order.1", "DuckDuckGo");
+pref("browser.search.defaultenginename", "DuckDuckGo");
+pref("browser.search.order.extra.duckduckgo", "DuckDuckGo");
pref("browser.search.showOneOffButtons", false);
pref("browser.search.suggest.enabled",false);
// Disable preconnecting to search engine when clicking on the search bar
diff --git a/helpers/make-firefox b/helpers/make-firefox
index 8ed90b0f..01764b82 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=41
+VERSION=42
. ./config
@@ -65,6 +65,10 @@ sed "s/Provides.*/Provides: firefox-locale-@LANGCODE@/" -i debian/control.langpa
sed -i /ubuntu-bookmarks/d debian/patches/series
rm debian/patches/ubuntu-bookmarks*
+# Remove Ubuntu l10n search preferences
+sed -i /ubuntu-search-defaults/d debian/patches/series
+rm debian/patches/ubuntu-search-defaults*
+
#Unbrand url codes for google and amazon
find debian/searchplugins |grep google| xargs -i /bin/sed '/ubuntu/d; /channel/d' -i {}
find debian/searchplugins |grep amazon| xargs -i /bin/sed '/canoniccom/d;' -i {}
--
GitLab