Adding 'release' Makefile target for a cleaner workflow

diff --git a/Makefile b/Makefile
index 8ec01c257ee4bbd59afd6a9f5884837f058d689d..360bd29e05a03dbb32372db74e4647da90cbc820 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,3 +52,11 @@ build_man:
 
 tarball:
        git archive --prefix=keyringer-$(VERSION)/ --format=tar HEAD | bzip2 >../tarballs/keyringer-$(VERSION).tar.bz2
+
+release:
+       @make build_man
+       git commit -a -m "Keyringer $(VERSION)"
+       git tag -s $(VERSION) -m "Keyringer $(VERSION)"
+       @make tarball
+       gpg --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/

diff --git a/development.mdwn b/development.mdwn
index cfedb4b1bbeddf8cbdfce5b33b13cc46f5be6f9c..3400643a88f8dc70874bff724682bbae06843306 100644 (file)
--- a/development.mdwn
+++ b/development.mdwn
@@ -48,27 +48,11 @@ Prepare the source code:
 
     $EDITOR keyringer # and update KEYRINGER_VERSION
     $EDITOR ChangeLog
-    make build_man
-
-Commit and tag a release:
-
     VERSION="`./keyringer | head -n 1 | cut -d ' ' -f 2`"
-    git commit -a -m "Keyringer $VERSION"
-    git tag -s $VERSION -m "Keyringer $VERSION"
-
-Create a release file:
-
-    make tarball
-
-Sign the release ([see backupninja development guidelines](https://labs.riseup.net/code/projects/backupninja/wiki/Release)):
-
-    cd ../tarballs
-    gpg --armor --detach-sign keyringer-$VERSION.tar.bz2
 
-Upload the release:
+Create and upload a new release:
 
-    scp keyringer-$VERSION.tar.bz2* keyringer:/var/sites/keyringer/releases/
-    cd -
+    make release
 
 Update the debian branch: