diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | development.mdwn | 4 | ||||
| -rwxr-xr-x | keyringer | 2 | ||||
| -rwxr-xr-x | lib/keyringer/functions | 1 |
5 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,7 @@ +2013-11-14 - 0.2.8 Silvio Rhatto <rhatto@riseup.net> + + Updated development workflow and version scheme + 2013-11-14 - 0.2.7 Silvio Rhatto <rhatto@riseup.net> Ramdisk check for temporary folders (closes #13) @@ -15,7 +15,7 @@ # PACKAGE = keyringer -VERSION = 0.2.6 +VERSION = $(shell ./keyringer | head -n 1 | cut -d ' ' -f 2) PREFIX ?= /usr/local INSTALL = /usr/bin/install @@ -49,4 +49,3 @@ build_man: tarball: git archive --prefix=keyringer-$(VERSION)/ --format=tar HEAD | bzip2 >../tarballs/keyringer-$(VERSION).tar.bz2 - #cd ../tarballs && ln -s keyringer-$(VERSION).tar.bz2 keyringer-$(VERSION).orig.tar.bz2 diff --git a/development.mdwn b/development.mdwn index 26a865c..cfedb4b 100644 --- a/development.mdwn +++ b/development.mdwn @@ -46,12 +46,13 @@ Go to master branch Prepare the source code: + $EDITOR keyringer # and update KEYRINGER_VERSION $EDITOR ChangeLog make build_man Commit and tag a release: - VERSION="X.Y.Z" + VERSION="`./keyringer | head -n 1 | cut -d ' ' -f 2`" git commit -a -m "Keyringer $VERSION" git tag -s $VERSION -m "Keyringer $VERSION" @@ -74,6 +75,7 @@ Update the debian branch: git checkout debian git-import-orig --upstream-vcs-tag=$VERSION ../tarballs/keyringer-$VERSION.tar.bz2 dch -e # fine tune the changelog prepared by git-dch + git commit -a -m "Updating debian/changelog" Push everything: @@ -119,7 +119,7 @@ function keyringer_dispatch { # Config NAME="keyringer" -KEYRINGER_VERSION="0.2.6" +KEYRINGER_VERSION="0.2.8" CONFIG_VERSION="0.1" CONFIG_BASE="$HOME/.$NAME" CONFIG="$CONFIG_BASE/config" diff --git a/lib/keyringer/functions b/lib/keyringer/functions index 7570a94..4c06198 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -482,6 +482,7 @@ function keyringer_show_actions { function keyringer_usage { local keyrings="$(ls --color=never `dirname $CONFIG` | sed -e 's/config//' | xargs)" + printf "Keyringer $KEYRINGER_VERSION\n" printf "Usage: %s <keyring> <action> [arguments]\n\n" "$BASENAME" printf "Available commands: \n\n" keyringer_show_actions | sed -e 's/^/\t/' |