Merge branch 'branch-1.6' into debian

diff --combined Releasing
index 611fd88353523858f9b26c41601d0858ba70cb1a,e482d71b9b658ec1773cd3bb3defaedb89d5fc04..a570645a860ab67252902115ca349ce33c9f3a03
--- 1/Releasing
--- 2/Releasing
+++ b/Releasing
@@@ -5,6 -5,8 +5,8 @@@ These are Bdale's notes on how to do a 
  
        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,8 -21,6 +21,6 @@@
                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
@@@ -40,19 -40,19 +40,19 @@@
  
        - 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 --new-version=<version>-1 --multimaint-merge
  
          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,7 -70,6 +70,7 @@@
        # 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 \
@@@ -78,7 -77,6 +78,7 @@@
           ~/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 \
@@@ -90,8 -88,6 +90,8 @@@
        - copy the relevant release notes 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