[Pkg-mono-svn-commits] rev 3316 - in gtk-sharp2/trunk/debian: . patches

[Sebastian Dröge]

Author: slomo
Date: 2007-09-05 18:10:02 +0000 (Wed, 05 Sep 2007)
New Revision: 3316

Removed:
   gtk-sharp2/trunk/debian/patches/fix_callback_code_generator.dpatch
Modified:
   gtk-sharp2/trunk/debian/changelog
   gtk-sharp2/trunk/debian/patches/00list
Log:
* New upstream release.
* debian/patches/fix_callback_code_generator.dpatch:
  + Dropped, a different fix for this is upstream now.

Modified: gtk-sharp2/trunk/debian/changelog
===================================================================
--- gtk-sharp2/trunk/debian/changelog	2007-09-05 06:37:19 UTC (rev 3315)
+++ gtk-sharp2/trunk/debian/changelog	2007-09-05 18:10:02 UTC (rev 3316)
@@ -1,3 +1,11 @@
+gtk-sharp2 (2.10.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/fix_callback_code_generator.dpatch:
+    + Dropped, a different fix for this is upstream now.
+
+ -- Sebastian Dröge <slomo at debian.org>  Wed, 05 Sep 2007 20:05:12 +0200
+
 gtk-sharp2 (2.10.1-3) unstable; urgency=low
 
   * debian/rules:

Modified: gtk-sharp2/trunk/debian/patches/00list
===================================================================
--- gtk-sharp2/trunk/debian/patches/00list	2007-09-05 06:37:19 UTC (rev 3315)
+++ gtk-sharp2/trunk/debian/patches/00list	2007-09-05 18:10:02 UTC (rev 3316)
@@ -1,3 +1,2 @@
 01_glue-locations
 02_missing_dllmaps
-fix_callback_code_generator

Deleted: gtk-sharp2/trunk/debian/patches/fix_callback_code_generator.dpatch
===================================================================
--- gtk-sharp2/trunk/debian/patches/fix_callback_code_generator.dpatch	2007-09-05 06:37:19 UTC (rev 3315)
+++ gtk-sharp2/trunk/debian/patches/fix_callback_code_generator.dpatch	2007-09-05 18:10:02 UTC (rev 3316)
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_callback_code_generator.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 gtk-sharp-2.10.1~/generator/CallbackGen.cs gtk-sharp-2.10.1/generator/CallbackGen.cs
---- gtk-sharp-2.10.1~/generator/CallbackGen.cs	2007-06-18 20:07:59.000000000 +0200
-+++ gtk-sharp-2.10.1/generator/CallbackGen.cs	2007-06-29 17:33:30.000000000 +0200
-@@ -109,7 +109,6 @@
- 			sw.WriteLine ();
- 			sw.WriteLine ("\t\tpublic " + retval.MarshalType + " NativeCallback (" + native_sig + ")");
- 			sw.WriteLine ("\t\t{");
--			sw.WriteLine ("\t\t\ttry {");
- 
- 			bool need_sep = false;
- 			bool throws_error = false;
-@@ -120,7 +119,7 @@
- 				Parameter p = parms [i];
- 
- 				if (p.CType == "GError**") {
--					sw.WriteLine ("\t\t\t\t" + p.Name + " = IntPtr.Zero;");
-+					sw.WriteLine ("\t\t\t" + p.Name + " = IntPtr.Zero;");
- 					throws_error = true;
- 					continue;
- 				} else if (parms.IsHidden (p))
-@@ -128,10 +127,10 @@
- 
- 				IGeneratable gen = p.Generatable;
- 
--				sw.Write("\t\t\t\t" + p.CSType + " _arg" + idx);
-+				sw.Write("\t\t\t" + p.CSType + " _arg" + idx);
- 				if (p.PassAs == "out") {
- 					sw.WriteLine(";");
--					cleanup_str += "\t\t\t\t" + p.Name + " = " + gen.CallByName ("_arg" + idx) + ";\n";
-+					cleanup_str += "\t\t\t" + p.Name + " = " + gen.CallByName ("_arg" + idx) + ";\n";
- 				} else
- 					sw.WriteLine(" = " + gen.FromNative (p.Name) + ";");
- 
-@@ -146,6 +145,7 @@
- 			bool has_out_params = cleanup_str.Length > 0;
- 			cleanup_str += "\t\t\t\tif (release_on_call)\n\t\t\t\t\tgch.Free ();\n";
- 
-+			sw.WriteLine ("\t\t\ttry {");
- 			sw.Write ("\t\t\t\t");
- 			string invoke = "managed (" + call_str + ")";
- 			if (retval.MarshalType != "void") {