Merge branch 'branch-1.3' into debian

Conflicts:
	ChangeLog
	altoslib/AltosRecordMM.java
	altosui/Makefile.am
	altosui/altos-windows.nsi.in
	configure.ac
	debian/changelog
	debian/control
	doc/Makefile
	doc/altusmetrum.xsl
	doc/release-notes-1.2.1.xsl
	doc/release-notes-1.2.xsl

1 files changed, 6 insertions, 4 deletions

diff --git a/Releasing b/Releasing
index ce4df7c2..1711779d 100644
--- a/Releasing
+++ b/Releasing
@@ -1,7 +1,5 @@
 These are Bdale's notes on how to do a release.
 
-	- make sure there's a suitable ARM Cortex toolchain in /opt/cortex!
-
 	git checkout master
 
 	- make sure there is a doc/release-notes-<version>.xsl
@@ -12,7 +10,11 @@ These are Bdale's notes on how to do a release.
 	- 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>
@@ -33,12 +35,12 @@ These are Bdale's notes on how to do a release.
         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-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-buildpackage --git-submodules
 
 	git tag debian/<version>