[Pkg-mozext-commits] [SCM] torbutton Debian packaging branch, master, updated. debian/1.4.6-1

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit aabce6be7176f03ab3215320718752198fed1fce
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Jun 23 15:38:27 2012 +0200

    Disable locked_mode in default settings
    
    Upstream now makes Torbutton 'always on' mode the default. This would
    be surprising for users that would migrate from Squeeze: every Iceweasel
    profile would always want to go through Tor, unless the extension was
    explicitly disabled. So let's keep the toggling mode for Wheezy, and
    work on having Torbrowser in Debian for Wheezy+1.

diff --git a/debian/patches/disable-locked-mode.patch b/debian/patches/disable-locked-mode.patch
new file mode 100644
index 0000000..6992253
--- /dev/null
+++ b/debian/patches/disable-locked-mode.patch
@@ -0,0 +1,37 @@
+Description: disable locked_mode in default settings
+ Upstream now makes Torbutton 'always on' mode the default. This would
+ be surprising for users that would migrate from Squeeze: every Iceweasel
+ profile would always want to go through Tor, unless the extension was
+ explicitly disabled. So let's keep the toggling mode for Wheezy, and
+ work on having Torbrowser in Debian for Wheezy+1.
+Author: Jérémy Bobbio <lunar at debian.org>
+Forwarded: not-needed
+
+diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
+index 8dd2add..70ad3af 100644
+--- a/src/defaults/preferences/preferences.js
++++ b/src/defaults/preferences/preferences.js
+@@ -22,7 +22,7 @@ pref("extensions.torbutton.gopher_port",0);
+ pref("extensions.torbutton.socks_host","");
+ pref("extensions.torbutton.socks_port",0);
+ pref("extensions.torbutton.socks_version",5);
+-pref("extensions.torbutton.locked_mode",true);
++pref("extensions.torbutton.locked_mode",false);
+ pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true");
+ pref("extensions.torbutton.test_failed",false);
+ pref("extensions.torbutton.no_proxies_on","127.0.0.1");
+@@ -136,7 +136,7 @@ pref("extensions.torbutton.no_search",true);
+ pref("extensions.torbutton.set_uagent",true);
+ pref("extensions.torbutton.notor_sessionstore",true);
+ pref("extensions.torbutton.nonontor_sessionstore",false);
+-pref("extensions.torbutton.restore_tor",true); 
++pref("extensions.torbutton.restore_tor",false);
+ pref("extensions.torbutton.reload_crashed_jar",true); 
+ pref("extensions.torbutton.spoof_english",true);
+ pref("extensions.torbutton.spoof_charset",'iso-8859-1,*,utf-8');
+@@ -220,4 +220,4 @@ pref("extensions.torbutton.useragent_vendorSub","");
+ pref("extensions.torbutton.safecache",1); // 0=always, 1=during tor, 2=never
+ pref("extensions.torbutton.dual_key_cookies",false);
+ pref("extensions.torbutton.cookie_js_allow", true);
+-pref("extensions.torbutton.prompt_torbrowser", true);
++pref("extensions.torbutton.prompt_torbrowser", false);
diff --git a/debian/patches/series b/debian/patches/series
index b6e7e79..36bad0c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 localhost-proxy.patch
 restore-status-panel-on-ff4.patch
+disable-locked-mode.patch
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
index 8dd2add..70ad3af 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -22,7 +22,7 @@ pref("extensions.torbutton.gopher_port",0);
 pref("extensions.torbutton.socks_host","");
 pref("extensions.torbutton.socks_port",0);
 pref("extensions.torbutton.socks_version",5);
-pref("extensions.torbutton.locked_mode",true);
+pref("extensions.torbutton.locked_mode",false);
 pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true");
 pref("extensions.torbutton.test_failed",false);
 pref("extensions.torbutton.no_proxies_on","127.0.0.1");
@@ -136,7 +136,7 @@ pref("extensions.torbutton.no_search",true);
 pref("extensions.torbutton.set_uagent",true);
 pref("extensions.torbutton.notor_sessionstore",true);
 pref("extensions.torbutton.nonontor_sessionstore",false);
-pref("extensions.torbutton.restore_tor",true); 
+pref("extensions.torbutton.restore_tor",false);
 pref("extensions.torbutton.reload_crashed_jar",true); 
 pref("extensions.torbutton.spoof_english",true);
 pref("extensions.torbutton.spoof_charset",'iso-8859-1,*,utf-8');
@@ -220,4 +220,4 @@ pref("extensions.torbutton.useragent_vendorSub","");
 pref("extensions.torbutton.safecache",1); // 0=always, 1=during tor, 2=never
 pref("extensions.torbutton.dual_key_cookies",false);
 pref("extensions.torbutton.cookie_js_allow", true);
-pref("extensions.torbutton.prompt_torbrowser", true);
+pref("extensions.torbutton.prompt_torbrowser", false);

-- 
torbutton Debian packaging