[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 01e22f4eb8300d56067d6c3245b5155895173bdf
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Mon Jun 20 15:22:32 2011 +0200

    patch: prefer 4.0 framework if available

diff --git a/debian/patches/20_prefer-4.0-framework-if-available.patch b/debian/patches/20_prefer-4.0-framework-if-available.patch
new file mode 100644
index 0000000..2d3e577
--- /dev/null
+++ b/debian/patches/20_prefer-4.0-framework-if-available.patch
@@ -0,0 +1,23 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Mon, 20 Jun 2011 15:20:47 +0200
+Subject: prefer 4.0 framework if available
+
+when compiled for 4.0 it will not run with 2.0
+---
+ Ext/KeePass.exe.config |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Ext/KeePass.exe.config b/Ext/KeePass.exe.config
+index 303f865..078aca3 100644
+--- a/Ext/KeePass.exe.config
++++ b/Ext/KeePass.exe.config
+@@ -1,7 +1,7 @@
+ <configuration>
+ 	<startup>
+-		<supportedRuntime version="v2.0.50727" />
+ 		<supportedRuntime version="v4.0" />
++		<supportedRuntime version="v2.0.50727" />
+ 	</startup>
+ 	<runtime>
+ 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index afc2a79..69dd64a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@
 17_fix-ftp-stream-read.patch
 18_fix-autotype-of-apostrophes.patch
 19_make-sure-whole-block-is-read-from-crypto-stream.patch
+20_prefer-4.0-framework-if-available.patch

-- 
keepass2