[Pkg-mono-svn-commits] rev 3884 - in mono/branches/1.9.1-X/debian: . patches

Mirco Bauer meebey at alioth.debian.org
Thu Jan 15 21:19:49 UTC 2009


Author: meebey
Date: 2009-01-15 21:19:48 +0000 (Thu, 15 Jan 2009)
New Revision: 3884

Added:
   mono/branches/1.9.1-X/debian/patches/arm_eabi_fix_r122416_r122702.dpatch
   mono/branches/1.9.1-X/debian/patches/arm_fix_flush_icache_calls_r121457.dpatch
   mono/branches/1.9.1-X/debian/patches/fix_System.Web.HttpResponse_memory_leak_r115863.dpatch
   mono/branches/1.9.1-X/debian/patches/fix_TcpClient_IPv6_r122598.dpatch
   mono/branches/1.9.1-X/debian/patches/fix_WebMethod_nullable_crash_r122070.dpatch
Modified:
   mono/branches/1.9.1-X/debian/changelog
   mono/branches/1.9.1-X/debian/patches/00list
   mono/branches/1.9.1-X/debian/rules
Log:
  [ Mirco Bauer ]
  * debian/rules:
    + Bumped API of libmono-data-tds1.0-cil and libmono-data-tds2.0-cil to
      1.9.1+dfsg-3 (which was forgotten in the -3 release). This caused a type
      loading error for partial uprades between 1.9.1 and 2.0: "The class
      Mono.Data.Tds.Protocol.ITds could not be loaded, used in Mono.Data.Tds,
      Version=2.0.0.0".
  * debian/patches/fix_WebMethod_nullable_crash_r122070.dpatch:
    + Fixes a crash with WebMethods when nullable types are used.
      (patch taken from upstream SVN revision r122070)
  * debian/patches/fix_System.Web.HttpResponse_memory_leak_r115861.dpatch:
    + Fixes memory leak in System.Web.HttpResponse.
      (patch taken from upstream SVN revision r115863)
  * debian/patches/arm_fix_flush_icache_calls_r121457.dpatch:
    + Fixed calls to mono_arch_flush_icache.
      (patch taken from upstream SVN revision r121457)
  * debian/patches/arm_eabi_fix_r122416_r122702.dpatch:
    + Use GCC macro for flushing the cache where available instead of inline
      ASM. (Closes: #511694, thanks to Stephen Depooter <stephend at xandros.com>
      for the investigation and Riku Voipio <novell at kos.to> for the patch)
      (patch taken from upstream SVN revisions r122416 and r122702)

  [ David Paleino ]
  * debian/patches/fix_TcpClient_IPv6_r122598.dpatch:
    + Fix bug in TcpClient() implementation preventing IPv6 connections
      from working.
      (patch taken from upstream SVN revision r122598)



Modified: mono/branches/1.9.1-X/debian/changelog
===================================================================
--- mono/branches/1.9.1-X/debian/changelog	2009-01-07 22:22:36 UTC (rev 3883)
+++ mono/branches/1.9.1-X/debian/changelog	2009-01-15 21:19:48 UTC (rev 3884)
@@ -1,3 +1,35 @@
+mono (1.9.1+dfsg-6) unstable; urgency=high
+
+  [ Mirco Bauer ]
+  * debian/rules:
+    + Bumped API of libmono-data-tds1.0-cil and libmono-data-tds2.0-cil to
+      1.9.1+dfsg-3 (which was forgotten in the -3 release). This caused a type
+      loading error for partial uprades between 1.9.1 and 2.0: "The class
+      Mono.Data.Tds.Protocol.ITds could not be loaded, used in Mono.Data.Tds,
+      Version=2.0.0.0".
+  * debian/patches/fix_WebMethod_nullable_crash_r122070.dpatch:
+    + Fixes a crash with WebMethods when nullable types are used.
+      (patch taken from upstream SVN revision r122070)
+  * debian/patches/fix_System.Web.HttpResponse_memory_leak_r115861.dpatch:
+    + Fixes memory leak in System.Web.HttpResponse.
+      (patch taken from upstream SVN revision r115863)
+  * debian/patches/arm_fix_flush_icache_calls_r121457.dpatch:
+    + Fixed calls to mono_arch_flush_icache.
+      (patch taken from upstream SVN revision r121457)
+  * debian/patches/arm_eabi_fix_r122416_r122702.dpatch:
+    + Use GCC macro for flushing the cache where available instead of inline
+      ASM. (Closes: #511694, thanks to Stephen Depooter <stephend at xandros.com>
+      for the investigation and Riku Voipio <novell at kos.to> for the patch)
+      (patch taken from upstream SVN revisions r122416 and r122702)
+
+  [ David Paleino ]
+  * debian/patches/fix_TcpClient_IPv6_r122598.dpatch:
+    + Fix bug in TcpClient() implementation preventing IPv6 connections
+      from working.
+      (patch taken from upstream SVN revision r122598)
+
+ -- Mirco Bauer <meebey at debian.org>  Thu, 15 Jan 2009 22:18:16 +0100
+
 mono (1.9.1+dfsg-5) unstable; urgency=high
 
   * debian/patches/fix_TdsConnectionPool_svn.dpatch:

