[Pkg-mozext-commits] [SCM] Packaging for https-everywhere branch, master, updated. debian/1.1-1-6-g63c0259

[Fabrizio Regalli]

The following commit has been merged in the master branch:
commit 63c025953e2348baff53d7826cbff75285e2a072
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Sat Nov 5 16:00:10 2011 +0100

    Removed unwanted default.rulesets.rej file

diff --git a/chrome/content/rules/default.rulesets.rej b/chrome/content/rules/default.rulesets.rej
deleted file mode 100644
index f5494c0..0000000
--- a/chrome/content/rules/default.rulesets.rej
+++ /dev/null
@@ -1,74 +0,0 @@
---- chrome/content/rules/default.rulesets
-+++ chrome/content/rules/default.rulesets
-@@ -1198,7 +1198,7 @@
-   <rule from="^http://budgetgolf\.se/" to="https://www.budgetgolf.se/"/>
- </ruleset>
- 
--<ruleset name="BufferedIO" default_off="Cacert signed">
-+<ruleset name="BufferedIO" >
-   <target host="buffered.io" />
-   <target host="www.buffered.io" />
- 
-@@ -1260,7 +1260,7 @@
- 
-   <rule from="^http://(www\.)?ca-pca\.fr/" to="https://www.ca-pca.fr/"/>
- </ruleset>
--<ruleset name="CACert.org" default_off="signed by CACert itself">
-+<ruleset name="CACert.org" >
-   <target host="*.cacert.org" />
- 
-   <!-- this currently errs on the side of not breaking things over security -->
-@@ -1271,7 +1271,7 @@
- 
-   <rule from="^http://([^/:@]*)\.cacert\.org/" to="https://$1.cacert.org/"/>
- </ruleset>
--<ruleset name="ccc.de" default_off="CACert">
-+<ruleset name="ccc.de" >
-   <target host="www.ccc.de" />
-   <target host="*.ccc.de" />
- 
-@@ -1793,7 +1793,7 @@
- 
-   <rule from="^http://(www\.)?dealextreme\.com/" to="https://www.dealextreme.com/"/>
- </ruleset>
--<ruleset name="DebianLists" default_off="self-signed">
-+<ruleset name="DebianLists" >
-   <target host="lists.debian.org" />
- 
-   <rule from="^http://lists\.debian\.org/" to="https://lists.debian.org/"/>
-@@ -2683,7 +2683,7 @@
- 	<rule from="^http://bugs\.freenetproject\.org/" to="https://bugs.freenetproject.org/"/>
- 	<rule from="^http://checksums\.freenetproject\.org/" to="https://checksums.freenetproject.org/"/>
- </ruleset>
--<ruleset name="Freenode.net" default_off="CACert">
-+<ruleset name="Freenode.net" >
-   <target host="freenode.net" />
-   <target host="*.freenode.net" />
- 
-@@ -4559,7 +4559,7 @@
- 	<rule from="^http://www\.lavasoft\.com/" to="https://secure.lavasoft.com/"/>
- </ruleset>
- 
--<ruleset name="Lawblog.de" default_off="CACert">
-+<ruleset name="Lawblog.de" >
-   <target host="www.lawblog.de" />
-   <target host="lawblog.de" />
- 
-@@ -4670,7 +4670,7 @@
-   <rule from="^http://liftshare\.com/" to="https://liftshare.com/"/>
-   <rule from="^http://(images|www|scripts)\.liftshare\.com/" to="https://$1.liftshare.com/"/>
- </ruleset>
--<ruleset name="Lighttpd.net" default_off="CACert">
-+<ruleset name="Lighttpd.net" >
- 	<target host="lighttpd.net" />
- 	<target host="www.lighttpd.net" />
- 	<target host="blog.lighttpd.net" />
-@@ -8526,7 +8526,7 @@
-   <rule from="^http://www22\.verizon\.com/" to="https://www22.verizon.com/"/>
-   <rule from="^http://(www\.)?verizonwireless\.com/" to="https://www.verizonwireless.com/"/>
- </ruleset>
--<ruleset name="VideoLAN" default_off="CAcert">
-+<ruleset name="VideoLAN" >
-   <target host="videolan.org" />
-   <target host="www.videolan.org" />
- 

-- 
Packaging for https-everywhere