[Pkg-mono-svn-commits] rev 2696 - in mono/trunk/debian: . man patches

Mirco Bauer meebey-guest at costa.debian.org
Sun Sep 3 20:40:07 UTC 2006 

Author: meebey-guest
Date: 2006-09-03 20:40:06 +0000 (Sun, 03 Sep 2006)
New Revision: 2696

Added:
   mono/trunk/debian/man/mono-service2.1
   mono/trunk/debian/man/resgen2.1
Removed:
   mono/trunk/debian/MAINTAINERS
   mono/trunk/debian/man/mbas.1
   mono/trunk/debian/mono-mbas.install
   mono/trunk/debian/patches/fix-mono-cairo-image-surface-constructor-signature.dpatch
   mono/trunk/debian/patches/gacutil-remove-full-assembly-name.dpatch
   mono/trunk/debian/patches/ppc_missing_lock.dpatch
   mono/trunk/debian/patches/sqliteclient-ppc.dpatch
   mono/trunk/debian/patches/unix-end-point-equals.dpatch
   mono/trunk/debian/patches/unix-end-point-serialize.dpatch
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/libmono-microsoft7.0-cil.install
   mono/trunk/debian/libmono-microsoft8.0-cil.install
   mono/trunk/debian/libmono1.0-cil.install
   mono/trunk/debian/libmono2.0-cil.install
   mono/trunk/debian/mono-gmcs.install
   mono/trunk/debian/mono-gmcs.manpages
   mono/trunk/debian/mono-mcs.manpages
   mono/trunk/debian/patches/00list
   mono/trunk/debian/patches/console-no-utf8-bom.dpatch
   mono/trunk/debian/rules
Log:
- 1.1.17.1 release



Deleted: mono/trunk/debian/MAINTAINERS
===================================================================
--- mono/trunk/debian/MAINTAINERS	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/MAINTAINERS	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,6 +0,0 @@
-The Debian Mono Group maintains the Mono packages in Debian.
-In this group are prefered maintainers for certain packages.
-
-Current maintainers of the "mono" packages are:
-
-Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>

Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/changelog	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,11 +1,33 @@
-mono (1.1.13.8-2) unstable; urgency=low
+mono (1.1.17.1-0pre1) unstable; urgency=low
 
+  * New upstream release
+  * Mirco 'meebey' Bauer:
+    + debian/patches/unix-end-point-serialize.dpatch
+    + debian/patches/unix-end-point-equals.dpatch
+    + debian/patches/fix-mono-cairo-image-surface-constructor-signature.dpatch
+    + debian/patches/ppc_missing_lock.dpatch
+    + debian/patches/sqliteclient-ppc.dpatch
+    + debian/patches/gacutil-remove-full-assembly-name.dpatch:
+      - Removed, already applied upstream.
+    + debian/patches/console-no-utf8-bom.dpatch:
+      - Updated, thanks to Sebastian 'slomo' Dröge.
+    + debian/control:
+      - Removed mono-mbas package.
+    + debian/libmono-microsoft{7,8}.0-cil.install
+      debian/mono-mbas.install
+      debian/mono-mcs.manpages:
+      - Removed VB.NET, upstream split it into a separate tarball. 
+    + debian/mono-gmcs.install:
+      - Added bin/resgen2 and bin/mono-service2
+    + debian/libmono{1,2}.0-cil.install:
+      - Added mono-service.exe
+    + Updated to Standards Version 3.7.2 (no changes needed).
   * Sebastian 'slomo' Dröge:
     + debian/mono.runtime-script:
       - don't fail on removal if an assembly can't be removed. This is most
         likely the case because the assembly is already gone.
 
- -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Tue, 11 Jul 2006 18:54:42 +0200
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 3 Sep 2006 17:19:37 +0200
 
 mono (1.1.13.8-1) unstable; urgency=low
 

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/control	2006-09-03 20:40:06 UTC (rev 2696)
@@ -4,7 +4,7 @@
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade at debian.org>, Mirco Bauer <meebey at meebey.net>, Sebastian Dröge <slomo at ubuntu.com>
 Build-Depends: debhelper (>= 5.0.0), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxslt1-dev, dc, libx11-dev, libxt-dev, libgc-dev [kfreebsd-i386]
-Standards-Version: 3.6.2.1
+Standards-Version: 3.7.2
 
 Package: mono-common
 Architecture: i386 powerpc amd64 ia64 arm armeb
