[Pkg-mono-svn-commits] [SCM] mono-tools branch, master, updated. debian/2.6.2-3-34-gbfe4225

[Jo Shields]

The following commit has been merged in the master branch:
commit 4f93dd40f129f9f3334fccad727d4c7816fa6f1d
Author: Jo Shields <directhex at apebox.org>
Date:   Thu May 5 22:37:31 2011 +0100

    Ensure we build Gendarme with 2.0, not 4.0 profile (it's not 4.0-ready yet in 2.10)

diff --git a/debian/control b/debian/control
index 2e1fa4a..4e5ed80 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends-Indep: cli-common-dev (>= 0.8~exp2~),
  pkg-config,
  dh-autoreconf,
  mono-devel (>= 2.10),
+ mono-gmcs (>= 2.10),
  libgtk2.0-cil-dev (>= 2.0),
  libgconf2.0-cil-dev (>= 2.0),
  libglade2.0-cil-dev (>= 2.0),
diff --git a/debian/patches/00-fix_build_system.patch b/debian/patches/00-fix_build_system.patch
index 3abf0bf..7ce5152 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -1,24 +1,23 @@
 Index: mono-tools.git/configure.in
 ===================================================================
---- mono-tools.git.orig/configure.in	2011-03-20 23:36:40.000000000 +0000
-+++ mono-tools.git/configure.in	2011-04-25 18:52:39.000000000 +0100
+--- mono-tools.git.orig/configure.in	2011-05-05 22:36:30.000000000 +0100
++++ mono-tools.git/configure.in	2011-05-05 22:36:55.000000000 +0100
 @@ -10,9 +10,9 @@
  AC_SUBST(ACLOCAL_FLAGS)
  
  dnl C# compiler
 -AC_PATH_PROG(MCS, mcs, no)
--AC_PATH_PROG(GMCS, gmcs, no)
--AC_PATH_PROG(DMCS, dmcs, no)
 +AC_PATH_PROG(MCS, mono-csc, no)
-+AC_PATH_PROG(GMCS, mono-csc, no)
+ AC_PATH_PROG(GMCS, gmcs, no)
+-AC_PATH_PROG(DMCS, dmcs, no)
 +AC_PATH_PROG(DMCS, mono-csc, no)
  AC_PATH_PROG(RUNTIME, mono, no)
  AC_PATH_PROG(GACUTIL, gacutil, no)
  
 Index: mono-tools.git/Mono.Profiler/compile
 ===================================================================
---- mono-tools.git.orig/Mono.Profiler/compile	2011-03-20 23:36:10.000000000 +0000
-+++ mono-tools.git/Mono.Profiler/compile	2011-04-25 18:52:15.000000000 +0100
+--- mono-tools.git.orig/Mono.Profiler/compile	2011-05-05 22:36:30.000000000 +0100
++++ mono-tools.git/Mono.Profiler/compile	2011-05-05 22:36:40.000000000 +0100
 @@ -1 +1 @@
 -gmcs -debug -out:profiler-decoder.exe profiler-decoder-library/*.cs profiler-file-decoder/*.cs
 +mono-csc -debug -out:profiler-decoder.exe profiler-decoder-library/*.cs profiler-file-decoder/*.cs

-- 
mono-tools