[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.15+dfsg-2-12-g00a56ed

[Julian Taylor]

The following commit has been merged in the master branch:
commit ea345274518edfb7d2bd377885125a6d3c5e40f5
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Tue May 17 13:55:53 2011 +0200

    patch: fix autotype for strings containing apostrophes

diff --git a/debian/patches/18_fix-autotype-of-apostrophes.patch b/debian/patches/18_fix-autotype-of-apostrophes.patch
new file mode 100644
index 0000000..12bed17
--- /dev/null
+++ b/debian/patches/18_fix-autotype-of-apostrophes.patch
@@ -0,0 +1,36 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Sun, 8 May 2011 02:12:15 +0200
+Subject: fix autotype of apostrophes
+
+Bug: https://sourceforge.net/tracker/?func=detail&atid=609908&aid=3298808&group_id=95013
+Applied-Upstream: 2.16
+---
+ KeePass/Util/SendInputEx.Unix.cs |    1 +
+ KeePass/Util/Spr/SprEncoding.cs  |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/KeePass/Util/SendInputEx.Unix.cs b/KeePass/Util/SendInputEx.Unix.cs
+index dcce975..5690c3e 100644
+--- a/KeePass/Util/SendInputEx.Unix.cs
++++ b/KeePass/Util/SendInputEx.Unix.cs
+@@ -81,6 +81,7 @@ namespace KeePass.Util
+ 				m_dictXDoReplace[@"}"] = "braceright";
+ 				m_dictXDoReplace[@"["] = "bracketleft";
+ 				m_dictXDoReplace[@"]"] = "bracketright";
++				m_dictXDoReplace[@"'"] = "apostrophe";
+ 
+ 				foreach(string strKpKey in m_dictXDoReplace.Keys)
+ 				{
+diff --git a/KeePass/Util/Spr/SprEncoding.cs b/KeePass/Util/Spr/SprEncoding.cs
+index 9613cfe..3d1c373 100644
+--- a/KeePass/Util/Spr/SprEncoding.cs
++++ b/KeePass/Util/Spr/SprEncoding.cs
+@@ -34,6 +34,7 @@ namespace KeePass.Util.Spr
+ 
+ 			str = str.Replace(@"[", @"{[}");
+ 			str = str.Replace(@"]", @"{]}");
++			str = str.Replace(@"'", @"{'}");
+ 
+ 			str = str.Replace(@"+", @"{+}");
+ 			str = str.Replace(@"%", @"{%}");
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index e335a7e..6dd9879 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 15_add-xdotool-keysym-mapping-for-square-brackets.patch
 16_increase-tab-size-to-avoid-crash-on-changing-tabs.patch
 17_fix-ftp-stream-read.patch
+18_fix-autotype-of-apostrophes.patch

-- 
keepass2