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

diff --git a/Releasing b/Releasing
index 973cb01f..1c8bd2a1 100644
--- a/Releasing
+++ b/Releasing
@@ -10,17 +10,21 @@ These are Bdale's notes on how to do a release.
 	- update the version in configure.ac
         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>
+		- edit .git/gbp.conf to use branch-<version> as upstream
+
 	- 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 checkout debian
 	git merge branch-<version>
 
@@ -31,12 +35,14 @@ 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 \
+			--git-upstream-branch=branch-<version> \ # eg 1.3
+			--git-upstream-tag=<version>	         # eg 1.3.1
 		pristine-tar commit \
-			../build-area/altos/altos_<version>.orig.tar.gz \
+			../build-area/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>
 
@@ -53,16 +59,20 @@ These are Bdale's notes on how to do a release.
 	- copy the relevant release notes file from doc/ to 
 	    /home/bdale/web/altusmetrum/AltOS/releases/<rev>
 
-	- go edit ~/web/altusmetrum/AltOS/releases/<rev>.mdwn to include
-	  release date and explicit ref to dir contents so the AltOS page
-	  shows versioned links, commit and push
+	- create /home/bdale/web/altusmetrum/MicroPeak/releases/<rev>,
+	  and move the MicroPeak installers from AltOS/releases to there
+		
+	- go edit ~/web/altusmetrum/AltOS/releases/<rev>.mdwn and 
+	  /home/bdale/web/altusmetrum/MicroPeak/releases/<rev>.mdwn, to 
+	  include release date and explicit ref to dir contents so the 
+	  web pages shows versioned links, commit and push
 
 	(cd doc ; make publish)
 
 		this pushes fresh documents to the web site
 
 	sudo debian/rules clean
-	git push origin master branch-1.1 debian
+	git push origin master branch-<version> debian pristine-tar
 	git push --tags
 
 		push commits and leave the build tree in an uncluttered state