Modified: mono/branches/1.9.1-X/debian/patches/00list
===================================================================
--- mono/branches/1.9.1-X/debian/patches/00list	2009-01-07 22:22:36 UTC (rev 3883)
+++ mono/branches/1.9.1-X/debian/patches/00list	2009-01-15 21:19:48 UTC (rev 3884)
@@ -22,4 +22,9 @@
 fix_Assembly.LoadFrom_deadlock
 fix_remoting_tcp_delay_issue_r115529_r115562
 fix_libgc_freeze_r109502
+fix_TcpClient_IPv6_r122598
+fix_WebMethod_nullable_crash_r122070
+fix_System.Web.HttpResponse_memory_leak_r115863
+arm_fix_flush_icache_calls_r121457
+arm_eabi_fix_r122416_r122702
 99_autoreconf

Added: mono/branches/1.9.1-X/debian/patches/arm_eabi_fix_r122416_r122702.dpatch
===================================================================
--- mono/branches/1.9.1-X/debian/patches/arm_eabi_fix_r122416_r122702.dpatch	                        (rev 0)
+++ mono/branches/1.9.1-X/debian/patches/arm_eabi_fix_r122416_r122702.dpatch	2009-01-15 21:19:48 UTC (rev 3884)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## arm_eabi_fix_r122416_r122702.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 mono-1.9.1+dfsg~/mono/mini/mini-arm.c mono-1.9.1+dfsg/mono/mini/mini-arm.c
+--- mono-1.9.1+dfsg~/mono/mini/mini-arm.c	2009-01-15 22:06:52.000000000 +0100
++++ mono-1.9.1+dfsg/mono/mini/mini-arm.c	2009-01-15 22:10:56.000000000 +0100
+@@ -556,9 +556,17 @@
+ 	return 2;
+ }
+ 
++
++#ifndef __GNUC_PREREQ
++#define __GNUC_PREREQ(maj, min) (0)
++#endif
++
+ void
+ mono_arch_flush_icache (guint8 *code, gint size)
+ {
++#if __GNUC_PREREQ(4, 1)
++	__clear_cache (code, code + size);
++#else
+ 	__asm __volatile ("mov r0, %0\n"
+ 			"mov r1, %1\n"
+ 			"mov r2, %2\n"
+@@ -566,6 +574,7 @@
+ 			: /* no outputs */
+ 			: "r" (code), "r" (code + size), "r" (0)
+ 			: "r0", "r1", "r3" );
++#endif
+ 
+ }
+ 


