Merge branch 'branch-1.4' into debian

[fw/altos] / Releasing

diff --git a/Releasing b/Releasing
index 1822efbe9d29cf87f30764f0e37cbbd0f6f6a194..c04a1de84e2b34121bf02f1dc58985c54bf50063 100644 (file)
--- a/Releasing
+++ b/Releasing
@@ -2,34 +2,35 @@ These are Bdale's notes on how to do a release.
 
        git checkout master
 
 
        git checkout 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 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 \
+               /var/cache/pbuilder/base.cow/opt/google/maps-api-key
+           sudo ln -sf /home/bdale/altusmetrumllc/google-maps-api-key \
+               /opt/google/maps-api-key

 
 

-       - get a Google Maps API key and install it in
-          ~/altusmetrumllc/google-maps-api-key. If you don't have a
-          key, the app will still work, but downloading map tiles will
-          be slow, and you will only be able to download a limited
-          number per day.
+       - if this is an x.y release, then:
+               git checkout -b branch-<version>

 
 

+       - if this is an x.y.z release, then:
+               git checkout branch-<version>           # the x.y parts only
+               - cherry-pick or merge appropriate content from master
+       

        - update the version in configure.ac
        - update the version in configure.ac

-        git log > ChangeLog
-       git commit -a

 
 

+       - 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 absolutely sure checked-out tree is "clean" 
        - make absolutely sure the pdclib/ submodule is on the master branch,
          up to date, and "clean"
 
        - 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>
-               - edit .git/gbp.conf to use branch-<version> as upstream
+        git log > ChangeLog
+       git commit -a
+       git tag -a <version>                    # full x.y.z version

 
 

-       - if this is an x.y.z release, then:
-               git checkout branch-<version>           # the x.y parts only
-               git merge master
-               git tag -a <version>                    # full x.y.z version
+       - make sure .git/gbp.conf set to use branch-<version> as upstream

 
        git checkout debian
        git merge branch-<version>
 
        git checkout debian
        git merge branch-<version>


@@ -73,7 +74,7 @@ These are Bdale's notes on how to do a release.
           src/telemega-v1.0/flash-loader/*.elf \
           src/telemetrum-v2.0/flash-loader/*.elf \
           ~/altusmetrumllc/Binaries/loaders/
           src/telemega-v1.0/flash-loader/*.elf \
           src/telemetrum-v2.0/flash-loader/*.elf \
           ~/altusmetrumllc/Binaries/loaders/

-       (cd ~/altusmetrumllc ; git commit -a) 
+       (cd ~/altusmetrumllc ; git add Binaries ; git commit -a) 

 
        - copy the relevant release notes file from doc/ to 
            /home/bdale/web/altusmetrum/AltOS/releases/<rev>
 
        - copy the relevant release notes file from doc/ to 
            /home/bdale/web/altusmetrum/AltOS/releases/<rev>


@@ -81,8 +82,12 @@ These are Bdale's notes on how to do a release.
        - create /home/bdale/web/altusmetrum/MicroPeak/releases/<rev>,
          and move the MicroPeak installers from AltOS/releases to there
                
        - create /home/bdale/web/altusmetrum/MicroPeak/releases/<rev>,
          and move the MicroPeak installers from AltOS/releases to there
                

-       - go edit ~/web/altusmetrum/AltOS/releases/<rev>.mdwn and 
-         /home/bdale/web/altusmetrum/MicroPeak/releases/<rev>.mdwn, to 
+       - create /home/bdale/web/altusmetrum/TeleGPS/releases/<rev>,
+         and move the MicroPeak installers from AltOS/releases to there
+               
+       - go edit ~/web/altusmetrum/AltOS/releases/<rev>.mdwn, 
+         /home/bdale/web/altusmetrum/MicroPeak/releases/<rev>.mdwn, and
+         /home/bdale/web/altusmetrum/TeleGPS/releases/<rev>.mdwn, to 

          include release date and explicit ref to dir contents so the 
          web pages shows versioned links, commit and push
 
          include release date and explicit ref to dir contents so the 
          web pages shows versioned links, commit and push