Merge branch 'branch-1.6' into debian

[fw/altos] / Releasing

diff --git a/Releasing b/Releasing
index 611fd88353523858f9b26c41601d0858ba70cb1a..d95339b51a2e333ff043c496e4d7a919e9fec30e 100644 (file)
--- a/Releasing
+++ b/Releasing
@@ -5,6 +5,8 @@ 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
            sudo mkdir -p /var/cache/pbuilder/base.cow/opt/google /opt/google
            sudo cp ~/altusmetrumllc/google-maps-api-key \
@@ -19,12 +21,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"
@@ -74,6 +74,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 +83,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)