update Releasing document to reflect process as of 1.2

[fw/altos] / Releasing

diff --git a/Releasing b/Releasing
index 537388fda7b6298fedd418aa1d86d879c312f2a0..4e76d791887235ddb2ca095ab7e65b7c95936ed1 100644 (file)
--- a/Releasing
+++ b/Releasing
@@ -1,31 +1,47 @@
 These are Bdale's notes on how to do a release.
 
+       - make sure there's a suitable ARM Cortex toolchain in /opt/cortex!
+
        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)
+
        - update the version in configure.ac
-        git log > ChangeLog
-       git commit -a
-       - make absolutely sure checked-out tree is "clean" 
+       - make absolutely sure checked-out tree is "clean" (commit as needed)
        - if this is an x.y release, then:
                git checkout -b branch-<version>
-               git tag -a <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
 
-       - edit .git/gbp.conf to use branch-<version> as upstream if needed
+        git log > ChangeLog
+       git commit -a
+
+       git tag -a <version>
 
        git checkout debian
        git merge branch-<version>
 
+       - edit .git/gbp.conf to use branch-<version> as upstream and debian
+         as packaging branch, if needed
+
        - 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
 
         git commit -n debian/changelog -m "update changelog for Debian build"
 
-       git-buildpackage --git-no-pristine-tar 
-       pristine-tar commit ../build-area/altos/altos_<version>.orig.tar.gz
+       - if this is a -1 release, then
+               git-buildpackage --git-no-pristine-tar 
+               pristine-tar commit \
+                       ../build-area/altos/altos_<version>.orig.tar.gz \
+                       branch-<version>
+         else if this is not a -1 release
+               git-buildpackage
+
        git tag debian/<version>
 
        - at this point we have packages in ~/debian/build-area/altos, now
@@ -41,10 +57,6 @@ These are Bdale's notes on how to do a release.
        - copy the relevant release notes file from doc/ to 
            /home/bdale/web/altusmetrum/AltOS/releases/<rev>
 
-       - 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)
-
        - go edit ~/web/altusmetrum/AltOS/releases/<rev>.mdwn to include
          release date and explicit ref to dir contents so the AltOS page
          shows versioned links, commit and push
@@ -54,7 +66,7 @@ These are Bdale's notes on how to do a release.
                this pushes fresh documents to the web site
 
        sudo debian/rules clean
-       git push
+       git push origin master branch-1.1 debian
        git push --tags
 
                push commits and leave the build tree in an uncluttered state