@@ -889,21 +889,6 @@
  runtime, which can produce and execute CIL (Common Intermediate Language)
  bytecode (aka assemblies), and a class library.
 
-Package: mono-mbas
-Section: devel
-Architecture: all
-Depends: ${cli:Depends}
-Replaces: mono-mcs (<< 1.1.13.6-1)
-Description: Mono Basic compiler
- This is the Mono Basic compiler, a platform-independent compiler which
- produces CIL (Common Intermediate Language) binary executables.
- .
- Mono is a platform for running and developing applications based on the
- ECMA/ISO Standards. Mono is an open source effort led by Novell.
- Mono provides a complete CLR (Common Language Runtime) including compiler and
- runtime, which can produce and execute CIL (Common Intermediate Language)
- bytecode (aka assemblies), and a class library.
-
 Package: mono-mjs
 Section: devel
 Architecture: all

Modified: mono/trunk/debian/libmono-microsoft7.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-microsoft7.0-cil.install	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/libmono-microsoft7.0-cil.install	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,8 +1,6 @@
 debian/tmp/usr/lib/mono/gac/Microsoft.JScript/7.0.*/
-debian/tmp/usr/lib/mono/gac/Microsoft.VisualBasic/7.0.*/
 debian/tmp/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/
 debian/tmp/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/
 debian/tmp/usr/lib/mono/1.0/Microsoft.JScript.dll
-debian/tmp/usr/lib/mono/1.0/Microsoft.VisualBasic.dll
 debian/tmp/usr/lib/mono/1.0/Microsoft.VisualC.dll
 debian/tmp/usr/lib/mono/1.0/Microsoft.Vsa.dll

Modified: mono/trunk/debian/libmono-microsoft8.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-microsoft8.0-cil.install	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/libmono-microsoft8.0-cil.install	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,8 +1,6 @@
 debian/tmp/usr/lib/mono/gac/Microsoft.JScript/8.0.*/
-debian/tmp/usr/lib/mono/gac/Microsoft.VisualBasic/8.0.*/
 debian/tmp/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/
 debian/tmp/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/
 debian/tmp/usr/lib/mono/2.0/Microsoft.JScript.dll
-debian/tmp/usr/lib/mono/2.0/Microsoft.VisualBasic.dll
 debian/tmp/usr/lib/mono/2.0/Microsoft.VisualC.dll
 debian/tmp/usr/lib/mono/2.0/Microsoft.Vsa.dll

Modified: mono/trunk/debian/libmono1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono1.0-cil.install	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/libmono1.0-cil.install	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,2 +1,3 @@
 debian/tmp/usr/lib/mono/gac/Mono.*/1.0.*/
+debian/tmp/usr/lib/mono/gac/mono-service/1.0.*/
 debian/tmp/usr/lib/mono/1.0/Mono.*.dll

Modified: mono/trunk/debian/libmono2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono2.0-cil.install	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/libmono2.0-cil.install	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,2 +1,3 @@
 debian/tmp/usr/lib/mono/gac/Mono.*/2.0.*/
+debian/tmp/usr/lib/mono/gac/mono-service/2.0.*/
 debian/tmp/usr/lib/mono/2.0/Mono.*.dll

Deleted: mono/trunk/debian/man/mbas.1
===================================================================
--- mono/trunk/debian/man/mbas.1	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/man/mbas.1	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,11 +0,0 @@
-.TH UNDOCUMENTED 1 "January 15th, 2004" "Debian GNU/Linux" "Mono Manual"
-.SH NAME
-undocumented \- No manpage for this program.
-.SH DESCRIPTION
-This
-.B program
-does not have a manpage. Run this command with the
-.B help
-switch to see what it does. For further information, refer to the .NET
-documentation from the Mono project, located on
-.B http://www.go-mono.com:8080/

Added: mono/trunk/debian/man/mono-service2.1
===================================================================
--- mono/trunk/debian/man/mono-service2.1	                        (rev 0)
+++ mono/trunk/debian/man/mono-service2.1	2006-09-03 20:40:06 UTC (rev 2696)
@@ -0,0 +1,11 @@
+.TH UNDOCUMENTED 1 "January 15th, 2004" "Debian GNU/Linux" "Mono Manual"
+.SH NAME
+undocumented \- No manpage for this program.
+.SH DESCRIPTION
+This
+.B program
+does not have a manpage. Run this command with the
+.B help
+switch to see what it does. For further information, refer to the .NET
+documentation from the Mono project, located on
+.B http://www.go-mono.com:8080/

