[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 29a0cbf035e0d97f1ba543aa09cbd1714addc559
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu May 21 13:55:29 2009 +0200

    merged/split build_cecil_as_2.0.dpatch and build_cil-strip_as_2.0.dpatch into build_tuner_linker_cil-strip_as_2.0.dpatch

diff --git a/debian/patches/00list b/debian/patches/00list
index 2398cf2..2a069ad 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -18,7 +18,6 @@ disable_building_convert.exe
 disable_building_RabbitMQ.Client.dll
 build_cecil_as_2.0
 build_firebirdsql_as_2.0
+build_tuner_linker_cil-strip_as_2.0
 build_permview_as_2.0
 build_genxs_2.0
-build_cil-strip_as_2.0
-build_monolinker_as_2.0
diff --git a/debian/patches/build_cecil_as_2.0.dpatch b/debian/patches/build_cecil_as_2.0.dpatch
index e0f6cd5..54e4604 100755
--- a/debian/patches/build_cecil_as_2.0.dpatch
+++ b/debian/patches/build_cecil_as_2.0.dpatch
@@ -41,25 +41,3 @@ diff -urNad mono-2.4+dfsg~/mcs/class/Mono.Cecil/Makefile mono-2.4+dfsg/mcs/class
 +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_cil-strip_as_2.0.dpatch b/debian/patches/build_cil-strip_as_2.0.dpatch
deleted file mode 100755
index 6d5f1d4..0000000
--- a/debian/patches/build_cil-strip_as_2.0.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build_cil-strip_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/tools/Makefile mono-2.4+dfsg/mcs/tools/Makefile
---- mono-2.4+dfsg~/mcs/tools/Makefile	2009-05-21 02:39:52.000000000 +0200
-+++ mono-2.4+dfsg/mcs/tools/Makefile	2009-05-21 02:47:38.000000000 +0200
-@@ -15,7 +15,6 @@
- 	monop		\
- 	gacutil		\
- 	linker		\
--	cil-strip	\
- 	resgen		\
- 	macpack		\
- 	mkbundle	\
-@@ -54,7 +53,8 @@
- 	sqlsharp	\
- 	gacutil		\
- 	csharplib	\
--	tuner
-+	tuner		\
-+	cil-strip
- 
- net_2_1_dirs := \
- 	compiler-tester
diff --git a/debian/patches/build_genxs_2.0.dpatch b/debian/patches/build_genxs_2.0.dpatch
index 0c7f044..aeb46a8 100755
--- a/debian/patches/build_genxs_2.0.dpatch
+++ b/debian/patches/build_genxs_2.0.dpatch
@@ -6,9 +6,9 @@
 
 @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-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 @@
+--- mono-2.4+dfsg~/mcs/tools/Makefile	2009-05-21 13:52:09.000000000 +0200
++++ mono-2.4+dfsg/mcs/tools/Makefile	2009-05-21 13:52:35.000000000 +0200
+@@ -35,6 +35,7 @@
  	csharp		\
  	mono-xsd	\
  	wsdl		\
@@ -17,8 +17,8 @@ diff -urNad mono-2.4+dfsg~/mcs/tools/Makefile mono-2.4+dfsg/mcs/tools/Makefile
  	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-05-20 00:16:56.000000000 +0200
-+++ mono-2.4+dfsg/mcs/tools/genxs/Makefile	2009-05-20 00:22:38.000000000 +0200
+--- mono-2.4+dfsg~/mcs/tools/genxs/Makefile	2009-05-21 13:52:08.000000000 +0200
++++ mono-2.4+dfsg/mcs/tools/genxs/Makefile	2009-05-21 13:52:35.000000000 +0200
 @@ -5,4 +5,6 @@
  LOCAL_MCS_FLAGS = -r:System.Xml.dll
  PROGRAM = $(topdir)/class/lib/$(PROFILE)/genxs.exe
@@ -26,3 +26,14 @@ diff -urNad mono-2.4+dfsg~/mcs/tools/genxs/Makefile mono-2.4+dfsg/mcs/tools/genx
 +CLEAN_FILES = *.exe *.mdb
 +
  include ../../build/executable.make
+diff -urNad mono-2.4+dfsg~/scripts/Makefile.am mono-2.4+dfsg/scripts/Makefile.am
+--- mono-2.4+dfsg~/scripts/Makefile.am	2009-02-14 00:32:38.000000000 +0100
++++ mono-2.4+dfsg/scripts/Makefile.am	2009-05-21 13:54:16.000000000 +0200
+@@ -83,6 +83,7 @@
+ 
+ scripts_2_0 = \
+ 	al2$(SCRIPT_SUFFIX)			\
++	genxs2$(SCRIPT_SUFFIX)			\
+ 	csharp$(SCRIPT_SUFFIX)			\
+ 	gacutil2$(SCRIPT_SUFFIX)		\
+ 	gmcs$(SCRIPT_SUFFIX)			\
diff --git a/debian/patches/build_monolinker_as_2.0.dpatch b/debian/patches/build_tuner_linker_cil-strip_as_2.0.dpatch
similarity index 55%
rename from debian/patches/build_monolinker_as_2.0.dpatch
rename to debian/patches/build_tuner_linker_cil-strip_as_2.0.dpatch
index 6e89083..156c0a2 100755
--- a/debian/patches/build_monolinker_as_2.0.dpatch
+++ b/debian/patches/build_tuner_linker_cil-strip_as_2.0.dpatch
@@ -1,26 +1,30 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## build_monolinker_as_2.0.dpatch by Mirco Bauer <meebey at debian.org>
+## build_tuner_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.
 
 @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 04:30:00.000000000 +0200
-+++ mono-2.4+dfsg/mcs/tools/Makefile	2009-05-21 04:31:57.000000000 +0200
-@@ -14,7 +14,6 @@
+--- mono-2.4+dfsg~/mcs/tools/Makefile	2009-05-21 13:40:48.000000000 +0200
++++ mono-2.4+dfsg/mcs/tools/Makefile	2009-05-21 13:47:59.000000000 +0200
+@@ -14,9 +14,6 @@
  	browsercaps-updater	\
  	monop		\
  	gacutil		\
 -	linker		\
+-	tuner		\
+-	cil-strip	\
  	resgen		\
  	macpack		\
  	mkbundle	\
-@@ -52,6 +51,7 @@
+@@ -53,6 +50,9 @@
  	nunitreport	\
  	sqlsharp	\
  	gacutil		\
++	tuner		\
 +	linker		\
- 	csharplib	\
- 	tuner		\
- 	cil-strip
++	cil-strip	\
+ 	csharplib
+ 
+ net_2_1_dirs := \

-- 
mono