X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Releasing;h=1711779d69894b803f95b24842dfbf540a98c12e;hb=575bbaf976c5840fd0e308549c45a466fdec1352;hp=4e76d791887235ddb2ca095ab7e65b7c95936ed1;hpb=7b4e5943c4d8da20e6bfcc6517749108e88aa7a5;p=fw%2Faltos

diff --git a/Releasing b/Releasing
index 4e76d791..1711779d 100644
--- a/Releasing
+++ b/Releasing
@@ -1,7 +1,5 @@
 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
@@ -10,24 +8,26 @@ These are Bdale's notes on how to do a release.
 	  will be pulled in automatically)
 
 	- update the version in configure.ac
-	- make absolutely sure checked-out tree is "clean" (commit as needed)
+        git log > ChangeLog
+	git commit -a
+
+	- make absolutely sure checked-out tree is "clean" 
+	- make absolutely sure the pdclib/ submodule is on the master branch,
+	  up to date, and "clean"
+
 	- 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
 
-        git log > ChangeLog
-	git commit -a
-
-	git tag -a <version>
+	- edit .git/gbp.conf to use branch-<version> as upstream if needed
 
 	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
@@ -35,12 +35,12 @@ These are Bdale's notes on how to do a release.
         git commit -n debian/changelog -m "update changelog for Debian build"
 
 	- if this is a -1 release, then
-		git-buildpackage --git-no-pristine-tar 
+		git-buildpackage --git-no-pristine-tar --git-submodules
 		pristine-tar commit \
 			../build-area/altos/altos_<version>.orig.tar.gz \
 			branch-<version>
 	  else if this is not a -1 release
-		git-buildpackage
+		git-buildpackage --git-submodules
 
 	git tag debian/<version>