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

diff --git a/Releasing b/Releasing
index 537388fd..1711779d 100644
--- a/Releasing
+++ b/Releasing
@@ -1,10 +1,20 @@
 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)
+
 	- 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>
@@ -24,8 +34,14 @@ 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
+		pristine-tar commit \
+			../build-area/altos/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,10 +57,6 @@ 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
@@ -54,7 +66,7 @@ These are Bdale's notes on how to do a release.
 		this pushes fresh documents to the web site
 
 	sudo debian/rules clean
-	git push
+	git push origin master branch-1.1 debian
 	git push --tags
 
 		push commits and leave the build tree in an uncluttered state