aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-11-14 19:02:43 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-11-14 19:02:43 -0200
commitf645c1bcad9f038a99961436391bf158bac36ef3 (patch)
tree724fc1e6dd00cc3eeace501f06f8d9ed89e88f08
parent19b551ec87e250781c8be809c84ad930954bb3e6 (diff)
parenta706c54574b389c3e2f74ff487b1b7ca42483dc3 (diff)
downloadkeyringer-f645c1bcad9f038a99961436391bf158bac36ef3.tar.gz
keyringer-f645c1bcad9f038a99961436391bf158bac36ef3.tar.bz2
Merge tag 'upstream_keyringer_0.2.8' into debian
Upstream version 0.2.8
-rw-r--r--ChangeLog4
-rw-r--r--Makefile3
-rw-r--r--development.mdwn4
-rwxr-xr-xkeyringer2
-rwxr-xr-xlib/keyringer/functions1
5 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b66f924..69d58bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
diff --git a/Makefile b/Makefile
index 7d734ff..0d2ef3a 100644
--- a/Makefile
+++ b/Makefile
@@ -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:
diff --git a/keyringer b/keyringer
index 7aad6a0..bdb1f6c 100755
--- a/keyringer
+++ b/keyringer
@@ -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/'