Property changes on: mono/branches/1.9.1-X/debian/patches/arm_eabi_fix_r122416_r122702.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: mono/branches/1.9.1-X/debian/patches/arm_fix_flush_icache_calls_r121457.dpatch
===================================================================
--- mono/branches/1.9.1-X/debian/patches/arm_fix_flush_icache_calls_r121457.dpatch	                        (rev 0)
+++ mono/branches/1.9.1-X/debian/patches/arm_fix_flush_icache_calls_r121457.dpatch	2009-01-15 21:19:48 UTC (rev 3884)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## arm_fix_flush_icache_calls_r121457.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 mono-1.9.1+dfsg~/mono/mini/mini-arm.c mono-1.9.1+dfsg/mono/mini/mini-arm.c
+--- mono-1.9.1+dfsg~/mono/mini/mini-arm.c	2008-01-29 23:02:45.000000000 +0100
++++ mono-1.9.1+dfsg/mono/mini/mini-arm.c	2009-01-15 20:59:46.000000000 +0100
+@@ -354,7 +354,7 @@
+ 
+ 		g_assert ((code - start) <= 12);
+ 
+-		mono_arch_flush_icache (code, 12);
++		mono_arch_flush_icache (start, 12);
+ 		cached = start;
+ 		mono_mini_arch_unlock ();
+ 		return cached;
+@@ -387,7 +387,7 @@
+ 
+ 		g_assert ((code - start) <= size);
+ 
+-		mono_arch_flush_icache (code, size);
++		mono_arch_flush_icache (start, size);
+ 		cache [sig->param_count] = start;
+ 		mono_mini_arch_unlock ();
+ 		return start;


