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

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 2c1785b74cf313b102233f03de38e65e28006c67
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu May 21 04:32:15 2009 +0200

    build linker before csharplib and tuner as they use it

diff --git a/debian/patches/00list b/debian/patches/00list
index cca9165..2398cf2 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -11,7 +11,9 @@ fix_NetworkInterface_endless_loop
 fix_null_funcptr_marshalling_r127347
 fix_recursive_unmanaged_types
 fix_mono-api-info_build
+fix_csharplib_build
 fix_mdoc_build
+fix_tuner_build
 disable_building_convert.exe
 disable_building_RabbitMQ.Client.dll
 build_cecil_as_2.0
diff --git a/debian/patches/build_monolinker_as_2.0.dpatch b/debian/patches/build_monolinker_as_2.0.dpatch
index 12e8249..6e89083 100755
--- a/debian/patches/build_monolinker_as_2.0.dpatch
+++ b/debian/patches/build_monolinker_as_2.0.dpatch
@@ -6,8 +6,8 @@
 
 @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-05-21 02:49:26.000000000 +0200
-+++ mono-2.4+dfsg/mcs/tools/Makefile	2009-05-21 02:50:17.000000000 +0200
+--- mono-2.4+dfsg~/mcs/tools/Makefile	2009-05-21 04:30:00.000000000 +0200
++++ mono-2.4+dfsg/mcs/tools/Makefile	2009-05-21 04:31:57.000000000 +0200
 @@ -14,7 +14,6 @@
  	browsercaps-updater	\
  	monop		\
@@ -16,13 +16,11 @@ diff -urNad mono-2.4+dfsg~/mcs/tools/Makefile mono-2.4+dfsg/mcs/tools/Makefile
  	resgen		\
  	macpack		\
  	mkbundle	\
-@@ -54,7 +53,8 @@
+@@ -52,6 +51,7 @@
+ 	nunitreport	\
+ 	sqlsharp	\
  	gacutil		\
++	linker		\
  	csharplib	\
  	tuner		\
--	cil-strip
-+	cil-strip	\
-+	linker
- 
- net_2_1_dirs := \
- 	compiler-tester
+ 	cil-strip
diff --git a/debian/patches/fix_csharplib_build.dpatch b/debian/patches/fix_csharplib_build.dpatch
new file mode 100755
index 0000000..7615032
--- /dev/null
+++ b/debian/patches/fix_csharplib_build.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_csharplib_build.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/tools/csharplib/Makefile mono-2.4+dfsg/mcs/tools/csharplib/Makefile
+--- mono-2.4+dfsg~/mcs/tools/csharplib/Makefile	2009-02-14 00:36:12.000000000 +0100
++++ mono-2.4+dfsg/mcs/tools/csharplib/Makefile	2009-05-21 04:26:27.000000000 +0200
+@@ -2,7 +2,7 @@
+ SUBDIRS = 
+ include ../../build/rules.make
+ 
+-LINKER = $(topdir)/class/lib/net_1_1/monolinker.exe
++LINKER = $(topdir)/class/lib/net_2_0/monolinker.exe
+ 
+ LOCAL_MCS_FLAGS = -d:GMCS_SOURCE -d:NET_1_1 -d:NET_2_0 -r:System -r:System.Xml
+ 
diff --git a/debian/patches/fix_tuner_build.dpatch b/debian/patches/fix_tuner_build.dpatch
new file mode 100755
index 0000000..6063ef0
--- /dev/null
+++ b/debian/patches/fix_tuner_build.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_tuner_build.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/tools/tuner/Makefile mono-2.4+dfsg/mcs/tools/tuner/Makefile
+--- mono-2.4+dfsg~/mcs/tools/tuner/Makefile	2009-02-14 00:36:21.000000000 +0100
++++ mono-2.4+dfsg/mcs/tools/tuner/Makefile	2009-05-21 04:28:34.000000000 +0200
+@@ -2,7 +2,7 @@
+ SUBDIRS =
+ include ../../build/rules.make
+ 
+-LINKER = $(topdir)/class/lib/net_1_1/monolinker.exe
++LINKER = $(topdir)/class/lib/net_2_0/monolinker.exe
+ 
+ LOCAL_MCS_FLAGS = -r:System.Xml.dll -r:$(LINKER) -r:Mono.Cecil.dll
+ 

-- 
mono