From: Jon Dowland <jmtd@debian.org>
Date: Mon, 10 May 2010 13:02:29 +0000 (+0100)
Subject: document debian packaging
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=52b91b6856d682f84d298ac97be843573513cc21;p=packages%2Fb%2Fbup.git

document debian packaging
---

diff --git a/debian/README.source b/debian/README.source
index b4ae667..9e93608 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,3 +3,18 @@ bup for Debian
 
 The bup source is obtained via git from <git://github.com/apenwarr/bup.git>
 The debian packaging tracks the latest tagged release, rather than master.
+
+The bup package source is collaboratively maintained by the Debian collab-maint project. You can obtain a copy of the source (including the upstream source)
+from <git://git.debian.org/git/collab-maint/bup>.
+
+ * The 'master' branch is used to track upstream's master
+   * you may wish to add it as a remote to any clone:
+     git remote add upstream http://github.com/apenwarr/bup.git
+   * we fast-forward merge from upstream's master
+ * The 'debian' branch is used to track the debian packaging effort
+   * This usually tracks the most recent upstream tag
+   * we non-fast-forward merge when moving between upstream tags
+ * we carry upstream's tags, which are of the form bup-x.xxx
+ * we prefix our tags with 'debian/' e.g. debian/0.14a-1
+   * experimental releases are prefixed 'debian/experimental'
+     e.g. debian/experimental/0.14a-1