X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=Releasing;h=7a87a48bc4114d63a7774f713ad96abdaf19b158;hp=a570645a860ab67252902115ca349ce33c9f3a03;hb=1e7143e5d448cd05c355f4a323ae4892b02022ac;hpb=64adfbbb80c90dfe244179d81beaef8a84ed8bd6

diff --git a/Releasing b/Releasing
index a570645a..7a87a48b 100644
--- a/Releasing
+++ b/Releasing
@@ -8,6 +8,7 @@ These are Bdale's notes on how to do a release.
 	- update the version in configure.ac if Keith hasn't already
 
 	- make sure the Google Maps API key is in the build chroot and root
+	    (cd ~/altusmetrumllc; git pull)
 	    sudo mkdir -p /var/cache/pbuilder/base.cow/opt/google /opt/google
 	    sudo cp ~/altusmetrumllc/google-maps-api-key \
 		/var/cache/pbuilder/base.cow/opt/google/maps-api-key
@@ -21,10 +22,10 @@ These are Bdale's notes on how to do a release.
 		git checkout branch-<version>		# the x.y parts only
 		- cherry-pick or merge appropriate content from 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)
+	- make sure there is a doc/release-notes-<version>.inc
+	- make sure that doc/altusmetrum-docinfo.xml has the right copyright 
+	  year, and add release to the revision history at the front (release 
+	  notes will be pulled in automatically)
 	- make absolutely sure checked-out tree is "clean" 
 	- make absolutely sure the pdclib/ submodule is on the master branch,
 	  up to date, and "clean"
@@ -40,7 +41,7 @@ These are Bdale's notes on how to do a release.
 
 	- verify debian/changelog is "clean" ending in last release version
 	- craft a suitable debian/changelog entry, possibly using:
-	gbp dch --release --new-version=<version>-1 --multimaint-merge
+	gbp dch --release --multimaint-merge --new-version=<version>-1 
 
         git commit -n debian/changelog -m "update changelog for Debian build"
 
@@ -74,6 +75,7 @@ These are Bdale's notes on how to do a release.
 	   src/teledongle-v3.0/*.elf \
 	   src/telegps-v1.0/*.elf \
 	   src/telemega-v1.0/*.elf \
+	   src/telemega-v2.0/*.elf \
 	   src/telemetrum-v2.0/*.elf \
 	   ~/altusmetrumllc/Binaries/
 	cp src/easymega-v1.0/flash-loader/*.elf \
@@ -82,12 +84,13 @@ These are Bdale's notes on how to do a release.
 	   src/teledongle-v3.0/flash-loader/*.elf \
 	   src/telegps-v1.0/flash-loader/*.elf \
 	   src/telemega-v1.0/flash-loader/*.elf \
+	   src/telemega-v2.0/flash-loader/*.elf \
 	   src/telemetrum-v2.0/flash-loader/*.elf \
 	   ~/altusmetrumllc/Binaries/loaders/
 	(cd ~/altusmetrumllc ; git add Binaries ; git commit -a) 
 	(cd ~/altusmetrumllc ; git push) 
 
-	- copy the relevant release notes file from doc/ to 
+	- copy the relevant release notes .html file from doc/ to 
 	    /home/bdale/web/altusmetrum/AltOS/releases/<rev>
 
 	(cd ~/web/altusmetrum/AltOS/releases/<rev> ; rm *.tar.bz2)