From: Bdale Garbee <bdale@gag.com>
Date: Thu, 16 May 2013 07:53:42 +0000 (-0600)
Subject: update Releasing document to reflect process as of 1.2
X-Git-Tag: debian/1.2.1-1~5
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=7b4e5943c4d8da20e6bfcc6517749108e88aa7a5

update Releasing document to reflect process as of 1.2
---

diff --git a/Releasing b/Releasing
index ce4df7c2..4e76d791 100644
--- a/Releasing
+++ b/Releasing
@@ -10,22 +10,24 @@ These are Bdale's notes on how to do a release.
 	  will be pulled in automatically)
 
 	- update the version in configure.ac
-        git log > ChangeLog
-	git commit -a
-	- make absolutely sure checked-out tree is "clean" 
+	- make absolutely sure checked-out tree is "clean" (commit as needed)
 	- if this is an x.y release, then:
 		git checkout -b branch-<version>
-		git tag -a <version>
 	- if this is an x.y.z release, then:
 		git checkout branch-<version>		# the x.y parts only
 		git merge master
-		git tag -a <version>			# full x.y.z version
 
-	- edit .git/gbp.conf to use branch-<version> as upstream if needed
+        git log > ChangeLog
+	git commit -a
+
+	git tag -a <version>
 
 	git checkout debian
 	git merge branch-<version>
 
+	- edit .git/gbp.conf to use branch-<version> as upstream and debian
+	  as packaging branch, if needed
+
 	- verify debian/changelog is "clean" ending in last release version
 	- craft a suitable debian/changelog entry, possibly using:
 	git-dch --release --new-version=<version>-1 --multimaint-merge