X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=Releasing;h=fdd681bdf59184f81325495c922a651f05f11302;hp=537388fda7b6298fedd418aa1d86d879c312f2a0;hb=1d421a43494cf2003ac23fb8cd21d6ae05edfac8;hpb=eefcfa94f360f8c5a7233370d4178525bccbb22f

diff --git a/Releasing b/Releasing
index 537388fd..fdd681bd 100644
--- a/Releasing
+++ b/Releasing
@@ -1,20 +1,31 @@
 These are Bdale's notes on how to do a release.
 
 	git checkout master
+
+	- make sure there is a doc/release-notes-<version>.xsl
+	- make sure that doc/altusmetrum.xsl has the right copyright year,
+	  and add release to the revision history at the front (release notes
+	  will be pulled in automatically)
+	- do the same for doc/micropeak.xsl
+
 	- 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>
 
@@ -24,8 +35,16 @@ These are Bdale's notes on how to do a release.
 
         git commit -n debian/changelog -m "update changelog for Debian build"
 
-	git-buildpackage --git-no-pristine-tar 
-	pristine-tar commit ../build-area/altos/altos_<version>.orig.tar.gz
+	- if this is a -1 release, then
+		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_<version>.orig.tar.gz \
+			branch-<version>
+	  else if this is not a -1 release
+		git-buildpackage --git-submodules
+
 	git tag debian/<version>
 
 	- at this point we have packages in ~/debian/build-area/altos, now
@@ -41,20 +60,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>
 
-	- make sure that doc/altusmetrum.xsl has the right copyright year,
-	  and add release to the revision history at the front (release notes
-	  will be pulled in automatically)
-
-	- 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
+	git push origin master branch-<version> debian pristine-tar
 	git push --tags
 
 		push commits and leave the build tree in an uncluttered state