[Pkg-mozext-commits] [SCM] Packaging for https-everywhere branch, experimental, updated. debian/3.2-1

[Jérémy Bobbio]

The following commit has been merged in the experimental branch:
commit 88c1a12975a13b53dd36f0108f25204d52eb10a0
Merge: 9a21ac7e7957be957e945a4af07dafbcae8738b0 26ca342900e29ef6ab0c6ac65d60f67462eff85b
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun Apr 28 11:52:10 2013 +0000

    Merge tag 'upstream/3.2' into experimental
    
    We now merge directly from upstream Git repository in order to work on
    the real sources and not from the XPI. The later contains a compressed
    default ruleset, which is not the preferred form of modification.
    
    Conflicts:
    	.gitignore

diff --combined .gitignore
index 474aceb,7c8c7ca..29cac66
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,9 +1,14 @@@
- *.xpi
+ *~
+ chromium.pem
+ dummy-chromium.pem
+ pkg/crx
+ pkg/*.crx
+ pkg/*.xpi
+ src/chrome/content/rules/default.rulesets
+ *.swp
+ tokenkeys.py*
++
 +debian/files
 +debian/xul-ext-https-everywhere
 +debian/xul-ext-https-everywhere.*log
 +debian/xul-ext-https-everywhere.substvars

-- 
Packaging for https-everywhere