Added: mono/trunk/debian/man/resgen2.1
===================================================================
--- mono/trunk/debian/man/resgen2.1	                        (rev 0)
+++ mono/trunk/debian/man/resgen2.1	2006-09-03 20:40:06 UTC (rev 2696)
@@ -0,0 +1,11 @@
+.TH UNDOCUMENTED 1 "January 15th, 2004" "Debian GNU/Linux" "Mono Manual"
+.SH NAME
+undocumented \- No manpage for this program.
+.SH DESCRIPTION
+This
+.B program
+does not have a manpage. Run this command with the
+.B help
+switch to see what it does. For further information, refer to the .NET
+documentation from the Mono project, located on
+.B http://www.go-mono.com:8080/

Modified: mono/trunk/debian/mono-gmcs.install
===================================================================
--- mono/trunk/debian/mono-gmcs.install	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/mono-gmcs.install	2006-09-03 20:40:06 UTC (rev 2696)
@@ -2,6 +2,8 @@
 debian/tmp/usr/bin/wsdl2
 debian/tmp/usr/bin/monop2
 debian/tmp/usr/bin/ilasm2
+debian/tmp/usr/bin/resgen2
+debian/tmp/usr/bin/mono-service2
 debian/tmp/usr/bin/xbuild
 debian/tmp/usr/lib/mono/2.0/*.exe*
 debian/tmp/usr/lib/mono/xbuild/

Modified: mono/trunk/debian/mono-gmcs.manpages
===================================================================
--- mono/trunk/debian/mono-gmcs.manpages	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/mono-gmcs.manpages	2006-09-03 20:40:06 UTC (rev 2696)
@@ -2,4 +2,6 @@
 debian/man/wsdl2.1
 debian/man/monop2.1
 debian/man/ilasm2.1
+debian/man/resgen2.1
+debian/man/mono-service2.1
 debian/man/xbuild.1

Deleted: mono/trunk/debian/mono-mbas.install
===================================================================
--- mono/trunk/debian/mono-mbas.install	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/mono-mbas.install	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,2 +0,0 @@
-debian/tmp/usr/bin/mbas
-debian/tmp/usr/lib/mono/1.0/mbas.exe*

Modified: mono/trunk/debian/mono-mcs.manpages
===================================================================
--- mono/trunk/debian/mono-mcs.manpages	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/mono-mcs.manpages	2006-09-03 20:40:06 UTC (rev 2696)
@@ -10,7 +10,6 @@
 debian/tmp/usr/share/man/man1/ilasm.1
 debian/tmp/usr/share/man/man1/macpack.1
 debian/tmp/usr/share/man/man1/makecert.1
-debian/man/mbas.1
 debian/tmp/usr/share/man/man1/mcs.1
 debian/man/mjs.1
 debian/tmp/usr/share/man/man1/mkbundle.1

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/patches/00list	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,8 +1,2 @@
 remove_broken_dllmap_from_mono-shlib-cop.dpatch
-unix-end-point-serialize.dpatch
-unix-end-point-equals.dpatch
-fix-mono-cairo-image-surface-constructor-signature.dpatch
-ppc_missing_lock.dpatch
-sqliteclient-ppc.dpatch
 console-no-utf8-bom.dpatch
-gacutil-remove-full-assembly-name.dpatch

Modified: mono/trunk/debian/patches/console-no-utf8-bom.dpatch
===================================================================
--- mono/trunk/debian/patches/console-no-utf8-bom.dpatch	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/patches/console-no-utf8-bom.dpatch	2006-09-03 20:40:06 UTC (rev 2696)
@@ -2,16 +2,15 @@
 
 @DPATCH@
 
---- trunk/mcs/class/corlib/System/Console.cs	2006/01/02 20:42:25	54982
-+++ trunk/mcs/class/corlib/System/Console.cs	2006/01/20 00:47:16	55804
-@@ -63,8 +63,7 @@
- 				// On Unix systems (128), do not output the
- 				// UTF-8 ZWNBSP (zero-width non-breaking space).
- 				//
-+				if (code_page == UTF8Encoding.UTF8_CODE_PAGE || ((code_page & 0x10000000) != 0))
+--- trunk/mcs/class/corlib/System/Console.cs.old	2006-08-29 18:21:12.473936000 +0200
++++ trunk/mcs/class/corlib/System/Console.cs	2006-08-29 18:23:46.607568750 +0200
+@@ -97,8 +97,7 @@
+ 				int code_page = 0;
+ 				Encoding.InternalCodePage (ref code_page);
+ 
 -				if (code_page != -1 && ((code_page & 0x0fffffff) == 3 // UTF8Encoding.UTF8_CODE_PAGE
 -					|| ((code_page & 0x10000000) != 0)))
- 					encoding = Encoding.UTF8Unmarked;
++				if (code_page == UTF8Encoding.UTF8_CODE_PAGE || ((code_page & 0x10000000) != 0))
+ 					inputEncoding = outputEncoding = Encoding.UTF8Unmarked;
  				else
- 					encoding = Encoding.Default;
-
+ 					inputEncoding = outputEncoding = Encoding.Default;

Deleted: mono/trunk/debian/patches/fix-mono-cairo-image-surface-constructor-signature.dpatch
===================================================================
--- mono/trunk/debian/patches/fix-mono-cairo-image-surface-constructor-signature.dpatch	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/patches/fix-mono-cairo-image-surface-constructor-signature.dpatch	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
-Index: mono/mcs/class/Mono.Cairo/Mono.Cairo/Surface.cs
-===================================================================
---- mono/mcs/class/Mono.Cairo/Mono.Cairo/Surface.cs	(revision 60174)
-+++ mono/mcs/class/Mono.Cairo/Mono.Cairo/Surface.cs	(revision 60175)
-@@ -47,7 +47,7 @@
- 			}
- 		}
- 
--		public ImageSurface (string data, Cairo.Format format, int width, int height, int stride)
-+		public ImageSurface (ref byte[] data, Cairo.Format format, int width, int height, int stride)
- 		{
- 			surface = CairoAPI.cairo_image_surface_create_for_data (data, format, width, height, stride);
- 			lock (surfaces.SyncRoot){
-@@ -183,7 +183,7 @@
- 		
- 		[Obsolete ("Use an ImageSurface constructor instead.")]
-                 public static Cairo.Surface CreateForImage (
--                        string data, Cairo.Format format, int width, int height, int stride)
-+                        ref byte[] data, Cairo.Format format, int width, int height, int stride)
-                 {
-                         IntPtr p = CairoAPI.cairo_image_surface_create_for_data (
-                                 data, format, width, height, stride);
-Index: mono/mcs/classMono.Cairo/Cairo.cs
-===================================================================
---- mono/mcs/class/Mono.Cairo/Mono.Cairo/Cairo.cs	(revision 60174)
-+++ mono/mcs/class/Mono.Cairo/Mono.Cairo/Cairo.cs	(revision 60175)
-@@ -246,7 +246,7 @@
- 		internal static extern IntPtr cairo_image_surface_create (Cairo.Format format, int width, int height);
- 		
- 		[DllImport (cairo)]
--		internal static extern IntPtr cairo_image_surface_create_for_data (string data, Cairo.Format format, int width, int height, int stride);
-+		internal static extern IntPtr cairo_image_surface_create_for_data (byte[] data, Cairo.Format format, int width, int height, int stride);
- 		
- 		[DllImport (cairo)]
- 		internal static extern IntPtr cairo_image_surface_create_from_png  (string filename);
-

Deleted: mono/trunk/debian/patches/gacutil-remove-full-assembly-name.dpatch
===================================================================
--- mono/trunk/debian/patches/gacutil-remove-full-assembly-name.dpatch	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/patches/gacutil-remove-full-assembly-name.dpatch	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- mono-1.1.13.8/mcs/tools/gacutil/driver.cs	2006-05-11 00:33:17.000000000 +0200
-+++ mono-1.1.13.6/mcs/tools/gacutil/driver.cs	2006-07-04 18:18:26.939598500 +0200
-@@ -549,7 +549,7 @@
- 			version = asm_info ["version"] as string;
- 			version = (version == null ? "*" : version);
- 			culture = asm_info ["culture"] as string;
--			culture = (culture == null ? "*" : culture.ToLower (CultureInfo.InvariantCulture));
-+			culture = (culture == null ? "*" : (culture == "neutral") ? String.Empty : culture.ToLower (CultureInfo.InvariantCulture));
- 			token = asm_info ["publickeytoken"] as string;
- 			token = (token == null ? "*" : token.ToLower (CultureInfo.InvariantCulture));
-

Deleted: mono/trunk/debian/patches/ppc_missing_lock.dpatch
===================================================================
--- mono/trunk/debian/patches/ppc_missing_lock.dpatch	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/patches/ppc_missing_lock.dpatch	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- mono/mono/mini/tramp-ppc.c	2006/06/02 14:41:59	61407
-+++ mono/mono/mini/tramp-ppc.c	2006/06/15 14:56:09	61756
-@@ -34,11 +34,14 @@
- {
- 	guint8 *code, *start;
- 	int this_pos = 3;
-+	MonoDomain *domain = mono_domain_get ();
- 
- 	if (!mono_method_signature (m)->ret->byref && MONO_TYPE_ISSTRUCT (mono_method_signature (m)->ret))
- 		this_pos = 4;
- 	    
--	start = code = g_malloc (20);
-+	mono_domain_lock (domain);
-+	start = code = mono_code_manager_reserve (domain->code_mp, 20);
-+	mono_domain_unlock (domain);
- 
- 	ppc_load (code, ppc_r0, addr);
- 	ppc_mtctr (code, ppc_r0);
-@@ -235,7 +238,7 @@
- 		/* Now we'll create in 'buf' the PowerPC trampoline code. This
- 		 is the trampoline code common to all methods  */
- 		
--		code = buf = g_malloc(512);
-+		code = buf = mono_global_codeman_reserve (512);
- 		
- 		ppc_stwu (buf, ppc_r1, -STACK, ppc_r1);
- 
-@@ -492,7 +495,6 @@
- 	use r11 to keep that value, for instance. However, the generic part of
- 	the trampoline relies on r11 having the same value it had before coming
- 	here, so we must save it before. */
--	//code = buf = g_malloc(METHOD_TRAMPOLINE_SIZE);
- 	mono_domain_lock (vtable->domain);
- 	code = buf = mono_code_manager_reserve (vtable->domain->code_mp, METHOD_TRAMPOLINE_SIZE);
- 	mono_domain_unlock (vtable->domain);
-

