Merge remote-tracking branch 'origin/master' into multiarch

Conflicts:
	configure.ac

Fix version number and location of ao.h header

1 files changed, 13 insertions, 3 deletions

diff --git a/Releasing b/Releasing
index 3307b535..4d2f8e71 100644
--- a/Releasing
+++ b/Releasing
@@ -4,13 +4,14 @@ These are Bdale's notes on how to do a release.
 
 	git tag -a <version>
 
-	git-buildpackage --git-ignore-new
+	- make sure checked-out tree is "clean" so git won't complain
 
-		use --git-ignore-new so trash in checked-out tree doesn't
-		cause the build to fail!
+	git-buildpackage
 
 		at this point, we have Debian packages
 
+	git tag debian/<version>
+
 	make distclean
 
 	./autogen.sh --with-fat-dir=/home/bdale/web/altusmetrum/AltOS/releases
@@ -18,6 +19,9 @@ These are Bdale's notes on how to do a release.
 
 		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>
+
 	- 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
@@ -26,6 +30,12 @@ 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 --tags
+
+		push commits and leave the build tree in an uncluttered state
+
 Testing before a release
 
 	To verify that a build works, the following need to be checked