Property changes on: mono/branches/1.9.1-X/debian/patches/arm_fix_flush_icache_calls_r121457.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: mono/branches/1.9.1-X/debian/patches/fix_System.Web.HttpResponse_memory_leak_r115863.dpatch
===================================================================
--- mono/branches/1.9.1-X/debian/patches/fix_System.Web.HttpResponse_memory_leak_r115863.dpatch	                        (rev 0)
+++ mono/branches/1.9.1-X/debian/patches/fix_System.Web.HttpResponse_memory_leak_r115863.dpatch	2009-01-15 21:19:48 UTC (rev 3884)
@@ -0,0 +1,191 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_System.Web.HttpResponse_memory_leak_r115863.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes memory leak in System.Web.HttpResponse
+## DP: See: https://bugzilla.novell.com/show_bug.cgi?id=435549
+
+ at DPATCH@
+diff -urNad mono-1.9.1+dfsg~/mcs/class/System.Web/System.Web/HttpCachePolicy.cs mono-1.9.1+dfsg/mcs/class/System.Web/System.Web/HttpCachePolicy.cs
+--- mono-1.9.1+dfsg~/mcs/class/System.Web/System.Web/HttpCachePolicy.cs	2008-01-29 23:04:11.000000000 +0100
++++ mono-1.9.1+dfsg/mcs/class/System.Web/System.Web/HttpCachePolicy.cs	2009-01-15 20:57:33.000000000 +0100
+@@ -36,19 +36,6 @@
+ using System.Web.Util;
+ 
+ namespace System.Web {
+-
+-	class CacheabilityUpdatedEventArgs : EventArgs {
+-
+-		public readonly HttpCacheability Cacheability;
+-
+-		public CacheabilityUpdatedEventArgs (HttpCacheability cacheability)
+-		{
+-			Cacheability = cacheability;
+-		}
+-	}
+-	
+-	internal delegate void CacheabilityUpdatedCallback (object sender, CacheabilityUpdatedEventArgs args);
+-	
+ 	// CAS - no InheritanceDemand here as the class is sealed
+ 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+ 	public sealed class HttpCachePolicy {
+@@ -100,8 +87,6 @@
+ 		
+ #endregion
+ 
+-                internal event CacheabilityUpdatedCallback CacheabilityUpdated;
+-                
+ #region Properties
+ 
+ #if NET_2_0
+@@ -194,9 +179,6 @@
+ 				return;
+ 			
+ 			Cacheability = cacheability;
+-
+-			if (CacheabilityUpdated != null)
+-				CacheabilityUpdated (this, new CacheabilityUpdatedEventArgs (cacheability));
+ 		}
+ 
+ 		public void SetCacheability (HttpCacheability cacheability, string field)
+diff -urNad mono-1.9.1+dfsg~/mcs/class/System.Web/System.Web/HttpResponse.cs mono-1.9.1+dfsg/mcs/class/System.Web/System.Web/HttpResponse.cs
+--- mono-1.9.1+dfsg~/mcs/class/System.Web/System.Web/HttpResponse.cs	2008-04-04 19:05:35.000000000 +0200
++++ mono-1.9.1+dfsg/mcs/class/System.Web/System.Web/HttpResponse.cs	2009-01-15 20:57:33.000000000 +0100
+@@ -975,34 +975,31 @@
+ 		}
+ 
+ 		internal bool IsCached {
+-			get {
+-				return cached_response != null;
++			get { return cached_response != null; }
++			set {
++				if (value)
++					cached_response = new CachedRawResponse (cache_policy);
++				else
++					cached_response = null;
+ 			}
+ 		}
+ 
+ 		public HttpCachePolicy Cache {
+ 			get {
+-				if (cache_policy == null) {
++				if (cache_policy == null)
+ 					cache_policy = new HttpCachePolicy ();
+-					cache_policy.CacheabilityUpdated += new CacheabilityUpdatedCallback (OnCacheabilityUpdated);
+-				}
+ 				
+ 				return cache_policy;
+ 			}
+-		}
+-		
+-		private void OnCacheabilityUpdated (object sender, CacheabilityUpdatedEventArgs e)
+-		{
+-			if (e.Cacheability >= HttpCacheability.Server && !IsCached)
+-				cached_response = new CachedRawResponse (cache_policy);
+-			else if (e.Cacheability <= HttpCacheability.Private)
+-				cached_response = null;
+-		}
++		}		
+ 
+ 		internal CachedRawResponse GetCachedResponse ()
+ 		{
+-			cached_response.StatusCode = StatusCode;
+-			cached_response.StatusDescription = StatusDescription;
++			if (cached_response != null) {
++				cached_response.StatusCode = StatusCode;
++				cached_response.StatusDescription = StatusDescription;
++			}
++			
+ 			return cached_response;
+ 		}
+ 
+diff -urNad mono-1.9.1+dfsg~/mcs/class/System.Web/System.Web.Caching/CachedRawResponse.cs mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.Caching/CachedRawResponse.cs
+--- mono-1.9.1+dfsg~/mcs/class/System.Web/System.Web.Caching/CachedRawResponse.cs	2008-04-04 19:05:35.000000000 +0200
++++ mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.Caching/CachedRawResponse.cs	2009-01-15 20:57:33.000000000 +0100
+@@ -36,7 +36,7 @@
+ namespace System.Web.Caching {
+ 
+ 	internal class CachedRawResponse {
+-
++		static readonly byte[] emptyBuffer = new byte[0];
+ 		private HttpCachePolicy policy;
+ 		private CachedVaryBy varyby;
+ 		private int status_code;
+@@ -48,7 +48,7 @@
+ 		internal CachedRawResponse (HttpCachePolicy policy)
+ 		{
+ 			this.policy = policy;
+-			this.buffer = new byte [32*1024];
++			this.buffer = emptyBuffer;
+ 		}
+ 
+ 		internal HttpCachePolicy Policy {
+diff -urNad mono-1.9.1+dfsg~/mcs/class/System.Web/System.Web.Caching/OutputCacheModule.cs mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.Caching/OutputCacheModule.cs
+--- mono-1.9.1+dfsg~/mcs/class/System.Web/System.Web.Caching/OutputCacheModule.cs	2008-04-04 19:05:35.000000000 +0200
++++ mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.Caching/OutputCacheModule.cs	2009-01-15 20:57:33.000000000 +0100
+@@ -160,19 +160,21 @@
+ 			
+ 			if (prev == null) {
+ 				CachedRawResponse c = context.Response.GetCachedResponse ();
+-				string [] files = new string [] { };
+-				string [] keys = new string [] { vary_key };
+-				bool sliding = context.Response.Cache.Sliding;
++				if (c != null) {
++					string [] files = new string [] { };
++					string [] keys = new string [] { vary_key };
++					bool sliding = context.Response.Cache.Sliding;
+ 
+-				context.InternalCache.Insert (key, c, new CacheDependency (files, keys),
+-							      (sliding ? Cache.NoAbsoluteExpiration :
+-							       context.Response.Cache.Expires),
+-							      (sliding ? TimeSpan.FromSeconds (
+-								      context.Response.Cache.Duration) :
+-							       Cache.NoSlidingExpiration),
+-							      CacheItemPriority.Normal, response_removed);
+-				c.VaryBy = varyby;
+-				varyby.ItemList.Add (key);
++					context.InternalCache.Insert (key, c, new CacheDependency (files, keys),
++								      (sliding ? Cache.NoAbsoluteExpiration :
++								       context.Response.Cache.Expires),
++								      (sliding ? TimeSpan.FromSeconds (
++									      context.Response.Cache.Duration) :
++								       Cache.NoSlidingExpiration),
++								      CacheItemPriority.Normal, response_removed);
++					c.VaryBy = varyby;
++					varyby.ItemList.Add (key);
++				}
+ 			} 
+ 		}
+ 
+diff -urNad mono-1.9.1+dfsg~/mcs/class/System.Web/System.Web.UI/Page.cs mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI/Page.cs
+--- mono-1.9.1+dfsg~/mcs/class/System.Web/System.Web.UI/Page.cs	2008-01-29 23:04:14.000000000 +0100
++++ mono-1.9.1+dfsg/mcs/class/System.Web/System.Web.UI/Page.cs	2009-01-15 20:57:33.000000000 +0100
+@@ -958,7 +958,8 @@
+ 			     OutputCacheLocation location,
+ 			     string varyByParam)
+ 	{
+-		HttpCachePolicy cache = Response.Cache;
++		HttpResponse response = Response;
++		HttpCachePolicy cache = response.Cache;
+ 		bool set_vary = false;
+ 		HttpContext ctx = Context;
+ 		DateTime timestamp = ctx != null ? ctx.Timestamp : DateTime.Now;
+@@ -1007,7 +1008,8 @@
+ 					cache.VaryByHeaders [h.Trim ()] = true;
+ 			}
+ 		}
+-			
++
++		response.IsCached = true;
+ 		cache.Duration = duration;
+ 		cache.SetExpires (timestamp.AddSeconds (duration));
+ 	}
+@@ -1404,7 +1406,7 @@
+ 	{
+ 	}
+ #endif
+-
++	
+ 	void InternalProcessRequest ()
+ 	{
+ 		_requestValueCollection = this.DeterminePostBackMode();


Property changes on: mono/branches/1.9.1-X/debian/patches/fix_System.Web.HttpResponse_memory_leak_r115863.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: mono/branches/1.9.1-X/debian/patches/fix_TcpClient_IPv6_r122598.dpatch
===================================================================
--- mono/branches/1.9.1-X/debian/patches/fix_TcpClient_IPv6_r122598.dpatch	                        (rev 0)
+++ mono/branches/1.9.1-X/debian/patches/fix_TcpClient_IPv6_r122598.dpatch	2009-01-15 21:19:48 UTC (rev 3884)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_TcpClient_IPv6_r122598.dpatch by David Paleino <d.paleino at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch backported from Mono trunk/ r122598
+## DP: Fixes IPv6 in TcpClient()
+
+ at DPATCH@
+diff -urNad mono-1.9.1+dfsg~/mcs/class/System/System.Net.Sockets/TcpClient.cs mono-1.9.1+dfsg/mcs/class/System/System.Net.Sockets/TcpClient.cs
+--- mono-1.9.1+dfsg~/mcs/class/System/System.Net.Sockets/TcpClient.cs	2008-02-06 21:38:44.000000000 +0100
++++ mono-1.9.1+dfsg/mcs/class/System/System.Net.Sockets/TcpClient.cs	2009-01-11 19:05:09.000000000 +0100
+@@ -84,7 +84,10 @@
+ 			}
+ 			
+ 			Init (family);
+-			client.Bind (new IPEndPoint (IPAddress.Any, 0));
++			IPAddress any = IPAddress.Any;
++			if (family == AddressFamily.InterNetworkV6)
++				any = IPAddress.IPv6Any;
++			client.Bind (new IPEndPoint (any, 0));
+ 		}
+ #endif


