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

diff --git a/Releasing b/Releasing
index 4d2f8e71..537388fd 100644
--- a/Releasing
+++ b/Releasing
@@ -1,27 +1,50 @@
 These are Bdale's notes on how to do a release.
 
-	update the version in configure.ac and commit
-
-	git tag -a <version>
-
-	- make sure checked-out tree is "clean" so git won't complain
-
-	git-buildpackage
-
-		at this point, we have Debian packages
-
+	git checkout master
+	- update the version in configure.ac
+        git log > ChangeLog
+	git commit -a
+	- make absolutely sure checked-out tree is "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
+
+	- 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"
+
+	git-buildpackage --git-no-pristine-tar 
+	pristine-tar commit ../build-area/altos/altos_<version>.orig.tar.gz
 	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
 
 	- 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