[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. 2.0.1-6-92-g5f57dc0

Mon May 25 18:13:12 UTC 2009

The following commit has been merged in the master branch:
commit 5479361faeee8e1781ae7519e62454324bf1b38c
Author: Mirco Bauer <meebey at meebey.net>
Date:   Wed May 20 00:30:08 2009 +0200

      * debian/patches/build_cecil_as_2.0.dpatch
        debian/patches/build_firebirdsql_as_2.0.dpatch:
        + Build Mono.Cecil and FirebirdSql.Data.Firebird for CLI 2.0.

diff --git a/debian/changelog b/debian/changelog
index b571444..7e43137 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,6 +71,9 @@ mono (2.4+dfsg-1~pre1) unstable; urgency=low
     + Fixes recursive structs regression as seen with OpenOffice.org.
   * debian/copyright:
     + Added Lucene.Net, RabbitMQ.Client and HtmlAgilityPack licenses.
+  * debian/patches/build_cecil_as_2.0.dpatch
+    debian/patches/build_firebirdsql_as_2.0.dpatch:
+    + Build Mono.Cecil and FirebirdSql.Data.Firebird for CLI 2.0.
 
  -- Mirco Bauer <meebey at debian.org>  Wed, 13 May 2009 01:40:02 +0200
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 09bbb6b..05a0cf4 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -11,6 +11,7 @@ fix_implicit_pointer_conversions
 fix_null_funcptr_marshalling_r127347
 disable_building_convert.exe
 disable_building_RabbitMQ.Client.dll
+build_cecil_as_2.0
+build_firebirdsql_as_2.0
 build_genxs_2.0
-fix_mod_script
 fix_recursive_unmanaged_types
diff --git a/debian/patches/build_cecil_as_2.0.dpatch b/debian/patches/build_cecil_as_2.0.dpatch
new file mode 100755
index 0000000..e0f6cd5
--- /dev/null
+++ b/debian/patches/build_cecil_as_2.0.dpatch
@@ -0,0 +1,65 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## build_cecil_as_2.0.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-2.4+dfsg~/mcs/class/Makefile mono-2.4+dfsg/mcs/class/Makefile
+--- mono-2.4+dfsg~/mcs/class/Makefile	2009-05-20 00:07:08.000000000 +0200
++++ mono-2.4+dfsg/mcs/class/Makefile	2009-05-20 00:12:20.000000000 +0200
+@@ -93,9 +93,7 @@
+ 	OpenSystem.C
+ 
+ net_1_1_dirs :=		\
+-	FirebirdSql.Data.Firebird	\
+-	Mono.Cecil			\
+-	Mono.Cecil.Mdb		\
++	FirebirdSql.Data.Firebird
+ 
+ net_2_0_dirs := \
+ 	Microsoft.Build.Framework	\
+@@ -121,7 +119,9 @@
+ 	System.ServiceModel.Web		\
+ 	Mono.Management			\
+ 	Mono.Options 			\
+-	Mono.Simd
++	Mono.Simd			\
++	Mono.Cecil			\
++	Mono.Cecil.Mdb
+ 
+ net_2_1_dirs := \
+ 	corlib			\
+diff -urNad mono-2.4+dfsg~/mcs/class/Mono.Cecil/Makefile mono-2.4+dfsg/mcs/class/Mono.Cecil/Makefile
+--- mono-2.4+dfsg~/mcs/class/Mono.Cecil/Makefile	2009-02-14 00:51:37.000000000 +0100
++++ mono-2.4+dfsg/mcs/class/Mono.Cecil/Makefile	2009-05-20 00:11:27.000000000 +0200
+@@ -9,7 +9,7 @@
+ 
+ NO_TEST = yes
+ 
+-ifneq (net_1_1, $(PROFILE))
++ifneq (net_2_0, $(PROFILE))
+ NO_INSTALL = yes
+ endif
+ 
+diff -urNad mono-2.4+dfsg~/mcs/tools/Makefile mono-2.4+dfsg/mcs/tools/Makefile
+--- mono-2.4+dfsg~/mcs/tools/Makefile	2009-05-20 00:07:08.000000000 +0200
++++ mono-2.4+dfsg/mcs/tools/Makefile	2009-05-20 00:13:03.000000000 +0200
+@@ -15,7 +15,6 @@
+ 	monop		\
+ 	gacutil		\
+ 	linker		\
+-	tuner		\
+ 	cil-strip	\
+ 	resgen		\
+ 	macpack		\
+@@ -53,7 +52,8 @@
+ 	nunitreport	\
+ 	sqlsharp	\
+ 	gacutil		\
+-	csharplib
++	csharplib	\
++	tuner
+ 
+ net_2_1_dirs := \
+ 	compiler-tester
diff --git a/debian/patches/build_firebirdsql_as_2.0.dpatch b/debian/patches/build_firebirdsql_as_2.0.dpatch
new file mode 100755
index 0000000..d575ef4
--- /dev/null
+++ b/debian/patches/build_firebirdsql_as_2.0.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## build_firebirdsql_as_2.0.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-2.4+dfsg~/mcs/class/Makefile mono-2.4+dfsg/mcs/class/Makefile
+--- mono-2.4+dfsg~/mcs/class/Makefile	2009-05-20 00:18:11.000000000 +0200
++++ mono-2.4+dfsg/mcs/class/Makefile	2009-05-20 00:20:55.000000000 +0200
+@@ -90,8 +90,7 @@
+ 	CustomMarshalers		\
+ 	OpenSystem.C
+ 
+-net_1_1_dirs :=		\
+-	FirebirdSql.Data.Firebird
++net_1_1_dirs :=
+ 
+ net_2_0_dirs := \
+ 	Microsoft.Build.Framework	\
+@@ -119,7 +118,8 @@
+ 	Mono.Options 			\
+ 	Mono.Simd			\
+ 	Mono.Cecil			\
+-	Mono.Cecil.Mdb
++	Mono.Cecil.Mdb			\
++	FirebirdSql.Data.Firebird
+ 
+ net_2_1_dirs := \
+ 	corlib			\
diff --git a/debian/patches/build_genxs_2.0.dpatch b/debian/patches/build_genxs_2.0.dpatch
index 559abc5..0c7f044 100755
--- a/debian/patches/build_genxs_2.0.dpatch
+++ b/debian/patches/build_genxs_2.0.dpatch
@@ -6,21 +6,19 @@
 
 @DPATCH@
 diff -urNad mono-2.4+dfsg~/mcs/tools/Makefile mono-2.4+dfsg/mcs/tools/Makefile
---- mono-2.4+dfsg~/mcs/tools/Makefile	2009-04-11 02:43:07.000000000 +0200
-+++ mono-2.4+dfsg/mcs/tools/Makefile	2009-04-11 02:44:26.000000000 +0200
-@@ -53,7 +53,8 @@
- 	nunitreport	\
- 	sqlsharp	\
- 	gacutil		\
--	csharplib
-+	csharplib	\
-+	genxs
- 
- net_2_1_dirs := \
- 	compiler-tester
+--- mono-2.4+dfsg~/mcs/tools/Makefile	2009-05-20 00:22:24.000000000 +0200
++++ mono-2.4+dfsg/mcs/tools/Makefile	2009-05-20 00:23:59.000000000 +0200
+@@ -37,6 +37,7 @@
+ 	csharp		\
+ 	mono-xsd	\
+ 	wsdl		\
++	genxs		\
+ 	compiler-tester	\
+ 	monop		\
+ 	xbuild		\
 diff -urNad mono-2.4+dfsg~/mcs/tools/genxs/Makefile mono-2.4+dfsg/mcs/tools/genxs/Makefile
---- mono-2.4+dfsg~/mcs/tools/genxs/Makefile	2009-04-11 02:43:07.000000000 +0200
-+++ mono-2.4+dfsg/mcs/tools/genxs/Makefile	2009-04-11 02:43:42.000000000 +0200
+--- mono-2.4+dfsg~/mcs/tools/genxs/Makefile	2009-05-20 00:16:56.000000000 +0200
++++ mono-2.4+dfsg/mcs/tools/genxs/Makefile	2009-05-20 00:22:38.000000000 +0200
 @@ -5,4 +5,6 @@
  LOCAL_MCS_FLAGS = -r:System.Xml.dll
  PROGRAM = $(topdir)/class/lib/$(PROFILE)/genxs.exe

-- 
mono

