[Pkg-mozext-commits] [SCM] Packaging for https-everywhere branch, master, updated. debian/1.0.1-1-3-g1fda1c0

[Rogério Brito]

The following commit has been merged in the master branch:
commit 1fda1c05bb316974445b38802e46bdad9b507d46
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Sun Aug 21 07:36:12 2011 -0300

    debian/gbp.conf: Be more specific about the branches used.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 866e4aa..72a0ed5 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,3 +4,7 @@ pristine-tar = True
 [git-dch]
 meta = True
 id-length = 7
+
+[git-import-orig]
+upstream-branch = upstream
+debian-branch = master

-- 
Packaging for https-everywhere