[Pkg-cli-apps-commits] [SCM] monodevelop branch, master, updated. debian/2.4+dfsg-3-2-gf185c8a

[Jo Shields]

The following commit has been merged in the master branch:
commit 663f86b4e9bbea81a395356b3951194259af6cba
Author: Jo Shields <directhex at apebox.org>
Date:   Wed Jun 9 15:34:42 2010 +0100

    refreshed debian/patches/use_csc.patch

diff --git a/debian/changelog b/debian/changelog
index e0917ee..47e10ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,8 @@ monodevelop (2.3.1+dfsg-1) UNRELEASED; urgency=low
   * debian/control:
     + Bump mono build-deps to 2.6.1, to reflect configure.in
   * debian/patches/use_libsvn1.patch,
-    debian/patches/update_templates_for_gtk-sharp_2.12.patch:
+    debian/patches/update_templates_for_gtk-sharp_2.12.patch,
+    debian/patches/use_csc.patch:
     + Refreshed
 
  -- Jo Shields <directhex at apebox.org>  Wed, 09 Jun 2010 15:17:58 +0100
diff --git a/debian/patches/use_csc.patch b/debian/patches/use_csc.patch
old mode 100755
new mode 100644
index 5af2c27..7dbc22a
--- a/debian/patches/use_csc.patch
+++ b/debian/patches/use_csc.patch
@@ -1,28 +1,28 @@
-Index: monodevelop-2.2/contrib/Mono.Cecil/Makefile.am
+Index: monodevelop.git/contrib/Mono.Cecil/Makefile.am
 ===================================================================
---- monodevelop-2.2.orig/contrib/Mono.Cecil/Makefile.am	2010-01-07 19:55:31.000000000 +0000
-+++ monodevelop-2.2/contrib/Mono.Cecil/Makefile.am	2010-01-07 19:56:44.000000000 +0000
+--- monodevelop.git.orig/contrib/Mono.Cecil/Makefile.am	2010-06-09 15:22:46.000000000 +0100
++++ monodevelop.git/contrib/Mono.Cecil/Makefile.am	2010-06-09 15:34:08.000000000 +0100
 @@ -1,4 +1,5 @@
  BINDIR=$(top_builddir)/build/bin
 +MCS=@CSC@
  
- all: $(CECIL)
+ all: $(CECIL) $(CECIL_MDB) $(CECIL_DECOMPILER)
  
-@@ -11,7 +12,7 @@
+@@ -12,7 +13,7 @@
  
  $(CECIL): $(CECIL_CSFILES)
  	mkdir -p $(BINDIR)
--	mcs $(CECIL_CSFILES) /debug /target:library /out:$(CECIL)
-+	$(MCS) $(CECIL_CSFILES) /debug /target:library /out:$(CECIL)
+-	mcs $(CECIL_CSFILES) /keyfile:$(CECIL_SNK) /debug /target:library /out:$(CECIL)
++	$(MCS) $(CECIL_CSFILES) /keyfile:$(CECIL_SNK) /debug /target:library /out:$(CECIL)
  
  $(CECIL_DEBUG): $(CECIL)
  
-@@ -24,7 +25,7 @@
+@@ -25,7 +26,7 @@
  
  $(CECIL_MDB): $(CECIL_MDB_CSFILES) $(CECIL)
  	mkdir -p $(BINDIR)
--	mcs $(CECIL_MDB_CSFILES) /debug /target:library /r:$(CECIL) /d:CECIL /out:$(CECIL_MDB)
-+	$(CSC) $(CECIL_MDB_CSFILES) /debug /target:library /r:$(CECIL) /d:CECIL /out:$(CECIL_MDB)
+-	gmcs $(CECIL_MDB_CSFILES) /debug /target:library /keyfile:$(CECIL_SNK) /r:$(CECIL) /d:CECIL /out:$(CECIL_MDB)
++	$(MCS) $(CECIL_MDB_CSFILES) /debug /target:library /keyfile:$(CECIL_SNK) /r:$(CECIL) /d:CECIL /out:$(CECIL_MDB)
  
  $(CECIL_MDB_DEBUG): $(CECIL_MDB)
  

-- 
monodevelop