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

[Mirco Bauer]

Author: meebey-guest
Date: 2006-03-11 23:16:25 +0000 (Sat, 11 Mar 2006)
New Revision: 2320

Added:
   mono/trunk/debian/patches/unix-end-point-serialize.dpatch
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/patches/00list
   mono/trunk/debian/rules
Log:
- last minute patches from ubuntu



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2006-03-11 22:44:24 UTC (rev 2319)
+++ mono/trunk/debian/changelog	2006-03-11 23:16:25 UTC (rev 2320)
@@ -35,6 +35,12 @@
       - Updated support archs list.
     + debian/changelog:
       - Fixed indentation of some entries.
+  * Sebastian Dröge
+    + debian/patches/unix-end-point-serialize.dpatch (SVN rev 57026):
+      - Fix the serialization of UnixEndPoint
+    + debian/rules:
+      - Add debian/libmono0/usr/lib to the search path of dh_shlibdeps to get
+        the missing libmono0 dependencies in mono-jit and mono-utils.
 
  -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sat, 11 Mar 2006 22:46:42 +0100
 

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2006-03-11 22:44:24 UTC (rev 2319)
+++ mono/trunk/debian/patches/00list	2006-03-11 23:16:25 UTC (rev 2320)
@@ -1 +1,2 @@
-remove_broken_dllmap_from_mono-shlib-cop
+remove_broken_dllmap_from_mono-shlib-cop.dpatch
+unix-end-point-serialize.dpatch

Added: mono/trunk/debian/patches/unix-end-point-serialize.dpatch
===================================================================
--- mono/trunk/debian/patches/unix-end-point-serialize.dpatch	2006-03-11 22:44:24 UTC (rev 2319)
+++ mono/trunk/debian/patches/unix-end-point-serialize.dpatch	2006-03-11 23:16:25 UTC (rev 2320)
@@ -0,0 +1,28 @@
+#! /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);
+


Property changes on: mono/trunk/debian/patches/unix-end-point-serialize.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2006-03-11 22:44:24 UTC (rev 2319)
+++ mono/trunk/debian/rules	2006-03-11 23:16:25 UTC (rev 2320)
@@ -171,12 +171,11 @@
 	dh_installman -s
 	dh_installexamples -pmono-jay $(CURDIR)/mcs/jay/skeleton.cs
 	dh_strip -s
-	dh_compress -s
 	dh_compress -s -Xskeleton.cs
 	dh_fixperms -s
 	dh_makeshlibs -plibmono0 -V libmono-$(UPVERSION)
 	dh_installdeb -s
-	dh_shlibdeps -s -Xlibmono-profiler-cov
+	dh_shlibdeps -s -Xlibmono-profiler-cov -ldebian/libmono0/usr/lib
 	dh_gencontrol -s -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)
 	dh_md5sums -s
 	dh_builddeb -s