From 4705d861b56fbec26ac0dee8749b74dade3c25c1 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 14 Nov 2013 19:28:16 -0200
Subject: Avoid hyphen-used-as-minus-sign lintian warning

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0d2ef3a..8ec01c2 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,10 @@ install: clean
 	@make install_lib install_bin install_doc install_man install_completion
 
 build_man:
+	# Pipe output to sed to avoid http://lintian.debian.org/tags/hyphen-used-as-minus-sign.html
+	# Fixed in http://johnmacfarlane.net/pandoc/releases.html#pandoc-1.10-2013-01-19
 	pandoc -s -w man share/man/keyringer.1.mdwn -o share/man/keyringer.1
+	sed -i -e 's/--/\\-\\-/g' share/man/keyringer.1
 
 tarball:
 	git archive --prefix=keyringer-$(VERSION)/ --format=tar HEAD | bzip2 >../tarballs/keyringer-$(VERSION).tar.bz2
-- 
cgit v1.2.3


From 9594510d81e582327b70ab62c9214d5c3cdc41b8 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 26 Nov 2013 13:51:03 -0200
Subject: Adding 'release' Makefile target for a cleaner workflow

---
 Makefile         |  8 ++++++++
 development.mdwn | 20 ++------------------
 2 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8ec01c2..360bd29 100644
--- a/Makefile
+++ b/Makefile
@@ -52,3 +52,11 @@ build_man:
 
 tarball:
 	git archive --prefix=keyringer-$(VERSION)/ --format=tar HEAD | bzip2 >../tarballs/keyringer-$(VERSION).tar.bz2
+
+release:
+	@make build_man
+	git commit -a -m "Keyringer $(VERSION)"
+	git tag -s $(VERSION) -m "Keyringer $(VERSION)"
+	@make tarball
+	gpg --armor --detach-sign --output ../tarballs/keyringer-$(VERSION).tar.bz2.asc ../tarballs/keyringer-$(VERSION).tar.bz2
+	scp ../tarballs/keyringer-$(VERSION).tar.bz2* keyringer:/var/sites/keyringer/releases/
diff --git a/development.mdwn b/development.mdwn
index cfedb4b..3400643 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -48,27 +48,11 @@ Prepare the source code:
 
     $EDITOR keyringer # and update KEYRINGER_VERSION
     $EDITOR ChangeLog
-    make build_man
-
-Commit and tag a release:
-
     VERSION="`./keyringer | head -n 1 | cut -d ' ' -f 2`"
-    git commit -a -m "Keyringer $VERSION"
-    git tag -s $VERSION -m "Keyringer $VERSION"
-
-Create a release file:
-
-    make tarball
-
-Sign the release ([see backupninja development guidelines](https://labs.riseup.net/code/projects/backupninja/wiki/Release)):
-
-    cd ../tarballs
-    gpg --armor --detach-sign keyringer-$VERSION.tar.bz2
 
-Upload the release:
+Create and upload a new release:
 
-    scp keyringer-$VERSION.tar.bz2* keyringer:/var/sites/keyringer/releases/
-    cd -
+    make release
 
 Update the debian branch:
 
-- 
cgit v1.2.3