Property changes on: mono/branches/1.9.1-X/debian/patches/fix_TcpClient_IPv6_r122598.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: mono/branches/1.9.1-X/debian/patches/fix_WebMethod_nullable_crash_r122070.dpatch
===================================================================
--- mono/branches/1.9.1-X/debian/patches/fix_WebMethod_nullable_crash_r122070.dpatch	                        (rev 0)
+++ mono/branches/1.9.1-X/debian/patches/fix_WebMethod_nullable_crash_r122070.dpatch	2009-01-15 21:19:48 UTC (rev 3884)
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_WebMethod_nullable_crash_r122070.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes crash with WebMethods that use nullable types (like Nullable<Int32>)
+## DP: See: http://bugzilla.novell.com/show_bug.cgi?id=461941
+
+ at DPATCH@
+diff -urNad mono-1.9.1+dfsg~/mono/metadata/marshal.c mono-1.9.1+dfsg/mono/metadata/marshal.c
+--- mono-1.9.1+dfsg~/mono/metadata/marshal.c	2008-03-11 00:35:33.000000000 +0100
++++ mono-1.9.1+dfsg/mono/metadata/marshal.c	2009-01-11 19:10:53.000000000 +0100
+@@ -4710,6 +4710,16 @@
+ 
+ 		if (t->byref) {
+ 			mono_mb_emit_byte (mb, CEE_LDIND_I);
++			/* A Nullable<T> type don't have a boxed form, it's either null or a boxed T.
++			 * So to make this work we unbox it to a local variablee and push a reference to that.
++			 */
++			if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type (t))) {
++				int tmp_nullable_local = mono_mb_add_local (mb, &mono_class_from_mono_type (t)->byval_arg);
++
++				mono_mb_emit_op (mb, CEE_UNBOX_ANY, mono_class_from_mono_type (t));
++				mono_mb_emit_stloc (mb, tmp_nullable_local);
++				mono_mb_emit_ldloc_addr (mb, tmp_nullable_local);
++			}
+ 			continue;
+ 		}
+ 
+diff -urNad mono-1.9.1+dfsg~/mono/metadata/object.c mono-1.9.1+dfsg/mono/metadata/object.c
+--- mono-1.9.1+dfsg~/mono/metadata/object.c	2008-01-29 23:02:34.000000000 +0100
++++ mono-1.9.1+dfsg/mono/metadata/object.c	2009-01-11 19:10:53.000000000 +0100
+@@ -3188,10 +3188,7 @@
+ 			case MONO_TYPE_R8:
+ 			case MONO_TYPE_VALUETYPE:
+ 				if (t->type == MONO_TYPE_VALUETYPE && mono_class_is_nullable (mono_class_from_mono_type (sig->params [i]))) {
+-					if (t->byref)
+-						/* FIXME: */
+-						g_assert_not_reached ();
+-					/* The runtime invoke wrapper needs the original boxed vtype */
++					/* The runtime invoke wrapper needs the original boxed vtype, it does handle byref values as well. */
+ 					pa [i] = mono_array_get (params, MonoObject*, i);
+ 				} else {
+ 					/* MS seems to create the objects if a null is passed in */


Property changes on: mono/branches/1.9.1-X/debian/patches/fix_WebMethod_nullable_crash_r122070.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: mono/branches/1.9.1-X/debian/rules
===================================================================
--- mono/branches/1.9.1-X/debian/rules	2009-01-07 22:22:36 UTC (rev 3883)
+++ mono/branches/1.9.1-X/debian/rules	2009-01-15 21:19:48 UTC (rev 3884)
@@ -255,8 +255,8 @@
 	debian/dh_makeclilibs -p libmono-cairo2.0-cil -m 1.2.6 internal-mono
 	debian/dh_makeclilibs -p libmono-corlib1.0-cil -m 1.2.2.1 internal-mono
 	debian/dh_makeclilibs -p libmono-corlib2.0-cil -m 1.2.2.1 internal-mono
-	debian/dh_makeclilibs -p libmono-data-tds1.0-cil -m 1.2.6 internal-mono
-	debian/dh_makeclilibs -p libmono-data-tds2.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-data-tds1.0-cil -m 1.9.1+dfsg-3 internal-mono
+	debian/dh_makeclilibs -p libmono-data-tds2.0-cil -m 1.9.1+dfsg-3 internal-mono
 	debian/dh_makeclilibs -p libmono-ldap1.0-cil -m 1.2.6 internal-mono
 	debian/dh_makeclilibs -p libmono-ldap2.0-cil -m 1.2.6 internal-mono
 	debian/dh_makeclilibs -p libmono-oracle2.0-cil -m 1.2.6 internal-mono




More information about the Pkg-mono-svn-commits mailing list