[Pkg-cli-apps-commits] [SCM] monodevelop-debugger-mdb branch, master, updated. debian/2.4-2

[Jo Shields]

The following commit has been merged in the master branch:
commit 0c9015b6f0db48a0395cf6397836246510931e05
Author: Jo Shields <directhex at apebox.org>
Date:   Thu Jun 17 00:30:36 2010 +0100

    force mono-csc

diff --git a/debian/changelog b/debian/changelog
index 2376d91..1ce0a1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ monodevelop-debugger-mdb (2.4-1) UNRELEASED; urgency=low
     + Force DebSrc 1.0
   * debian/control:
     + Bump build-dependency to MonoDevelop 2.4
+  * debian/rules:
+    + Set MDVERSION to 2.4, for binary dependency
+  * debian/patches/use_csc_compiler.patch:
+    + Force mono-csc compiler
 
  -- Jo Shields <directhex at apebox.org>  Thu, 17 Jun 2010 00:23:36 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index b6cdeb4..165b4af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-allow_minimal_configure_for_clean.patch
 use_csc_compiler.patch
+allow_minimal_configure_for_clean.patch
diff --git a/debian/patches/use_csc_compiler.patch b/debian/patches/use_csc_compiler.patch
index 9ff7894..0a655f6 100644
--- a/debian/patches/use_csc_compiler.patch
+++ b/debian/patches/use_csc_compiler.patch
@@ -1,40 +1,13 @@
---- monodevelop-debugger-mdb-1.9.2.orig/Mono.Debugging.Backend.Mdb/Makefile
-+++ monodevelop-debugger-mdb-1.9.2/Mono.Debugging.Backend.Mdb/Makefile
-@@ -9,7 +9,7 @@
- include $(top_srcdir)/config.make
- 
- ifeq ($(CONFIG),DEBUG)
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = mono-csc
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
- 
- ASSEMBLY = ../build/DebuggerClient.dll
-@@ -23,7 +23,7 @@
- endif
- 
- ifeq ($(CONFIG),RELEASE)
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = mono-csc
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG "-define:TRACE"
- 
- ASSEMBLY = bin/Release/DebuggerClient.dll
---- monodevelop-debugger-mdb-1.9.2.orig/Mono.Debugging.Server.Mdb/Makefile
-+++ monodevelop-debugger-mdb-1.9.2/Mono.Debugging.Server.Mdb/Makefile
-@@ -9,7 +9,7 @@
- include $(top_srcdir)/config.make
- 
- ifeq ($(CONFIG),DEBUG)
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = mono-csc
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
- 
- ASSEMBLY = ../build/DebuggerServer.exe
-@@ -21,7 +21,7 @@
- endif
- 
- ifeq ($(CONFIG),RELEASE)
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = mono-csc
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG "-define:TRACE"
- 
- ASSEMBLY = ../build/DebuggerServer.exe
+Index: monodevelop-debugger-gdb.git/configure
+===================================================================
+--- monodevelop-debugger-gdb.git.orig/configure	2010-06-17 00:09:08.000000000 +0100
++++ monodevelop-debugger-gdb.git/configure	2010-06-17 00:09:17.000000000 +0100
+@@ -142,7 +142,7 @@
+ echo "VERSION=$VERSION" >> config.make
+ echo "PACKAGE=$PACKAGE" >> config.make
+ echo "CONFIG=$config" >> config.make
+-echo "CSC=gmcs" >> config.make
++echo "CSC=mono-csc" >> config.make
+ 
+ echo
+ echo "$PACKAGE has been configured with "
diff --git a/debian/rules b/debian/rules
index ba85b4e..44af4ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Vers
 DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
 VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 
-MDVERSION = 2.2.2
+MDVERSION = 2.4
 
 include /usr/share/cli-common/cli.make
 include /usr/share/quilt/quilt.make

-- 
monodevelop-debugger-mdb