[Trisquel-devel] Rev 61: Upgraded ubufox for abrowser14 changes in file:///home/bzr/package-helpers/trunk/
Ruben Rodriguez
ruben at trisquel.info
Sat Jul 28 13:33:55 CEST 2012
At file:///home/bzr/package-helpers/trunk/
------------------------------------------------------------
revno: 61
revision-id: ruben en trisquel.info-20120728113315-n1bfureic1ghms5c
parent: ruben en trisquel.info-20120611190336-4u9xtj9lcr66btzm
committer: Ruben Rodriguez <ruben en trisquel.info>
branch nick: trunk
timestamp: Sat 2012-07-28 13:33:15 +0200
message:
Upgraded ubufox for abrowser14 changes
------------ pr�xima parte ------------
=== modified file 'helpers/lucid/make-ubufox'
--- a/helpers/lucid/make-ubufox 2012-06-10 02:37:18 +0000
+++ b/helpers/lucid/make-ubufox 2012-07-28 11:33:15 +0000
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=13
+VERSION=14
. ./config
@@ -29,19 +29,38 @@
replace ubuntulogo32.png internet32.png .
# This hack makes Firefox avoid sending a request for a list of plugins, instead returns a hardcoded xml list.
-sed 's/ubuntu/trisquel/; s^https://mozilla-pfs.ubuntu.com/.*ID%^http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%^' -i defaults/preferences/ubufox-pfs.js
+sed 's^https://mozilla-pfs.ubuntu.com/.*ID%^http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%^; ' -i modules/distributions/Ubuntu.jsm
# Changes the link to pfs.mozilla.org in the install wizard
sed 's_https://pfs.mozilla.org/plugins/_http://trisquel.info/browser/_' -i content/pluginInstallerWizard.js
#sed 's/ubuntu-artwork/trisquel-artwork/; s_http://start.ubuntu.com/_https://trisquel.info/welcome_; s/PREFIX +.*/PREFIX;/' -i ./components/aboutStartpage.js
rm components/aboutStartpage.js
-sed 's/components //' -i ./config_build.sh debian/patches/addon_installer.patch
+sed s/components// -i ./config_build.sh
sed /components/d -i ./chrome.manifest
sed /startup/d -i defaults/preferences/ubuntu-mods.js
sed 's/www.ubuntu.com/trisquel.info/' -i debian/example-homepage.properties
+for file in $(find -name ubufox-search.properties)
+do
+cat << EOF > $file
+browser.search.defaultenginename="DuckDuckGo (SSL)"
+browser.search.order.1="DuckDuckGo (SSL)"
+browser.search.order.2=Google
+EOF
+done
+
+for file in $(find locale -name ubufox.properties)
+do
+sed '/homepage/d' -i $file
+cat << EOF >> $file
+browser.startup.homepage=http://trisquel.info/
+startup.homepage_override_url=http://trisquel.info/newbrowser
+startup.homepage_welcome_url=http://trisquel.info/welcome
+EOF
+done
+
# Stablish Trisquel's default or mandatory settings
cat << EOF >> debian/xul-ext-ubufox.js
@@ -97,7 +116,7 @@
//pref ("browser.startup.page" , 3);
//pref ("browser.startup.homepage" , "http://trisquel.info");
//pref ("startup.homepage_welcome_url", "http://trisquel.info/welcome");
-pref ("startup.homepage_override_url" , "http://trisquel.info/newbrowser");
+//pref ("startup.homepage_override_url" , "http://trisquel.info/newbrowser");
// Preferences for the Get Add-ons panel
pref ("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain");
@@ -121,10 +140,11 @@
sed '/You can uninstall/d; s/ask.com/Duck Duck GO!/; /Add the following options/d; /Get help on-line/d; /Help translating/d; /Trisquel Release/d; ' debian/control -i
-replace Mozilla GNU .
-replace Firefox IceCat .
-replace firefox icecat .
+replace Mozilla Trisquel .
+replace Firefox Abrowser .
+replace firefox abrowser .
replace Ubuntu Trisquel .
+replace ubuntu-mozillateam en lists.ubuntu.com trisquel-devel en listas.trisquel.info .
changelog "Adapted for Trisquel"
=== modified file 'helpers/natty/make-ubufox'
--- a/helpers/natty/make-ubufox 2012-06-10 02:37:18 +0000
+++ b/helpers/natty/make-ubufox 2012-07-28 11:33:15 +0000
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=13
+VERSION=14
. ./config
@@ -29,7 +29,7 @@
replace ubuntulogo32.png internet32.png .
# This hack makes Firefox avoid sending a request for a list of plugins, instead returns a hardcoded xml list.
-sed 's/ubuntu/trisquel/; s^https://mozilla-pfs.ubuntu.com/.*ID%^http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%^' -i defaults/preferences/ubufox-pfs.js
+sed 's^https://mozilla-pfs.ubuntu.com/.*ID%^http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%^; ' -i modules/distributions/Ubuntu.jsm
# Changes the link to pfs.mozilla.org in the install wizard
sed 's_https://pfs.mozilla.org/plugins/_http://trisquel.info/browser/_' -i content/pluginInstallerWizard.js
@@ -42,6 +42,25 @@
sed 's/www.ubuntu.com/trisquel.info/' -i debian/example-homepage.properties
+for file in $(find -name ubufox-search.properties)
+do
+cat << EOF > $file
+browser.search.defaultenginename="DuckDuckGo (SSL)"
+browser.search.order.1="DuckDuckGo (SSL)"
+browser.search.order.2=Google
+EOF
+done
+
+for file in $(find locale -name ubufox.properties)
+do
+sed '/homepage/d' -i $file
+cat << EOF >> $file
+browser.startup.homepage=http://trisquel.info/
+startup.homepage_override_url=http://trisquel.info/newbrowser
+startup.homepage_welcome_url=http://trisquel.info/welcome
+EOF
+done
+
# Stablish Trisquel's default or mandatory settings
cat << EOF >> debian/xul-ext-ubufox.js
@@ -97,7 +116,7 @@
//pref ("browser.startup.page" , 3);
//pref ("browser.startup.homepage" , "http://trisquel.info");
//pref ("startup.homepage_welcome_url", "http://trisquel.info/welcome");
-pref ("startup.homepage_override_url" , "http://trisquel.info/newbrowser");
+//pref ("startup.homepage_override_url" , "http://trisquel.info/newbrowser");
// Preferences for the Get Add-ons panel
pref ("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain");
@@ -121,10 +140,11 @@
sed '/You can uninstall/d; s/ask.com/Duck Duck GO!/; /Add the following options/d; /Get help on-line/d; /Help translating/d; /Trisquel Release/d; ' debian/control -i
-replace Mozilla GNU .
-replace Firefox IceCat .
-replace firefox icecat .
+replace Mozilla Trisquel .
+replace Firefox Abrowser .
+replace firefox abrowser .
replace Ubuntu Trisquel .
+replace ubuntu-mozillateam en lists.ubuntu.com trisquel-devel en listas.trisquel.info .
changelog "Adapted for Trisquel"
=== modified file 'helpers/oneiric/make-ubufox'
--- a/helpers/oneiric/make-ubufox 2012-06-10 02:37:18 +0000
+++ b/helpers/oneiric/make-ubufox 2012-07-28 11:33:15 +0000
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=13
+VERSION=14
. ./config
@@ -29,7 +29,7 @@
replace ubuntulogo32.png internet32.png .
# This hack makes Firefox avoid sending a request for a list of plugins, instead returns a hardcoded xml list.
-sed 's/ubuntu/trisquel/; s^https://mozilla-pfs.ubuntu.com/.*ID%^http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%^' -i defaults/preferences/ubufox-pfs.js
+sed 's^https://mozilla-pfs.ubuntu.com/.*ID%^http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%^; ' -i modules/distributions/Ubuntu.jsm
# Changes the link to pfs.mozilla.org in the install wizard
sed 's_https://pfs.mozilla.org/plugins/_http://trisquel.info/browser/_' -i content/pluginInstallerWizard.js
@@ -42,6 +42,25 @@
sed 's/www.ubuntu.com/trisquel.info/' -i debian/example-homepage.properties
+for file in $(find -name ubufox-search.properties)
+do
+cat << EOF > $file
+browser.search.defaultenginename="DuckDuckGo (SSL)"
+browser.search.order.1="DuckDuckGo (SSL)"
+browser.search.order.2=Google
+EOF
+done
+
+for file in $(find locale -name ubufox.properties)
+do
+sed '/homepage/d' -i $file
+cat << EOF >> $file
+browser.startup.homepage=http://trisquel.info/
+startup.homepage_override_url=http://trisquel.info/newbrowser
+startup.homepage_welcome_url=http://trisquel.info/welcome
+EOF
+done
+
# Stablish Trisquel's default or mandatory settings
cat << EOF >> debian/xul-ext-ubufox.js
@@ -97,7 +116,7 @@
//pref ("browser.startup.page" , 3);
//pref ("browser.startup.homepage" , "http://trisquel.info");
//pref ("startup.homepage_welcome_url", "http://trisquel.info/welcome");
-pref ("startup.homepage_override_url" , "http://trisquel.info/newbrowser");
+//pref ("startup.homepage_override_url" , "http://trisquel.info/newbrowser");
// Preferences for the Get Add-ons panel
pref ("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain");
@@ -121,10 +140,11 @@
sed '/You can uninstall/d; s/ask.com/Duck Duck GO!/; /Add the following options/d; /Get help on-line/d; /Help translating/d; /Trisquel Release/d; ' debian/control -i
-replace Mozilla GNU .
-replace Firefox IceCat .
-replace firefox icecat .
+replace Mozilla Trisquel .
+replace Firefox Abrowser .
+replace firefox abrowser .
replace Ubuntu Trisquel .
+replace ubuntu-mozillateam en lists.ubuntu.com trisquel-devel en listas.trisquel.info .
changelog "Adapted for Trisquel"
More information about the Trisquel-devel
mailing list