Merge tag 'upstream_keyringer_0.4.1' into debian

Upstream version 0.4.1

7 files changed, 36 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 5bd3530..45bae61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-11-17 - 0.4.1 - Silvio Rhatto <rhatto@riseup.net>
+
+	Adds sclip into completions
+
+	Manpage: sclip action
+
+	Updates develop docs
+
 2016-11-09 - 0.4.0 - Silvio Rhatto <rhatto@riseup.net>
 
 	Adopts Semantic Versioning
@@ -12,12 +20,12 @@
 
 	Slightly more interactive keyringer_get_file
 
-	Updates URLs and static site generation.
+	Updates URLs and static site generation
 
 2015-03-30 - 0.3.8 - Silvio Rhatto <rhatto@riseup.net>
 
 	Eliminates hardcoded bash path, reported and fixed by
-	polynomial (closes https://github.com/rhatto/keyringer/pull/1).
+	polynomial (closes https://github.com/rhatto/keyringer/pull/1)
 
 	Rename genpair action and option (#69)
 
diff --git a/development.mdwn b/development.mdwn
index 49a224c..3a1ed34 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -31,7 +31,7 @@ Create and upload a new release:
 
 Tag the release:
 
-    git tag -s $(VERSION) -m "Keyringer $(VERSION)"
+    git tag -s $VERSION -m "Keyringer $VERSION"
 
 Update the debian branch:
 
@@ -47,8 +47,11 @@ Build the package from the debian Git branch:
 
 Run lintian (or [add it to your pbuilder hooks](http://askubuntu.com/questions/140697/how-do-i-run-lintian-from-pbuilder-dist)):
 
-    lintian --info --display-info --pedantic --color auto \
-     ../build-area/keyringer_$VERSION*.changes
+    lintian --info --display-info --pedantic --color auto build-area/keyringer_$VERSION*.changes
+
+Then go back to the develop branch:
+
+    git checkout develop
 
 Notes:
 
diff --git a/keyringer b/keyringer
index a5ecd67..84b25a4 100755
--- a/keyringer
+++ b/keyringer
@@ -140,7 +140,7 @@ function keyringer_dispatch {
 
 # Config
 NAME="keyringer"
-KEYRINGER_VERSION="0.4.0"
+KEYRINGER_VERSION="0.4.1"
 CONFIG_VERSION="0.1"
 CONFIG_BASE="$HOME/.$NAME"
 CONFIG="$CONFIG_BASE/config"
diff --git a/lib/keyringer/completions/bash/keyringer b/lib/keyringer/completions/bash/keyringer
index fc952eb..ccc8fb9 100644
--- a/lib/keyringer/completions/bash/keyringer
+++ b/lib/keyringer/completions/bash/keyringer
@@ -93,7 +93,7 @@ _keyringer() {
       recipients)
         opts="ls edit"
         ;;
-      ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open|clip|xclip|find|mv|cp)
+      ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open|clip|xclip|sclip|find|mv|cp)
         cur="`echo ${cur} | sed -e "s|^/*||"`" # avoid leading slash
         opts="$(bash -c "set -f && export KEYRINGER_CHECK_RECIPIENTS=false && export KEYRINGER_CHECK_VERSION=false && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
         ;;
diff --git a/lib/keyringer/completions/zsh/_keyringer b/lib/keyringer/completions/zsh/_keyringer
index d4b89b1..ff74933 100644
--- a/lib/keyringer/completions/zsh/_keyringer
+++ b/lib/keyringer/completions/zsh/_keyringer
@@ -49,7 +49,7 @@ _keyringer() {
           recipients)
             compadd "$@" ls edit
             ;;
-          ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open|clip|xclip|find|mv|cp)
+          ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open|clip|xclip|sclip|find|mv|cp)
             words[4]="`echo $words[4] | sed -e "s|^/*||"`" # avoid leading slash
             compadd "$@" $(KEYRINGER_CHECK_RECIPIENTS=false KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[4]'*' 2> /dev/null)
             ;;
diff --git a/share/man/keyringer.1 b/share/man/keyringer.1
index 39669b6..74bcf1f 100644
--- a/share/man/keyringer.1
+++ b/share/man/keyringer.1
@@ -240,6 +240,17 @@ password\-store convention.
 Alias to clip action.
 .RS
 .RE
+.TP
+.B sclip <\f[I]secret\f[]>
+Same as clip action, but sleeps five seconds, overwrite clipboard and
+exit.
+If xdotool is available, it also switchs to the next window using the
+alt+Tab shortcut.
+This action is useful to be invoked by a custom key combo in a window
+manager so it becomes easy to provide keyringer managed passphrases to
+other applications such as a web browser.
+.RS
+.RE
 .SH CONFIGURATION ACTIONS
 .TP
 .B commands
diff --git a/share/man/keyringer.1.mdwn b/share/man/keyringer.1.mdwn
index 55ae216..8f024d1 100644
--- a/share/man/keyringer.1.mdwn
+++ b/share/man/keyringer.1.mdwn
@@ -174,6 +174,12 @@ clip <*secret*>
 xclip <*secret*>
 :   Alias to clip action.
 
+sclip <*secret*>
+:   Same as clip action, but sleeps five seconds, overwrite clipboard and exit. If xdotool
+    is available, it also switchs to the next window using the alt+Tab shortcut. This action
+    is useful to be invoked by a custom key combo in a window manager so it becomes easy to
+    provide keyringer managed passphrases to other applications such as a web browser.
+
 # CONFIGURATION ACTIONS
 
 commands