update Releasing for non-native versioning and builds on debian branch

[fw/altos] / Releasing

diff --git a/Releasing b/Releasing
index 3307b5351740098c7f209bcac551f25d8a663d52..1944507e29cbe75c1f9ea765bb2485f703a3d2be 100644 (file)
--- a/Releasing
+++ b/Releasing
@@ -1,15 +1,35 @@
 These are Bdale's notes on how to do a release.
 
-       update the version in configure.ac and commit
+       git checkout master
+       - update the version in configure.ac
+        git log > ChangeLog
+       git commit -a
+       - make absolutely sure checked-out tree is "clean" 
+       - 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
 
-       git tag -a <version>
+       - edit .git/gbp.conf to use branch-<version> as upstream if needed
 
-       git-buildpackage --git-ignore-new
+       git checkout debian
+       git merge branch-<version>
 
-               use --git-ignore-new so trash in checked-out tree doesn't
-               cause the build to fail!
+       - 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
 
-               at this point, we have Debian packages
+        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
+       git tag debian/<version>
+
+       - at this point we have packages in ~/debian/build-area/altos, now
+         we move on to the non-Debian part of the release process
 
        make distclean
 
@@ -18,6 +38,9 @@ These are Bdale's notes on how to do a release.
 
                this pushes packages for each platform to web site
 
+       - copy the relevant release notes file from doc/ to 
+           /home/bdale/web/altusmetrum/AltOS/releases/<rev>
+
        - 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
@@ -26,6 +49,12 @@ 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 --tags
+
+               push commits and leave the build tree in an uncluttered state
+
 Testing before a release
 
        To verify that a build works, the following need to be checked