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

[Sebastian Dröge]

Author: slomo
Date: 2007-11-11 11:19:31 +0000 (Sun, 11 Nov 2007)
New Revision: 3436

Removed:
   mono/trunk/debian/patches/mono-cairo_1.2.dpatch
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/patches/00list
   mono/trunk/debian/rules
Log:
* revert all changes


Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2007-11-11 11:13:07 UTC (rev 3435)
+++ mono/trunk/debian/changelog	2007-11-11 11:19:31 UTC (rev 3436)
@@ -1,10 +1,5 @@
 mono (1.2.5.1-3) UNRELEASED; urgency=low
   
-  * Sebastian 'slomo' Dröge:
-    + debian/patches/mono-cairo_1.2.dpatch,
-      debian/rules:
-      - Build Mono.Cairo with support for cairo 1.2 functions and bump
-        clilibs for this.
 
  -- Sebastian Dröge <slomo at debian.org>  Sun, 11 Nov 2007 11:54:28 +0100
 

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2007-11-11 11:13:07 UTC (rev 3435)
+++ mono/trunk/debian/patches/00list	2007-11-11 11:19:31 UTC (rev 3436)
@@ -7,4 +7,3 @@
 g_thread_init
 ppc_fix_mono_class_proxy_vtable_r84948
 fix_BigInteger_overflow_CVE-2007-5197
-mono-cairo_1.2.dpatch

Deleted: mono/trunk/debian/patches/mono-cairo_1.2.dpatch
===================================================================
--- mono/trunk/debian/patches/mono-cairo_1.2.dpatch	2007-11-11 11:13:07 UTC (rev 3435)
+++ mono/trunk/debian/patches/mono-cairo_1.2.dpatch	2007-11-11 11:19:31 UTC (rev 3436)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- mono-1.2.5.2/mcs/class/Mono.Cairo/Makefile.old	2007-11-11 12:00:10.000000000 +0100
-+++ mono-1.2.5.2/mcs/class/Mono.Cairo/Makefile	2007-11-11 12:00:12.000000000 +0100
-@@ -3,7 +3,7 @@
- include ../../build/rules.make
- 
- LIBRARY = Mono.Cairo.dll
--#LIB_MCS_FLAGS = -d:CAIRO_1_2
-+LIB_MCS_FLAGS = -d:CAIRO_1_2
- NO_TEST = yes
- 
- EXTRA_DISTFILES = \

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2007-11-11 11:13:07 UTC (rev 3435)
+++ mono/trunk/debian/rules	2007-11-11 11:19:31 UTC (rev 3436)
@@ -324,11 +324,6 @@
 	  -plibmono1.0-cil \
 	  -plibmono2.0-cil \
 	  -m $(MONO_API) internal-mono
-	# FIXME: only needed for the 1.2 methods in Mono.Cairo
-	debian/dh_makeclilibs \
-	  -plibmono-cairo1.0-cil \
-	  -plibmono-cairo2.0-cil \
-	  -m 1.2.5.2 internal-mono
 	debian/dh_clideps -i internal-mono -l debian/tmp
 	#DH_VERBOSE=1 debian/dh_clideps -i internal-mono -l debian/tmp
 	# mono-gac needs special runtime dep, to prevent circular dep (mono-runtime <-> mono-gac)