[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 140eff37d054484f0719c54eac7294d281533cf1
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun Apr 28 11:25:39 2013 +0000

    Update README.source

diff --git a/debian/README.source b/debian/README.source
index 1e21f69..cf93290 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,21 +1,30 @@
 Debian packaging for https-everywhere
 -------------------------------------
 
+This packages uses snapshots of the upstream Git repository as sources.
+It follows git-buildpackage advices as on:
+<http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.UPSTREAM.GIT.NOTARBALL>
+The tarball created from Git is recorded using pristine-tar.
+
 A quick summary of how one can update the Debian packaging of
-https-everywhere is to, assuming that one already has the appropriate
+https-everywhere, assuming that one already has the appropriate
 build-dependencies, `devscripts`, `pristine-tar`, and `git-buildpackage`
-installed:
+installed. VERSION is assumed to be the new upstream version:
 
     git clone git+ssh://git.debian.org/git/pkg-mozext/https-everywhere.git
     cd https-everywhere
     git branch upstream origin/upstream
     git branch pristine-tar origin/pristine-tar
-    git-import-orig --uscan --pristine-tar
-    [ Make here some adaptations, like updating debian/patches, if needed ]
-    git-buildpackage --git-pristine-tar
+    git remote add tpo-upstream https://git.torproject.org/https-everywhere.git
 
-These are the important steps and may need to be changed according to
-deviations, say, in the release process of upstream releases (e.g., if
-upstream changes the location where the tarballs reside).
+    git fetch tpo-upstream
+    git tag -v $VERSION
+    git checkout upstream
+    git merge --ff-only $VERSION
+    git tag upstream/$VERSION
+    git checkout master
+    git merge upstream/$VERSION
+
+    [ Make here some adaptations, like updating debian/patches, if needed ]
 
- -- Rogério Brito <rbrito at ime.usp.br>, Sat, 20 Aug 2011 02:11:40 -0300
+    git-buildpackage

-- 
Packaging for https-everywhere