[Pkg-cli-libs-commits] [SCM] nunit branch, master, updated. debian/2.5.10.11092+dfsg-3-11-ge508942

[Julian Taylor]

The following commit has been merged in the master branch:
commit e7beda88eb9319b745f2ad57b1b4fd1b5283d004
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Sun Apr 15 17:32:34 2012 +0200

    add prefer-4.0-framework.patch to use 4.0 frameworks in .config

diff --git a/debian/patches/prefer-4.0-framework.patch b/debian/patches/prefer-4.0-framework.patch
new file mode 100644
index 0000000..9afcd3d
--- /dev/null
+++ b/debian/patches/prefer-4.0-framework.patch
@@ -0,0 +1,40 @@
+Description: prefer the debian default 4.0 framework
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+--- a/src/ConsoleRunner/nunit-console-exe/App.config
++++ b/src/ConsoleRunner/nunit-console-exe/App.config
+@@ -10,8 +10,8 @@
+   -->
+   <startup useLegacyV2RuntimeActivationPolicy="true">
+     <!-- Comment out the next line to force use of .NET 4.0 -->
+-    <supportedRuntime version="v2.0.50727" />
+     <supportedRuntime version="v4.0.30319" />
++    <supportedRuntime version="v2.0.50727" />
+   </startup>
+ 
+   <runtime>
+@@ -28,4 +28,4 @@
+ 
+   </runtime>
+   
+-</configuration>
+\ No newline at end of file
++</configuration>
+--- a/src/GuiRunner/nunit-gui-exe/App.config
++++ b/src/GuiRunner/nunit-gui-exe/App.config
+@@ -9,8 +9,8 @@
+   -->
+   <startup useLegacyV2RuntimeActivationPolicy="true">
+     <!-- Comment out the next line to force use of .NET 4.0 -->
+-    <supportedRuntime version="v2.0.50727" />
+     <supportedRuntime version="v4.0.30319" />
++    <supportedRuntime version="v2.0.50727" />
+   </startup>
+   
+   <runtime>
+@@ -27,4 +27,4 @@
+ 
+   </runtime>
+ 
+-</configuration>
+\ No newline at end of file
++</configuration>
diff --git a/debian/patches/series b/debian/patches/series
index 36d7200..732207e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+prefer-4.0-framework.patch
 use_default_framework.patch
 05_build_xml_doc_for_nunit.core.dpatch

-- 
nunit