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

[Mirco Bauer]

Author: meebey
Date: 2007-12-25 13:25:31 +0000 (Tue, 25 Dec 2007)
New Revision: 3556

Added:
   mono/trunk/debian/libmono-system-messaging1.0-cil.clideps-override
   mono/trunk/debian/libmono-system-messaging2.0-cil.clideps-override
   mono/trunk/debian/patches/fix_implicit_pointer_conversions.dpatch
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/patches/00list
   mono/trunk/debian/rules
Log:
mono 1.2.6+dfsg-3 release



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2007-12-23 20:39:47 UTC (rev 3555)
+++ mono/trunk/debian/changelog	2007-12-25 13:25:31 UTC (rev 3556)
@@ -1,11 +1,21 @@
-mono (1.2.6+dfsg-3) UNRELEASED; urgency=low
+mono (1.2.6+dfsg-3) unstable; urgency=low
 
   * debian/rules:
     + Pass -D to cli.binfmt install call, makes it not failing on archs that
       are not listed in debian/control.
       (thanks to Emanuele Rocca <ema at debian.org> for the hint)
+    + Enhanced "make distclean" error handling, making lintian happy.
+  * debian/libmono-system-messaging{1,2}.0-cil.clideps-override:
+    + Added suggests libmono-winforms{1,2}.0-cil, doesn't make sense to pull in
+      System.Windows.Forms for designer classes (which are only used by VS.NET)
+  * debian/patches/fix_implicit_pointer_conversions.dpatch:
+    + Fixed implicit pointer conversions by including a missing header, which
+      caused FTBFS on IA64.
+  * debian/control:
+    + Added Homepage, Vcs-Svn and Vcs-Browser fields.
+    + Updated Standards-Version to 3.7.3, no changes needed.
 
- -- Mirco Bauer <meebey at debian.org>  Sun, 23 Dec 2007 00:42:15 +0100
+ -- Mirco Bauer <meebey at debian.org>  Tue, 25 Dec 2007 13:40:33 +0100
 
 mono (1.2.6+dfsg-2) unstable; urgency=low
 

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2007-12-23 20:39:47 UTC (rev 3555)
+++ mono/trunk/debian/control	2007-12-25 13:25:31 UTC (rev 3556)
@@ -5,7 +5,10 @@
 Uploaders: Eduard Bloch <blade at debian.org>, Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.19), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxml-dom-perl, libxslt1-dev, dc, libx11-dev, libxt-dev, zlib1g-dev
 Build-Depends-Indep: libgamin-dev, libcupsys2-dev, librsvg2-dev, libgtk2.0-dev, libgnomeui-dev, libgda2-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Homepage: http://www.mono-project.com/
+Vcs-Svn: svn://svn.debian.org/pkg-mono/mono/mono/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/mono/trunk/
 
 Package: mono-common
 Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390

Added: mono/trunk/debian/libmono-system-messaging1.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-system-messaging1.0-cil.clideps-override	                        (rev 0)
+++ mono/trunk/debian/libmono-system-messaging1.0-cil.clideps-override	2007-12-25 13:25:31 UTC (rev 3556)
@@ -0,0 +1 @@
+suggests libmono-winforms1.0-cil

Added: mono/trunk/debian/libmono-system-messaging2.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-system-messaging2.0-cil.clideps-override	                        (rev 0)
+++ mono/trunk/debian/libmono-system-messaging2.0-cil.clideps-override	2007-12-25 13:25:31 UTC (rev 3556)
@@ -0,0 +1 @@
+suggests libmono-winforms2.0-cil

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2007-12-23 20:39:47 UTC (rev 3555)
+++ mono/trunk/debian/patches/00list	2007-12-25 13:25:31 UTC (rev 3556)
@@ -6,3 +6,4 @@
 fix-mono-cairo.pc.in
 fix_BigInteger_overflow_CVE-2007-5197
 fix_Mono.Cecil_linkage
+fix_implicit_pointer_conversions

Added: mono/trunk/debian/patches/fix_implicit_pointer_conversions.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_implicit_pointer_conversions.dpatch	                        (rev 0)
+++ mono/trunk/debian/patches/fix_implicit_pointer_conversions.dpatch	2007-12-25 13:25:31 UTC (rev 3556)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_implicit_pointer_conversions.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.2.6~/mono/metadata/security.c mono-1.2.6/mono/metadata/security.c
+--- mono-1.2.6~/mono/metadata/security.c	2007-11-08 23:07:19.000000000 +0100
++++ mono-1.2.6/mono/metadata/security.c	2007-12-24 15:54:02.000000000 +0100
+@@ -12,6 +12,7 @@
+ #endif
+ 
+ #include <mono/metadata/appdomain.h>
++#include <mono/metadata/assembly.h>
+ #include <mono/metadata/image.h>
+ #include <mono/metadata/exception.h>
+ #include <mono/metadata/object-internals.h>


Property changes on: mono/trunk/debian/patches/fix_implicit_pointer_conversions.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2007-12-23 20:39:47 UTC (rev 3555)
+++ mono/trunk/debian/rules	2007-12-25 13:25:31 UTC (rev 3556)
@@ -110,7 +110,7 @@
 	rm -f configure-*-stamp
 	rm -f build-*-stamp
 	rm -f install-*-stamp
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	# distclean misses stuff
 	find -name "*.mdb" -delete
 	# AOT stuff we created using mono-aot-wrapper/mono-aot-bootstrap