releasing 1.4.1

diff --git a/Releasing b/Releasing
index 8c1787ee35574380e2268499b243eb6562720a1c..c04a1de84e2b34121bf02f1dc58985c54bf50063 100644 (file)
--- a/Releasing
+++ b/Releasing
@@ -3,40 +3,34 @@ These are Bdale's notes on how to do a release.
        git checkout master
 
        - make sure the Google Maps API key is in the build chroot and root
-               mkdir -p /var/cache/pbuilder/base.cow/opt/google /opt/google
-               cp ~/altusmetrumllc/google-maps-api-key \
-                       /var/cache/pbuilder/base.cow/opt/google/maps-api-key
-               ln -sf /home/bdale/altusmetrumllc/google-maps-api-key \
-                       /opt/google/maps-api-key
+           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
+
+       - 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
 
        - 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)
-
-       - 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.
-
-       - update the version in configure.ac
-        git log > ChangeLog
-       git commit -a
-
        - 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>

diff --git a/configure.ac b/configure.ac
index 23dc9d822b20530358a8a9c757b73d3221eb6308..fdae9b6fdce54d559d37ccbfa3c0b14d86395ded 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 1.4)
+AC_INIT([altos], 1.4.1)
 AC_CONFIG_SRCDIR([src/kernel/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl
index 082271d7765717dc55f7495ffe8497871a3c1846..c68bbac9040b7847fbbdc03688dffad616efd885 100644 (file)
--- a/doc/altusmetrum.xsl
+++ b/doc/altusmetrum.xsl
@@ -42,7 +42,7 @@
     <revhistory>
       <revision>
        <revnumber>1.4.1</revnumber>
-       <date>20 June 2014</date>
+       <date>24 June 2014</date>
        <revremark>
          Minor release fixing some installation bugs.
        </revremark>