Release workflow with git-flow (2)

diff --git a/Makefile b/Makefile
index 42f6d9b9bd7f942f02ee8b2512dafad97667c5da..c94a4b9c923080fc70759f799735b3b17a96eca6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,9 +56,12 @@ tarball:
 release:
        @make build_man
        git commit -a -m "Keyringer $(VERSION)"
+       git flow release finish -s -m "Keyringer $(VERSION)" $(VERSION)
+       git checkout master
        @make tarball
        gpg --use-agent --armor --detach-sign --output ../tarballs/keyringer-$(VERSION).tar.bz2.asc ../tarballs/keyringer-$(VERSION).tar.bz2
        scp ../tarballs/keyringer-$(VERSION).tar.bz2* keyringer:/var/sites/keyringer/releases/
        # We're doing tagging afterwards:
        # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568375
-       git tag -s $(VERSION) -m "Keyringer $(VERSION)"
+       #git tag -s $(VERSION) -m "Keyringer $(VERSION)"
+       git checkout develop

diff --git a/development.mdwn b/development.mdwn
index 67c64567b9509b05b42cc799405f53897c4f630f..3857b3a46f8635a0d5e31c2858cd063d347d5def 100644 (file)
--- a/development.mdwn
+++ b/development.mdwn
@@ -54,7 +54,6 @@ Release workflow
 
 Go to develop branch and start a new release
 
-    git checkout develop
     git flow release start VERSION
 
 Prepare the source code:
@@ -65,8 +64,6 @@ Prepare the source code:
 
 Create and upload a new release:
 
-    git flow release finish $VERSION
-    git checkout master
     make release
 
 Update the debian branch: