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

[Jo Shields]

The following commit has been merged in the master branch:
commit 231ef33cbd08377ce0e7a2549d1d51a72be95dfa
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Nov 15 18:45:05 2009 +0000

    Add a second backport svn commit, hopefully fixes FTBFS

diff --git a/debian/changelog b/debian/changelog
index 7a35f5a..b8630d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ mono (2.4.2.3+dfsg-3) UNRELEASED; urgency=low
   [ Jo Shields ]
   * Add missing Conflicts/Replaces on monodoc-base from pre-Squeeze due
     to monodoc.dll.mdb conflict
-  * debian/patches/fix_gridview_r146128.dpatch:
+  * debian/patches/fix_gridview_r146128_r146133.dpatch:
     + Add fix from Mono SVN for TableRowCollection in ASP.NET
 
   [ Mirco Bauer ]
diff --git a/debian/patches/00list b/debian/patches/00list
index 1259a8d..b536799 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -15,7 +15,7 @@ fix_mdoc_build
 fix_tuner_build
 fix_metadata_dup
 fix_CreateDelegate_ArgumentException
-fix_gridview_r146128
+fix_gridview_r146128_r146133
 disable_building_convert.exe
 disable_bug-80307_test
 build_cecil_as_2.0
diff --git a/debian/patches/fix_gridview_r146128.dpatch b/debian/patches/fix_gridview_r146128_r146133.dpatch
similarity index 86%
rename from debian/patches/fix_gridview_r146128.dpatch
rename to debian/patches/fix_gridview_r146128_r146133.dpatch
index 9ffcfd4..bc5ba72 100755
--- a/debian/patches/fix_gridview_r146128.dpatch
+++ b/debian/patches/fix_gridview_r146128_r146133.dpatch
@@ -1,14 +1,35 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-mono-cairo.pc.in.dpatch by Jo Shields <directhex at debian.org>
+## debian/patches/fix_gridview_r146128_r146133.dpatch by Jo Shields <directhex at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.
 
 @DPATCH@
-Index: mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs
+Index: mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs
 ===================================================================
---- mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs	(revision 146127)
-+++ mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs	(revision 146128)
+--- mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs	(revision 146127)
++++ mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs	(revision 146128)
+@@ -47,6 +47,8 @@
+ 		TableCellCollection cells;
+ #if NET_2_0
+ 		bool tableRowSectionSet;
++
++		internal TableRowCollection Container { get; set; }
+ #endif
+ 		
+ 		public TableRow ()
+@@ -129,6 +131,9 @@
+ 					throw new ArgumentOutOfRangeException ("TableSection");
+ 				ViewState ["TableSection"] = (int) value;
+ 				tableRowSectionSet = true;
++				TableRowCollection container = Container;
++				if (container != null)
++					container.RowTableSectionSet ();
+ 			}
+ 		}
+ #endif
+--- mono-2.4.2.3+dfsg~/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs	2009-07-15 19:51:29.000000000 +0100
++++ mono-2.4.2.3+dfsg/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs	2009-11-15 18:39:14.000000000 +0000
 @@ -43,6 +43,9 @@
  		
  		internal TableRowCollection (Table table)
@@ -62,7 +83,7 @@ Index: mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollectio
  #endif
  					cc.Add (tr);
  				}
-@@ -128,13 +142,25 @@
+@@ -128,13 +142,30 @@
  			return cc.IndexOf (row);
  		}
  
@@ -75,20 +96,25 @@ Index: mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollectio
 +		
  		public void Remove (TableRow row)
  		{
-+			row.Container = null;
++#if NET_2_0
++			if (row != null)
++				row.Container = null;
++#endif
  			cc.Remove (row);
  		}
  
  		public void RemoveAt (int index)
  		{
++#if NET_2_0
 +			TableRow row = this [index] as TableRow;
 +			if (row != null)
 +				row.Container = null;
++#endif
 +			
  			cc.RemoveAt (index);
  		}
  
-@@ -156,28 +182,27 @@
+@@ -156,28 +187,27 @@
  
  		int IList.Add (object value)
  		{
@@ -122,26 +148,3 @@ Index: mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollectio
  		}
  	}
  }
-Index: mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs
-===================================================================
---- mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs	(revision 146127)
-+++ mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs	(revision 146128)
-@@ -47,6 +47,8 @@
- 		TableCellCollection cells;
- #if NET_2_0
- 		bool tableRowSectionSet;
-+
-+		internal TableRowCollection Container { get; set; }
- #endif
- 		
- 		public TableRow ()
-@@ -129,6 +131,9 @@
- 					throw new ArgumentOutOfRangeException ("TableSection");
- 				ViewState ["TableSection"] = (int) value;
- 				tableRowSectionSet = true;
-+				TableRowCollection container = Container;
-+				if (container != null)
-+					container.RowTableSectionSet ();
- 			}
- 		}
- #endif

-- 
mono