[Pkg-mozext-commits] [SCM] Packaging for https-everywhere branch, master, updated. debian/1.2-2-4-g7352557

[Fabrizio Regalli]

The following commit has been merged in the master branch:
commit 73525577401e09f40cc17d390110f8b184965b89
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Sun Dec 4 23:22:37 2011 +0100

    New Upstream version
    
    * Imported Upstream version 1.2.1
    * Added Pre-Depends: dpkg (>= 1.15.6) to d/control
    * Refreshed 01-enable-rules-disabled.diff patch

diff --git a/debian/changelog b/debian/changelog
index a2e415e..891865e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+https-everywhere (1.2.1-1) unstable; urgency=low
+
+  * Imported Upstream version 1.2.1
+  * Added Pre-Depends: dpkg (>= 1.15.6) to d/control
+  * Refreshed 01-enable-rules-disabled.diff patch
+
+ -- Fabrizio Regalli <fabreg at fabreg.it>  Sun, 04 Dec 2011 23:08:01 +0100
+
 https-everywhere (1.2-2) unstable; urgency=low
 
   * Added Breaks: ${xpi:Breaks} to d/control (Closes: #649025)
diff --git a/debian/control b/debian/control
index 1fe5426..bf766fe 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-mozext/https-everywhere.git
 
 Package: xul-ext-https-everywhere
 Architecture: all
+Pre-Depends: dpkg (>= 1.15.6)
 Depends:
  ${misc:Depends}
 Recommends:
diff --git a/debian/patches/01-enable-rules-disabled.diff b/debian/patches/01-enable-rules-disabled.diff
index 944e3b6..1420df0 100644
--- a/debian/patches/01-enable-rules-disabled.diff
+++ b/debian/patches/01-enable-rules-disabled.diff
@@ -40,7 +40,7 @@ Bug-Debian: http://bugs.debian.org/638775
    <target host="lists.debian.org" />
  
    <rule from="^http://lists\.debian\.org/" to="https://lists.debian.org/"/>
-@@ -2687,7 +2687,7 @@
+@@ -2693,7 +2693,7 @@
  	<rule from="^http://bugs\.freenetproject\.org/" to="https://bugs.freenetproject.org/"/>
  	<rule from="^http://checksums\.freenetproject\.org/" to="https://checksums.freenetproject.org/"/>
  </ruleset>
@@ -49,7 +49,7 @@ Bug-Debian: http://bugs.debian.org/638775
    <target host="freenode.net" />
    <target host="*.freenode.net" />
  
-@@ -4564,7 +4564,7 @@
+@@ -4573,7 +4573,7 @@
  	<rule from="^http://www\.lavasoft\.com/" to="https://secure.lavasoft.com/"/>
  </ruleset>
  
@@ -58,7 +58,7 @@ Bug-Debian: http://bugs.debian.org/638775
    <target host="www.lawblog.de" />
    <target host="lawblog.de" />
  
-@@ -4675,7 +4675,7 @@
+@@ -4684,7 +4684,7 @@
    <rule from="^http://liftshare\.com/" to="https://liftshare.com/"/>
    <rule from="^http://(images|www|scripts)\.liftshare\.com/" to="https://$1.liftshare.com/"/>
  </ruleset>
@@ -67,7 +67,7 @@ Bug-Debian: http://bugs.debian.org/638775
  	<target host="lighttpd.net" />
  	<target host="www.lighttpd.net" />
  	<target host="blog.lighttpd.net" />
-@@ -8531,7 +8531,7 @@
+@@ -8542,7 +8542,7 @@
    <rule from="^http://www22\.verizon\.com/" to="https://www22.verizon.com/"/>
    <rule from="^http://(www\.)?verizonwireless\.com/" to="https://www.verizonwireless.com/"/>
  </ruleset>

-- 
Packaging for https-everywhere