summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile3
-rwxr-xr-xkeyringer2
-rw-r--r--share/man/keyringer.13
4 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8159c84..7e946d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-2013-09-29 Silvio Rhatto <rhatto@riseup.net>
+2013-10-04 - 0.2.6 Silvio Rhatto <rhatto@riseup.net>
+
+ Removing debian specifics from the master branch (#1)
Minor fixes
diff --git a/Makefile b/Makefile
index 0379ea0..374579c 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
#
PACKAGE = keyringer
-VERSION = 0.2.5
+VERSION = 0.2.6
PREFIX ?= /usr/local
INSTALL = /usr/bin/install
@@ -51,3 +51,4 @@ 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/keyringer b/keyringer
index 5875723..a4e8b2c 100755
--- a/keyringer
+++ b/keyringer
@@ -111,7 +111,7 @@ function keyringer_dispatch {
# Config
NAME="keyringer"
-KEYRINGER_VERSION="0.2.5"
+KEYRINGER_VERSION="0.2.6"
CONFIG_VERSION="0.1"
CONFIG_BASE="$HOME/.$NAME"
CONFIG="$CONFIG_BASE/config"
diff --git a/share/man/keyringer.1 b/share/man/keyringer.1
index 9b0f686..9b6a2f5 100644
--- a/share/man/keyringer.1
+++ b/share/man/keyringer.1
@@ -54,6 +54,8 @@ the pathname of an encrypted file relative to keyring with optional
If the \f[C]\&.asc\f[] extension is ommited, keyringer will add it in
the end of the pathname.
.PP
+No spaces are allowed in the secret name.
+.PP
Secret manipulation actions do not commit changes into the secret
repository.
After any manipulation, the user has to manually commit the changes
@@ -78,6 +80,7 @@ opening the decrypted copy into the text editor defined by the
.PP
encrypt [\f[I]file\f[]] <\f[I]secret\f[]> : Encrypts content from
standard input or \f[I]file\f[] into \f[I]secret\f[] pathname.
+No spaces are supported in the \f[I]file\f[] name.
.PP
encrypt-batch <\f[I]secret\f[]> : Encrypt content, batch mode.
.PP