[Pkg-privacy-commits] [torbirdy] 19/22: Improve readme.source

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

ulrike pushed a commit to branch debian/sid
in repository torbirdy.

commit fca5c5ba0d35c11da1e8c44547c1b9f24b385e5d
Author: Ulrike Uhlig <u at 451f.org>
Date:   Wed Apr 19 12:28:15 2017 +0200

    Improve readme.source
---
 debian/README.source | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 84cfba5..14b7066 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -15,17 +15,19 @@ git fetch origin
 git fetch torbirdy-upstream
 
 export VERSION="0.2.0"
-# checkout latest signed upstream tag
+# verify the tag's GPG signature
+git verify-tag -v ${VERSION}
+# checkout & export latest signed upstream tag
 git checkout $VERSION
 git archive --prefix="torbirdy-${VERSION}/" --output="../torbirdy_${VERSION}.orig.tar.gz" $VERSION
 
-# Possibility2: merge current release
 git checkout debian/sid
-git merge $VERSION
 
-# if we want to import the tarball. no-merge does not merge twice into debian branch
-gbp import-orig --no-merge --upstream-vcs-tag=0.2.0 --pristine-tar "../torbirdy_${VERSION}.orig.tar.gz"
+# Possibility1: Import the tarball
+gbp import-orig --upstream-vcs-tag=${VERSION} --pristine-tar "../torbirdy_${VERSION}.orig.tar.gz"
 
+# Possibility2: Merge current release
+# git merge $VERSION
 dch -i
 git commit debian/changelog
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbirdy.git