diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b7db916..4e1143f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+v0.5.3 (2014-10-13)
+-------------------
+* Fix entries in the recycle bin are loaded at start when they should be ignored.
+* More informative error messages when key fails to load.
+* Add column to agent manager that shows where the key came from.
+* Add support for Cygwin/MSYS integration
+
v0.5.2 (2014-7-24)
-----------------
* Fix issue with DSA authentication failing ~1% of the time because of signature
diff --git a/KeeAgent.sln b/KeeAgent.sln
index 3606261..0883743 100644
--- a/KeeAgent.sln
+++ b/KeeAgent.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio 2012
VisualStudioVersion = 12.0.30324.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeeAgent", "KeeAgent\KeeAgent.csproj", "{742863F2-52ED-41E0-92A1-8EEA60EB75EF}"
@@ -25,57 +25,42 @@ Global
ReleasePlgx|Any CPU = ReleasePlgx|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {3BEB6FAE-B14D-4281-8168-DB2A4A0C5FC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3BEB6FAE-B14D-4281-8168-DB2A4A0C5FC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3BEB6FAE-B14D-4281-8168-DB2A4A0C5FC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3BEB6FAE-B14D-4281-8168-DB2A4A0C5FC4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3BEB6FAE-B14D-4281-8168-DB2A4A0C5FC4}.ReleasePlgx|Any CPU.ActiveCfg = Release|Any CPU
+ {3BEB6FAE-B14D-4281-8168-DB2A4A0C5FC4}.ReleasePlgx|Any CPU.Build.0 = Release|Any CPU
{742863F2-52ED-41E0-92A1-8EEA60EB75EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{742863F2-52ED-41E0-92A1-8EEA60EB75EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{742863F2-52ED-41E0-92A1-8EEA60EB75EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{742863F2-52ED-41E0-92A1-8EEA60EB75EF}.Release|Any CPU.Build.0 = Release|Any CPU
{742863F2-52ED-41E0-92A1-8EEA60EB75EF}.ReleasePlgx|Any CPU.ActiveCfg = ReleasePlgx|Any CPU
{742863F2-52ED-41E0-92A1-8EEA60EB75EF}.ReleasePlgx|Any CPU.Build.0 = ReleasePlgx|Any CPU
- {D181A56F-743F-429F-BA31-1827C39A176C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D181A56F-743F-429F-BA31-1827C39A176C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D181A56F-743F-429F-BA31-1827C39A176C}.Release|Any CPU.Build.0 = Release|Any CPU
- {D181A56F-743F-429F-BA31-1827C39A176C}.ReleasePlgx|Any CPU.ActiveCfg = Release|Any CPU
{9163B6B6-0603-4C6E-BC67-7111ED8CDDE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9163B6B6-0603-4C6E-BC67-7111ED8CDDE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9163B6B6-0603-4C6E-BC67-7111ED8CDDE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9163B6B6-0603-4C6E-BC67-7111ED8CDDE1}.Release|Any CPU.Build.0 = Release|Any CPU
{9163B6B6-0603-4C6E-BC67-7111ED8CDDE1}.ReleasePlgx|Any CPU.ActiveCfg = Release|Any CPU
{9163B6B6-0603-4C6E-BC67-7111ED8CDDE1}.ReleasePlgx|Any CPU.Build.0 = Release|Any CPU
- {3BEB6FAE-B14D-4281-8168-DB2A4A0C5FC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3BEB6FAE-B14D-4281-8168-DB2A4A0C5FC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3BEB6FAE-B14D-4281-8168-DB2A4A0C5FC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3BEB6FAE-B14D-4281-8168-DB2A4A0C5FC4}.Release|Any CPU.Build.0 = Release|Any CPU
- {3BEB6FAE-B14D-4281-8168-DB2A4A0C5FC4}.ReleasePlgx|Any CPU.ActiveCfg = Release|Any CPU
- {3BEB6FAE-B14D-4281-8168-DB2A4A0C5FC4}.ReleasePlgx|Any CPU.Build.0 = Release|Any CPU
+ {D181A56F-743F-429F-BA31-1827C39A176C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D181A56F-743F-429F-BA31-1827C39A176C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D181A56F-743F-429F-BA31-1827C39A176C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D181A56F-743F-429F-BA31-1827C39A176C}.ReleasePlgx|Any CPU.ActiveCfg = Release|Any CPU
EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
+ GlobalSection(NestedProjects) = preSolution
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = KeeAgent\KeeAgent.csproj
Policies = $0
- $0.TextStylePolicy = $3
- $1.inheritsSet = null
- $1.scope = text/x-csharp
- $0.CSharpFormattingPolicy = $2
- $2.IndentSwitchBody = True
- $2.BeforeMethodDeclarationParentheses = False
- $2.BeforeMethodCallParentheses = False
- $2.BeforeConstructorDeclarationParentheses = False
- $2.BeforeIndexerDeclarationBracket = False
- $2.BeforeDelegateDeclarationParentheses = False
- $2.NewParentheses = False
- $2.SpacesBeforeBrackets = False
- $2.inheritsSet = Mono
- $2.inheritsScope = text/x-csharp
- $2.scope = text/x-csharp
- $3.TabWidth = 2
- $3.IndentWidth = 2
- $3.NoTabsAfterNonTabs = True
- $3.EolMarker = Windows
- $3.inheritsSet = VisualStudio
- $3.inheritsScope = text/plain
- $3.scope = text/plain
- version = 0.5.2.0
+ $0.TextStylePolicy = $1
+ $1.FileWidth = 120
+ $1.TabsToSpaces = False
+ $1.inheritsSet = VisualStudio
+ $1.inheritsScope = text/plain
+ version = 0.5.3.0
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
diff --git a/KeeAgent/KeeAgent.csproj b/KeeAgent/KeeAgent.csproj
index 649634b..a9a3798 100644
--- a/KeeAgent/KeeAgent.csproj
+++ b/KeeAgent/KeeAgent.csproj
@@ -10,13 +10,11 @@
$(MSBuildProjectDirectory)\..\KeePassPluginDevTools\PlgxTools\bin\Release\
- 0.5.2.0
+ 0.5.3.0
Debug
AnyCPU
- 8.0.30703
- 2.0
{742863F2-52ED-41E0-92A1-8EEA60EB75EF}
Library
Properties
diff --git a/KeeAgent/Properties/AssemblyInfo.cs b/KeeAgent/Properties/AssemblyInfo.cs
index a51b454..17a036e 100644
--- a/KeeAgent/Properties/AssemblyInfo.cs
+++ b/KeeAgent/Properties/AssemblyInfo.cs
@@ -50,5 +50,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion ("0.5.2.0")]
-[assembly: AssemblyFileVersion ("0.5.2.0")]
+[assembly: AssemblyVersion ("0.5.3.0")]
+[assembly: AssemblyFileVersion ("0.5.3.0")]
diff --git a/KeeAgentTestProject/KeeAgentTestProject.csproj b/KeeAgentTestProject/KeeAgentTestProject.csproj
index 078e3df..a62a5be 100644
--- a/KeeAgentTestProject/KeeAgentTestProject.csproj
+++ b/KeeAgentTestProject/KeeAgentTestProject.csproj
@@ -4,16 +4,13 @@
Debug
AnyCPU
-
-
- 2.0
{D181A56F-743F-429F-BA31-1827C39A176C}
Library
Properties
KeeAgentTestProject
KeeAgentTestProject
512
- 0.5.2.0
+ 0.5.3.0
True
@@ -35,9 +32,7 @@
-
- 3.5
-
+
diff --git a/SshAgentLib b/SshAgentLib
index 7016aad..16805da 160000
--- a/SshAgentLib
+++ b/SshAgentLib
@@ -1 +1 @@
-Subproject commit 7016aad60fc891155f279c7b965763af30cc56c7
+Subproject commit 16805da3dd96a4d670d911056268ac5257818fed
diff --git a/create-tarball.sh b/create-tarball.sh
deleted file mode 100755
index c1f4bc0..0000000
--- a/create-tarball.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-file_version=$(cat KeeAgent.sln | sed -ne 's/\s*version = \(.*\)/\1/p')
-file_name=KeeAgent_v${file_version}.tar
-git_exclude="--exclude .gitignore --exclude .gitmodules --exclude .gitattributes"
-
-git ls-files | xargs tar --exclude SshAgentLib ${git_exclude} -cf ${file_name} packages/
-cd SshAgentLib
-git ls-files | xargs tar --transform 's|^|SshAgentLib/|' ${git_exclude} -rf ../${file_name} packages/
-cd ..
-gzip -f ${file_name}
diff --git a/debian/changelog b/debian/changelog
index 9ba3e0f..de20647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+keepass2-plugin-keeagent (0.5.3) trusty; urgency=medium
+
+ * Fix entries in the recycle bin are loaded at start when they should be ignored.
+ * More informative error messages when key fails to load.
+ * Add column to agent manager that shows where the key came from.
+
+ -- David Lechner Mon, 13 Oct 2014 19:15:18 -0500
+
keepass2-plugin-keeagent (0.5.2-1) trusty; urgency=medium
* New upstream release.