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

diff --git a/Releasing b/Releasing
index 4d2f8e71..1711779d 100644
--- a/Releasing
+++ b/Releasing
@@ -1,21 +1,56 @@
 These are Bdale's notes on how to do a release.
 
-	update the version in configure.ac and commit
+	git checkout master
 
-	git tag -a <version>
+	- 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)
 
-	- make sure checked-out tree is "clean" so git won't complain
+	- update the version in configure.ac
+        git log > ChangeLog
+	git commit -a
 
-	git-buildpackage
+	- make absolutely sure checked-out tree is "clean" 
+	- make absolutely sure the pdclib/ submodule is on the master branch,
+	  up to date, and "clean"
 
-		at this point, we have Debian packages
+	- 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 checkout debian
+	git merge branch-<version>
+
+	- 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
+
+        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-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
+	  we move on to the non-Debian part of the release process
+
 	make distclean
 
 	./autogen.sh --with-fat-dir=/home/bdale/web/altusmetrum/AltOS/releases
-	make fat
+	make && make fat
 
 		this pushes packages for each platform to web site
 
@@ -31,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