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

diff --git a/Releasing b/Releasing
index f374fa00..7a87a48b 100644
--- a/Releasing
+++ b/Releasing
@@ -5,7 +5,10 @@ These are Bdale's notes on how to do a release.
 
 	git checkout master
 
+	- 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
@@ -19,12 +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
 	
-	- update the version in configure.ac
-
-	- 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,19 +41,19 @@ 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:
-	git-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"
 
 	- if this is a -1 release, then
-		git-buildpackage --git-no-pristine-tar --git-submodules \
+		gbp buildpackage --git-no-pristine-tar --git-submodules \
 			--git-upstream-branch=branch-<version> \ # eg 1.3
 			--git-upstream-tag=<version>	         # eg 1.3.1
 		pristine-tar commit \
 			../build-area/altos_<version>.orig.tar.gz \
 			branch-<version>
 	  else if this is not a -1 release
-		git-buildpackage --git-submodules
+		gbp buildpackage --git-submodules
 
 	git tag debian/<version>
 
@@ -70,24 +71,30 @@ These are Bdale's notes on how to do a release.
 	# store a stable copy of ARM binaries for production use
 	cp src/easymega-v1.0/*.elf \
 	   src/easymini-v1.0/*.elf \
+	   src/telebt-v3.0/*.elf \
 	   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 \
 	   src/easymini-v1.0/flash-loader/*.elf \
+	   src/telebt-v3.0/flash-loader/*.elf \
 	   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)
+
 	- create /home/bdale/web/altusmetrum/MicroPeak/releases/<rev>,
 	  and move the MicroPeak installers from AltOS/releases to there