From 79a87b0e7536299ba49b559e8bcdd0c96291f413 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 16 May 2014 16:43:04 -0300
Subject: Release workflow with git-flow

---
 development.mdwn | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/development.mdwn b/development.mdwn
index 91ddc87..67c6456 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -52,9 +52,10 @@ We use [git-flow](https://github.com/nvie/gitflow) for the development workflow.
 Release workflow
 ----------------
 
-Go to master branch
+Go to develop branch and start a new release
 
-    git checkout master
+    git checkout develop
+    git flow release start VERSION
 
 Prepare the source code:
 
@@ -64,6 +65,8 @@ Prepare the source code:
 
 Create and upload a new release:
 
+    git flow release finish $VERSION
+    git checkout master
     make release
 
 Update the debian branch:
-- 
cgit v1.2.3


From 4edea3d52e0c04651508fba9bae6ed0d81ccaa01 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 16 May 2014 16:46:47 -0300
Subject: Keyringer 0.3.4

---
 ChangeLog | 2 +-
 keyringer | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e4e7ede..aa63787 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2014-05-16 - Silvio Rhatto <rhatto@riseup.net>
+2014-05-16 - 0.3.4 - Silvio Rhatto <rhatto@riseup.net>
 
 	Workaround for open/edit action returning instantaneously (#49)
 
diff --git a/keyringer b/keyringer
index 6a1eda5..e1f405f 100755
--- a/keyringer
+++ b/keyringer
@@ -138,7 +138,7 @@ function keyringer_dispatch {
 
 # Config
 NAME="keyringer"
-KEYRINGER_VERSION="0.3.3"
+KEYRINGER_VERSION="0.3.4"
 CONFIG_VERSION="0.1"
 CONFIG_BASE="$HOME/.$NAME"
 CONFIG="$CONFIG_BASE/config"
-- 
cgit v1.2.3