X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Releasing;h=4e76d791887235ddb2ca095ab7e65b7c95936ed1;hb=97b80e3fef28d367a5ed1d18893accd1416cdf3f;hp=973cb01f6a098c850e39d3e26292b62341f31d6d;hpb=e69a433fd93b9f6bd2297d8045eb075fee29e73b;p=fw%2Faltos

diff --git a/Releasing b/Releasing
index 973cb01f..4e76d791 100644
--- a/Releasing
+++ b/Releasing
@@ -1,5 +1,7 @@
 These are Bdale's notes on how to do a release.
 
+	- make sure there's a suitable ARM Cortex toolchain in /opt/cortex!
+
 	git checkout master
 
 	- make sure there is a doc/release-notes-<version>.xsl
@@ -8,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