aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-05-16 16:47:06 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-05-16 16:47:06 -0300
commitb19b9318d0fe0de9444dda6856a17384b8b9450d (patch)
tree26ed0eb9ab0ff54a70d6252dd35ca7f7e5cb5e6a
parente32a1a5bc4d7331e129df173260fc754ff20c0da (diff)
parent4edea3d52e0c04651508fba9bae6ed0d81ccaa01 (diff)
downloadkeyringer-b19b9318d0fe0de9444dda6856a17384b8b9450d.tar.gz
keyringer-b19b9318d0fe0de9444dda6856a17384b8b9450d.tar.bz2
Merge branch 'release/0.3.4' into develop
-rw-r--r--ChangeLog2
-rw-r--r--development.mdwn7
-rwxr-xr-xkeyringer2
3 files changed, 7 insertions, 4 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/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:
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"