From 3b1ccd3831f33bb2c5cf050c12cfaf1ee4143265 Mon Sep 17 00:00:00 2001
From: Phil Dibowitz <phil@ipom.com>
Date: Thu, 8 Oct 2015 09:36:30 -0700
Subject: [PATCH] Prep for 2.2.1 release

---
 Changelog            | 17 ++++++++++++++++-
 libpius/constants.py |  2 +-
 pius-party-worksheet |  2 +-
 pius.spec            |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 94fc51e..5aa3df8 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,21 @@
+2.2.1
+Released: 10/08/15
+phil@ipom.com
+- Fix gpg version matching on Mac
+- Fix crashing when we don't match version
+- Change debug logging of commands to strings instead of lists so users
+  can copy/paste when debugging
+- handle agent errors better on 2.1
+- more clear errors for various agent issues
+brian.andrew@brianandjenny.com
+- fix command debug logging in libpius.signer
+- fix output of keys in verbose mode (we were missing the first one)
+- fix gpg2 interaction on Mac
+- fix gpg2 for 2.0.x users
+
 2.2.0
 Released: 10/02/15
-phil@ipom.com:
+phil@ipom.com
 [meta]
 - significant refactoring of code into more classes
 - add pius-report
diff --git a/libpius/constants.py b/libpius/constants.py
index cba45e9..ed7b74b 100644
--- a/libpius/constants.py
+++ b/libpius/constants.py
@@ -2,7 +2,7 @@
 
 import os
 
-VERSION = '2.2.0'
+VERSION = '2.2.1'
 MODE_INTERACTIVE = 0
 MODE_CACHE_PASSPHRASE = 1
 MODE_AGENT = 2
diff --git a/pius-party-worksheet b/pius-party-worksheet
index bdf5c51..eb5cebd 100755
--- a/pius-party-worksheet
+++ b/pius-party-worksheet
@@ -20,7 +20,7 @@ use Getopt::Long;
 # You can find the original at http://www.cryptnet.net/people/vab/
 #
 
-use constant VERSION => '2.2.0';
+use constant VERSION => '2.2.1';
 
 sub print_html_header
 {
diff --git a/pius.spec b/pius.spec
index 1c3698d..8e95920 100644
--- a/pius.spec
+++ b/pius.spec
@@ -2,7 +2,7 @@
 # $Id$
 
 %define name pius
-%define version	2.2.0
+%define version	2.2.1
 %define release 1
 
 Name: %{name}