[Pkg-cli-apps-commits] [SCM] monodevelop branch, master-experimental, updated. debian/2.6+dfsg-1-10-gdfdeb30

[Jo Shields]

The following commit has been merged in the master-experimental branch:
commit dbbfc74e714cb976fbfef9b6cea5aaeb660b801f
Author: Jo Shields <directhex at apebox.org>
Date:   Tue Nov 8 00:58:52 2011 +0000

    Refreshed debian/patches/use_csc.patch

diff --git a/debian/patches/use_csc.patch b/debian/patches/use_csc.patch
index 4757eea..31d5fd6 100644
--- a/debian/patches/use_csc.patch
+++ b/debian/patches/use_csc.patch
@@ -1,12 +1,12 @@
-Index: monodevelop.git/contrib/Mono.Cecil/Makefile.am
+Index: monodevelop/contrib/Mono.Cecil/Makefile.am
 ===================================================================
---- monodevelop.git.orig/contrib/Mono.Cecil/Makefile.am	2011-06-24 00:54:15.000000000 +0100
-+++ monodevelop.git/contrib/Mono.Cecil/Makefile.am	2011-06-24 00:56:15.000000000 +0100
+--- monodevelop.orig/contrib/Mono.Cecil/Makefile.am	2011-11-08 00:57:55.000000000 +0000
++++ monodevelop/contrib/Mono.Cecil/Makefile.am	2011-11-08 00:58:07.000000000 +0000
 @@ -1,4 +1,5 @@
  BINDIR=$(top_builddir)/build/bin
 +MCS=@CSC@
  
- all: $(CECIL) $(CECIL_MDB) $(CECIL_DECOMPILER)
+ all: $(CECIL) $(CECIL_MDB)
  
 @@ -12,7 +13,7 @@
  
@@ -26,19 +26,10 @@ Index: monodevelop.git/contrib/Mono.Cecil/Makefile.am
  
  $(CECIL_MDB_DEBUG): $(CECIL_MDB)
  
-@@ -38,7 +39,7 @@
- 
- $(CECIL_DECOMPILER): $(CECIL_DECOMPILER_CSFILES) $(CECIL)
- 	mkdir -p $(BINDIR)
--	gmcs /debug /target:library /r:$(CECIL) /r:System /r:System.Core /r:System.Xml /out:$(CECIL_DECOMPILER) $(CECIL_DECOMPILER_CSFILES)
-+	mono-csc /debug /target:library /r:$(CECIL) /r:System /r:System.Core /r:System.Xml /out:$(CECIL_DECOMPILER) $(CECIL_DECOMPILER_CSFILES)
- 
- ## Helpers for re-importing the latest source
- ## Can specify revision with SVN_REVISION environment variable and username with $USER
-Index: monodevelop.git/contrib/NGit/NGit.csproj
+Index: monodevelop/contrib/NGit/NGit.csproj
 ===================================================================
---- monodevelop.git.orig/contrib/NGit/NGit.csproj	2011-06-24 00:54:15.000000000 +0100
-+++ monodevelop.git/contrib/NGit/NGit.csproj	2011-06-24 00:56:15.000000000 +0100
+--- monodevelop.orig/contrib/NGit/NGit.csproj	2011-11-08 00:57:55.000000000 +0000
++++ monodevelop/contrib/NGit/NGit.csproj	2011-11-08 00:58:07.000000000 +0000
 @@ -9,7 +9,7 @@
      <OutputType>Library</OutputType>
      <RootNamespace>NGit</RootNamespace>
@@ -48,10 +39,10 @@ Index: monodevelop.git/contrib/NGit/NGit.csproj
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
      <DebugSymbols>true</DebugSymbols>
-Index: monodevelop.git/contrib/NSch/NSch.csproj
+Index: monodevelop/contrib/NSch/NSch.csproj
 ===================================================================
---- monodevelop.git.orig/contrib/NSch/NSch.csproj	2011-06-24 00:54:15.000000000 +0100
-+++ monodevelop.git/contrib/NSch/NSch.csproj	2011-06-24 00:56:15.000000000 +0100
+--- monodevelop.orig/contrib/NSch/NSch.csproj	2011-11-08 00:57:55.000000000 +0000
++++ monodevelop/contrib/NSch/NSch.csproj	2011-11-08 00:58:07.000000000 +0000
 @@ -9,7 +9,7 @@
      <OutputType>Library</OutputType>
      <RootNamespace>NSch</RootNamespace>
@@ -61,17 +52,10 @@ Index: monodevelop.git/contrib/NSch/NSch.csproj
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
      <DebugSymbols>true</DebugSymbols>
-@@ -204,4 +204,4 @@
-       <Name>Sharpen</Name>
-     </ProjectReference>
-   </ItemGroup>
--</Project>
-\ No newline at end of file
-+</Project>
-Index: monodevelop.git/contrib/Sharpen/Sharpen.csproj
+Index: monodevelop/contrib/Sharpen/Sharpen.csproj
 ===================================================================
---- monodevelop.git.orig/contrib/Sharpen/Sharpen.csproj	2011-06-24 00:54:15.000000000 +0100
-+++ monodevelop.git/contrib/Sharpen/Sharpen.csproj	2011-06-24 00:56:15.000000000 +0100
+--- monodevelop.orig/contrib/Sharpen/Sharpen.csproj	2011-11-08 00:57:55.000000000 +0000
++++ monodevelop/contrib/Sharpen/Sharpen.csproj	2011-11-08 00:58:07.000000000 +0000
 @@ -9,7 +9,7 @@
      <OutputType>Library</OutputType>
      <RootNamespace>Sharpen</RootNamespace>
@@ -88,10 +72,10 @@ Index: monodevelop.git/contrib/Sharpen/Sharpen.csproj
 -</Project>
 \ No newline at end of file
 +</Project>
-Index: monodevelop.git/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am
+Index: monodevelop/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am
 ===================================================================
---- monodevelop.git.orig/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am	2011-06-24 00:54:15.000000000 +0100
-+++ monodevelop.git/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am	2011-06-24 00:56:46.000000000 +0100
+--- monodevelop.orig/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am	2011-11-08 00:57:55.000000000 +0000
++++ monodevelop/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am	2011-11-08 00:58:07.000000000 +0000
 @@ -4,7 +4,7 @@
  REFS =  \
  	-r:Microsoft.Build.Engine \

-- 
monodevelop