From 1341798ac180a59c6f7cbfa80bbd50ab28c3eb9e Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 3 Oct 2013 18:05:23 -0300 Subject: Commenting the navbar --- templates/page.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/page.tmpl b/templates/page.tmpl index bc99f64..1fdd539 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -44,6 +44,7 @@ +
-- cgit v1.2.3 From c09eae520e519861bf29508e06a465b3a62e6449 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 3 Oct 2013 18:06:54 -0300 Subject: Adding TOC to README --- index.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.mdwn b/index.mdwn index 44e4632..34c89cd 100644 --- a/index.mdwn +++ b/index.mdwn @@ -9,6 +9,8 @@ commands to encrypt, decrypt, recrypt, create key pairs, etc. - Releases: [https://keyringer.pw/releases](releases) - Contact: rhatto at riseup.net +[[!toc levels=4]] + Installation ------------ -- cgit v1.2.3 From 842a3528a1f966132e8c00d759ac1adc80b5ea83 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 3 Oct 2013 18:07:41 -0300 Subject: Adding TOC to README (2) --- index.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.mdwn b/index.mdwn index 34c89cd..5985cf6 100644 --- a/index.mdwn +++ b/index.mdwn @@ -9,6 +9,9 @@ commands to encrypt, decrypt, recrypt, create key pairs, etc. - Releases: [https://keyringer.pw/releases](releases) - Contact: rhatto at riseup.net +Index +----- + [[!toc levels=4]] Installation -- cgit v1.2.3 From 385808dae0bf04b65e791717ae709ddb094c1328 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 3 Oct 2013 18:25:52 -0300 Subject: Updating development guidelines for a pure pristine-tar build --- Makefile | 4 ---- development.mdwn | 27 ++++++++++----------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 5a84ffe..0379ea0 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,3 @@ build_man: tarball: git archive --prefix=keyringer-$(VERSION)/ --format=tar HEAD | bzip2 >../tarballs/keyringer-$(VERSION).tar.bz2 - -dh: - #dh_make -f ../tarballs/keyringer-$(VERSION).tar.bz2 -i -p keyringer_$(VERSION) - git archive --prefix=keyringer-$(VERSION)/ --format=tar HEAD | bzip2 >../tarballs/keyringer_$(VERSION).orig.tar.bz2 diff --git a/development.mdwn b/development.mdwn index 1313e9a..d312bf2 100644 --- a/development.mdwn +++ b/development.mdwn @@ -44,29 +44,15 @@ Prepare the source code: $EDITOR ChangeLog make build_man -Update debian changelog: - - cd debian - dch -i - cd - - Commit and tag a release: git commit -a -m "Keyringer $VERSION" git tag -s $VERSION -m "Keyringer $VERSION" - git checkout upstream - git merge master - git checkout debian - git merge upstream Create a release file: make tarball -Generate a `keyringer_VERSION.orig.tar.bz2` file: - - make dh - Sign the release ([see backupninja development guidelines](https://labs.riseup.net/code/projects/backupninja/wiki/Release)): cd ../tarballs @@ -77,15 +63,17 @@ Upload the release: scp keyringer-$VERSION.tar.bz2* server:/var/sites/keyringer/releases/ cd - -Add the release into the `pristine-tar` branch: +Update the debian branch: - pristine-tar commit ../tarballs/keyringer_$VERSION.orig.tar.bz2 $VERSION + 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 Push everything: git push --tags -Build the package from the git three using the upstream branch: +Build the package from the debian Git branch: git-buildpackage @@ -94,6 +82,11 @@ Run lintian (or [add it to your pbuilder hooks](http://askubuntu.com/questions/1 lintian --info --display-info --pedantic --color auto \ ../build-area/keyringer_$VERSION*.changes +Notes: + +* `git-import-orig` takes care of running `pristine-tar commit`, of merging of the tag and orig tarball into the upstream branch, and then it merges the result into the debian branch. With the above configuration, it also runs git-dch to do the bulk of the work in `debian/changelog`. +* To build a development package, checkout the debian branch, merge master, run `git-dch --auto --snapshot` and build. + Adding a subcommand ------------------- -- cgit v1.2.3 From 6799fd6ea063e910fef1c03c72aa664ee29875c9 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 4 Oct 2013 13:02:33 -0300 Subject: Keyringer 0.2.6 --- ChangeLog | 4 +++- Makefile | 3 ++- keyringer | 2 +- share/man/keyringer.1 | 3 +++ 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 +2013-10-04 - 0.2.6 Silvio Rhatto + + 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 -- cgit v1.2.3