[Pkg-bitcoin-commits] [armory] 01/01: git-buildpackage configuration and source documentation

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository armory.

commit 7bdd3c89f99b370dabea199f9bc5a7d5d60c9d34
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Thu Oct 9 06:00:29 2014 +0200

    git-buildpackage configuration and source documentation
---
 debian/README.source | 36 ++++++++++++++++++++++++++++++++++++
 debian/gbp.conf      | 14 ++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..1fe5b13
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,36 @@
+Working with the upstream source
+--------------------------------
+In order to enable verification of the *upstream* tag signature, the upstream
+tags are used as-is, rather than retagging/resigning in Debian. This requires a
+little care when adding the upstream repository as a remote, but can be done
+with the following:
+
+    git remote add upstream git at github.com:etotheipi/BitcoinArmory.git
+    git config remote.upstream.tagopt --no-tags
+    git config --add remote.upstream.fetch '+refs/tags/*:refs/tags/upstream/*'
+
+This causes the upstream tags to be imported as 'upstream/name' instead of
+'name' when a 'git fetch upstream' is done. The tags can then be verified with
+'git tag -v <tagname>', assuming you have the upstream signing key, and
+debian/gbp.conf sets the upstream tag format appropriately so that
+git-buildpackage will find these tags.
+
+The debian/* tags should still be signed by the person preparing the Debian
+package, as usual; debian/gbp.conf is configured to enable this by default.
+
+To import a new upstream release, check the upstream tag name, and then do:
+
+    git checkout upstream
+    git pull --ff-only upstream/v1.2.3
+
+Once the upstream branch is updated, merge it into the Debian branch:
+
+    git checkout master
+    git merge upstream
+    # Inspect changes and/or resolve conflicts
+    git commit -m 'Merge new upstream release 1.2.3'
+
+You can then proceed with the changes needed for the new release.
+
+If you are not working with the upstream source, you do not need to worry about
+any of this.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..552e2c7
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,14 @@
+[DEFAULT]
+# Match the upstream tag format, see debian/README.source for more information
+upstream-tag = upstream/v%(version)s
+pristine-tar = True
+# Upstream signs their git tags, we should sign the Debian tags too.
+sign-tags = True
+
+[buildpackage]
+# Since upstream does not distribute tarballs (except for the tag downloads
+# from GitHub, which are not stable), we will generate our own from the tag. In
+# order to have a stable tarball, we should commit the pristine-tar delta for
+# the first tarball we generate, so that regenerating the tarball in future
+# will produce the same tarball.
+pristine-tar-commit = True

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/armory.git