[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4.2.3+dfsg-1-2-gcd54967

[Mirco Bauer]

The following commit has been merged in the master branch:
commit cd5496734a3b260c2d50374ed3149d809b760660
Author: Mirco Bauer <meebey at meebey.net>
Date:   Mon Sep 7 22:10:41 2009 +0200

      * debian/patches/fix_metadata_dup.dpatch:
        + Remove duplicate appdomain.h, fixing FTBFS.
          (thanks to Stefan Siegl for the investigation, Closes: #543010)
      * debian/patches/fix_CreateDelegate_ArgumentException.dpatch:
        + Fixed ArgumentException in System.Delegate.CreateDelegate() which broke
          IronPython 2.6 Beta 2.

diff --git a/debian/changelog b/debian/changelog
index 6736b15..e30fb78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mono (2.4.2.3+dfsg-2~pre1) unstable; urgency=low
+mono (2.4.2.3+dfsg-2) unstable; urgency=medium
 
   * debian/control:
     + Add missing cli:Suggests to libmono-bytefx0.7.6.1-cil and
@@ -6,8 +6,14 @@ mono (2.4.2.3+dfsg-2~pre1) unstable; urgency=low
   * debian/rules:
     + Removed mono:upversion and mono:next-version from dh_gencontrol -s
       call as those are unused for arch:any packages.
-
- -- Mirco Bauer <meebey at debian.org>  Fri, 31 Jul 2009 03:03:16 +0200
+  * debian/patches/fix_metadata_dup.dpatch:
+    + Remove duplicate appdomain.h, fixing FTBFS.
+      (thanks to Stefan Siegl for the investigation, Closes: #543010)
+  * debian/patches/fix_CreateDelegate_ArgumentException.dpatch:
+    + Fixed ArgumentException in System.Delegate.CreateDelegate() which broke
+      IronPython 2.6 Beta 2.
+
+ -- Mirco Bauer <meebey at debian.org>  Mon, 07 Sep 2009 22:00:21 +0200
 
 mono (2.4.2.3+dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 9389fcd..e9ea2c7 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -13,6 +13,8 @@ fix_mono-api-info_build
 fix_csharplib_build
 fix_mdoc_build
 fix_tuner_build
+fix_metadata_dup
+fix_CreateDelegate_ArgumentException
 disable_building_convert.exe
 disable_bug-80307_test
 build_cecil_as_2.0
diff --git a/debian/patches/fix_CreateDelegate_ArgumentException.dpatch b/debian/patches/fix_CreateDelegate_ArgumentException.dpatch
new file mode 100755
index 0000000..69b4dab
--- /dev/null
+++ b/debian/patches/fix_CreateDelegate_ArgumentException.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_CreateDelegate_ArgumentException.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch taken from upstream SVN revision 130175
+## DP: 2009-03-25  Jb Evain  <jbevain at novell.com>
+## DP: * Delegate.cs (CreateDelegate): fix checks to deal with
+## DP:   valuetypes -> obj conversions for arguments, and avoid
+## DP:   issues with such unallowed conversion for return types.
+
+ at DPATCH@
+diff -urNad git~/mcs/class/corlib/System/Delegate.cs git/mcs/class/corlib/System/Delegate.cs
+--- git~/mcs/class/corlib/System/Delegate.cs	2009-07-15 20:52:46.000000000 +0200
++++ git/mcs/class/corlib/System/Delegate.cs	2009-09-07 21:55:10.000000000 +0200
+@@ -133,7 +133,7 @@
+ 
+ 			// Delegate contravariance
+ 			if (!match) {
+-				if (!delArgType.IsValueType && (delArgType != typeof (ValueType)) && (argType.IsAssignableFrom (delArgType)))
++				if (!argType.IsValueType && argType.IsAssignableFrom (delArgType))
+ 					match = true;
+ 			}
+ 
+@@ -147,7 +147,7 @@
+ #if NET_2_0
+ 			if (!returnMatch) {
+ 				// Delegate covariance
+-				if (!delReturnType.IsValueType && (delReturnType != typeof (ValueType)) && (delReturnType.IsAssignableFrom (returnType)))
++				if (!returnType.IsValueType && delReturnType.IsAssignableFrom (returnType))
+ 					returnMatch = true;
+ 			}
+ #endif
diff --git a/debian/patches/fix_metadata_dup.dpatch b/debian/patches/fix_metadata_dup.dpatch
new file mode 100755
index 0000000..66b987c
--- /dev/null
+++ b/debian/patches/fix_metadata_dup.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_metadata_dup.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad git~/mono/metadata/Makefile.am git/mono/metadata/Makefile.am
+--- git~/mono/metadata/Makefile.am	2009-07-15 20:49:47.000000000 +0200
++++ git/mono/metadata/Makefile.am	2009-09-07 21:43:48.000000000 +0200
+@@ -171,7 +171,6 @@
+ 	object.h	\
+ 	exception.h	\
+ 	profiler.h	\
+-	appdomain.h	\
+ 	mono-config.h	\
+ 	debug-helpers.h	\
+ 	mempool.h

-- 
mono