Deleted: mono/trunk/debian/patches/sqliteclient-ppc.dpatch
===================================================================
--- mono/trunk/debian/patches/sqliteclient-ppc.dpatch	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/patches/sqliteclient-ppc.dpatch	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- mono/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteCommand.cs	(Revision 60675)
-+++ mono/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteCommand.cs	(Revision 60676)
-@@ -517,10 +517,7 @@
- 
- 		public int LastInsertRowID () 
- 		{
--			if (parent_conn.Version == 3)
--				return Sqlite.sqlite3_last_insert_rowid(parent_conn.Handle);
--			else
--				return Sqlite.sqlite_last_insert_rowid(parent_conn.Handle);
-+			return parent_conn.LastInsertRowId;
- 		}
- 		
- 		private string GetError3() {
---- mono/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/Sqlite.cs	(Revision 60675)
-+++ mono/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/Sqlite.cs	(Revision 60676)
-@@ -151,7 +151,7 @@
- 		internal static extern int sqlite3_changes (IntPtr handle);
- 
- 		[DllImport("sqlite3")]
--		internal static extern int sqlite3_last_insert_rowid (IntPtr sqlite_handle);
-+		internal static extern long sqlite3_last_insert_rowid (IntPtr sqlite_handle);
- 
- 		[DllImport ("sqlite3")]
- 		internal static extern SqliteError sqlite3_prepare16 (IntPtr sqlite_handle, IntPtr zSql, int zSqllen, out IntPtr pVm, out IntPtr pzTail);
---- mono/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteConnection.cs	(Revision 60675)
-+++ mono/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteConnection.cs	(Revision 60676)
-@@ -110,7 +110,7 @@
- 		public int LastInsertRowId {
- 			get {
- 				if (Version == 3)
--					return Sqlite.sqlite3_last_insert_rowid (Handle);
-+					return (int)Sqlite.sqlite3_last_insert_rowid (Handle);
- 				else
- 					return Sqlite.sqlite_last_insert_rowid (Handle);
- 			}
-

Deleted: mono/trunk/debian/patches/unix-end-point-equals.dpatch
===================================================================
--- mono/trunk/debian/patches/unix-end-point-equals.dpatch	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/patches/unix-end-point-equals.dpatch	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,137 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
-Index: mono/mcs/class/Mono.Posix/Mono.Unix/UnixEndPoint.cs
-===================================================================
---- mono/mcs/class/Mono.Posix/Mono.Unix/UnixEndPoint.cs	(revision 57753)
-+++ mono/mcs/class/Mono.Posix/Mono.Unix/UnixEndPoint.cs	(revision 57754)
-@@ -41,6 +41,11 @@
- 		
- 		public UnixEndPoint (string filename)
- 		{
-+			if (filename == null)
-+				throw new ArgumentNullException ("filename");
-+
-+			if (filename == "")
-+				throw new ArgumentException ("Cannot be empty.", "filename");
- 			this.filename = filename;
- 		}
- 		
-@@ -93,6 +98,20 @@
- 		public override string ToString() {
- 			return(filename);
- 		}
-+
-+		public override int GetHashCode ()
-+		{
-+			return filename.GetHashCode ();
-+		}
-+
-+		public override bool Equals (object o)
-+		{
-+			UnixEndPoint other = o as UnixEndPoint;
-+			if (other == null)
-+				return false;
-+
-+			return (other.filename == filename);
-+		}
- 	}
- }
- 
-Index: mono/mcs/class/Mono.Posix/Mono.Posix/UnixEndPoint.cs
-===================================================================
---- mono/mcs/class/Mono.Posix/Mono.Posix/UnixEndPoint.cs	(revision 57754)
-+++ mono/mcs/class/Mono.Posix/Mono.Posix/UnixEndPoint.cs	(revision 57755)
-@@ -42,6 +42,11 @@
- 		
- 		public UnixEndPoint (string filename)
- 		{
-+			if (filename == null)
-+				throw new ArgumentNullException ("filename");
-+
-+			if (filename == "")
-+				throw new ArgumentException ("Cannot be empty.", "filename");
- 			this.filename = filename;
- 		}
- 		
-@@ -60,8 +65,6 @@
- 
- 		public override EndPoint Create (SocketAddress socketAddress)
- 		{
--			int size = socketAddress.Size;
--			byte [] bytes = new byte [size];
- 			/*
- 			 * Should also check this
- 			 *
-@@ -73,8 +76,9 @@
- 				throw new ArgumentException ("socketAddress is not a unix socket address.");
- 			 */
- 
--			for (int i = 2; i < size - 2; i++) {
--				bytes [i] = socketAddress [i];
-+			byte [] bytes = new byte [socketAddress.Size - 2];
-+			for (int i = 0; i < bytes.Length; i++) {
-+				bytes [i] = socketAddress [i + 2];
- 			}
- 
- 			string name = Encoding.Default.GetString (bytes);
-@@ -95,6 +99,20 @@
- 		public override string ToString() {
- 			return(filename);
- 		}
-+
-+		public override int GetHashCode ()
-+		{
-+			return filename.GetHashCode ();
-+		}
-+
-+		public override bool Equals (object o)
-+		{
-+			UnixEndPoint other = o as UnixEndPoint;
-+			if (other == null)
-+				return false;
-+
-+			return (other.filename == filename);
-+		}
- 	}
- }
- 
-Index: mono/mono/metadata/socket-io.c
-===================================================================
---- mono/mono/metadata/socket-io.c	(revision 57755)
-+++ mono/mono/metadata/socket-io.c	(revision 57756)
-@@ -823,7 +823,19 @@
- 	field=mono_class_get_field_from_name(sockaddr_class, "data");
- 
- 	/* Make sure there is space for the family and size bytes */
--	data=mono_array_new(domain, mono_get_byte_class (), sa_size+2);
-+#ifdef HAVE_SYS_UN_H
-+	if (saddr->sa_family == AF_UNIX) {
-+		/* sa_len includes the entire sockaddr size, so we don't need the
-+		 * N bytes (sizeof (unsigned short)) of the family. */
-+		data=mono_array_new(domain, mono_get_byte_class (), sa_size - 2);
-+	} else
-+#endif
-+	{
-+		/* May be the +2 here is too conservative, as sa_len returns
-+		 * the length of the entire sockaddr_in/in6, including
-+		 * sizeof (unsigned short) of the family */
-+		data=mono_array_new(domain, mono_get_byte_class (), sa_size+2);
-+	}
- 
- 	/* The data buffer is laid out as follows:
- 	 * bytes 0 and 1 are the address family
-Index: mono/mcs/class/System/System.Net.Sockets/Socket.cs
-===================================================================
---- mono/mcs/class/System/System.Net.Sockets/Socket.cs	(revision 57756)
-+++ mono/mcs/class/System/System.Net.Sockets/Socket.cs	(revision 57757)
-@@ -508,7 +508,7 @@
- 			ConstructorInfo cons=unixendpointtype.GetConstructor(arg_types);
- 
- 			object[] args=new object[1];
--			args[0]="";
-+			args[0]="nothing";
- 
- 			unixendpoint=cons.Invoke(args);
- 		}

Deleted: mono/trunk/debian/patches/unix-end-point-serialize.dpatch
===================================================================
--- mono/trunk/debian/patches/unix-end-point-serialize.dpatch	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/patches/unix-end-point-serialize.dpatch	2006-09-03 20:40:06 UTC (rev 2696)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- mono/mcs/class/Mono.Posix/Mono.Unix/UnixEndPoint.cs	2005/06/29 09:50:30	46710
-+++ mono/mcs/class/Mono.Posix/Mono.Unix/UnixEndPoint.cs	2006/02/18 03:33:01	57026
-@@ -59,8 +59,6 @@
- 
- 		public override EndPoint Create (SocketAddress socketAddress)
- 		{
--			int size = socketAddress.Size;
--			byte [] bytes = new byte [size];
- 			/*
- 			 * Should also check this
- 			 *
-@@ -72,8 +70,9 @@
- 				throw new ArgumentException ("socketAddress is not a unix socket address.");
- 			 */
- 
--			for (int i = 2; i < size - 2; i++) {
--				bytes [i] = socketAddress [i];
-+			byte [] bytes = new byte [socketAddress.Size - 2];
-+			for (int i = 0; i < bytes.Length; i++) {
-+				bytes [i] = socketAddress [i + 2];
- 			}
- 
- 			string name = Encoding.Default.GetString (bytes);
-

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2006-09-03 16:55:55 UTC (rev 2695)
+++ mono/trunk/debian/rules	2006-09-03 20:40:06 UTC (rev 2696)
@@ -83,6 +83,8 @@
 	rm -f debian/tmp/usr/bin/prj2make
 	rm -f debian/usr/share/man/man1/prj2make.1
 	rm -f debian/tmp/usr/lib/mono/1.0/prj2make.exe*
+	# upstream forgot to remove this one
+	rm -f debian/tmp/usr/bin/mbas
 	install -D -m 755 cli-wrapper debian/mono-common/usr/bin/cli-wrapper
 	cd debian/detector && \
 	  $(MAKE) && \
@@ -113,9 +115,6 @@
 	# delete gacutil from mono-mcs (this is already in mono-gac)
 	rm debian/mono-mcs/usr/bin/gacutil
 	rm debian/mono-mcs/usr/lib/mono/1.0/gacutil.exe*
-	# delete mbas from mono-mcs (this is already in mono-mbas)
-	rm debian/mono-mcs/usr/bin/mbas
-	rm debian/mono-mcs/usr/lib/mono/1.0/mbas.exe*
 	# delete mjs from mono-mcs (this is already in mono-mjs)
 	rm debian/mono-mcs/usr/bin/mjs
 	rm debian/mono-mcs/usr/lib/mono/1.0/mjs.exe*
@@ -127,6 +126,10 @@
 	rm debian/mono-mcs/usr/bin/monop2
 	# delete ilasm2 from mono-mcs (this is already in mono-gmcs)
 	rm debian/mono-mcs/usr/bin/ilasm2
+	# delete resgen2 from mono-mcs (this is already in mono-gmcs)
+	rm debian/mono-mcs/usr/bin/resgen2
+	# delete mono-service2 from mono-mcs (this is already in mono-gmcs)
+	rm debian/mono-mcs/usr/bin/mono-service2
 	# delete xbuild from mono-mcs (this is already in mono-gmcs)
 	rm debian/mono-mcs/usr/bin/xbuild
 	# delete Mono.Data.Tds from libmono1.0/2.0-cil (those are already in libmono-data-tds*-cil)

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