[Pkg-cli-apps-commits] [SCM] monodevelop branch, master-experimental, updated. debian/2.4.1+dfsg-1-11-g28a6814

[Jo Shields]

The following commit has been merged in the master-experimental branch:
commit db6d7d0c071ec17c5d6227505103f888c13d4766
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Jun 24 00:18:11 2011 +0100

    Refresh use_csc.patch to specify ToolsVersion 4.0 for xbuild-built components, especially contrib conponents

diff --git a/debian/patches/use_csc.patch b/debian/patches/use_csc.patch
index 7dbc22a..4757eea 100644
--- a/debian/patches/use_csc.patch
+++ b/debian/patches/use_csc.patch
@@ -1,7 +1,7 @@
 Index: monodevelop.git/contrib/Mono.Cecil/Makefile.am
 ===================================================================
---- 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
+--- 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
 @@ -1,4 +1,5 @@
  BINDIR=$(top_builddir)/build/bin
 +MCS=@CSC@
@@ -12,8 +12,8 @@ Index: monodevelop.git/contrib/Mono.Cecil/Makefile.am
  
  $(CECIL): $(CECIL_CSFILES)
  	mkdir -p $(BINDIR)
--	mcs $(CECIL_CSFILES) /keyfile:$(CECIL_SNK) /debug /target:library /out:$(CECIL)
-+	$(MCS) $(CECIL_CSFILES) /keyfile:$(CECIL_SNK) /debug /target:library /out:$(CECIL)
+-	gmcs $(CECIL_CSFILES) /keyfile:$(CECIL_SNK) /debug /target:library /d:NET_3_5 /out:$(CECIL)
++	mono-csc $(CECIL_CSFILES) /keyfile:$(CECIL_SNK) /debug /target:library /d:NET_3_5 /out:$(CECIL)
  
  $(CECIL_DEBUG): $(CECIL)
  
@@ -21,8 +21,92 @@ Index: monodevelop.git/contrib/Mono.Cecil/Makefile.am
  
  $(CECIL_MDB): $(CECIL_MDB_CSFILES) $(CECIL)
  	mkdir -p $(BINDIR)
--	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)
+-	gmcs $(CECIL_MDB_CSFILES) /debug /target:library /keyfile:$(CECIL_SNK) /r:$(CECIL) /d:CECIL /d:NET_3_5 /out:$(CECIL_MDB)
++	mono-csc $(CECIL_MDB_CSFILES) /debug /target:library /keyfile:$(CECIL_SNK) /r:$(CECIL) /d:CECIL /d:NET_3_5 /out:$(CECIL_MDB)
  
  $(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
+===================================================================
+--- 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
+@@ -9,7 +9,7 @@
+     <OutputType>Library</OutputType>
+     <RootNamespace>NGit</RootNamespace>
+     <AssemblyName>NGit</AssemblyName>
+-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
++    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+   </PropertyGroup>
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+     <DebugSymbols>true</DebugSymbols>
+Index: monodevelop.git/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
+@@ -9,7 +9,7 @@
+     <OutputType>Library</OutputType>
+     <RootNamespace>NSch</RootNamespace>
+     <AssemblyName>NSch</AssemblyName>
+-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
++    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+   </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
+===================================================================
+--- 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
+@@ -9,7 +9,7 @@
+     <OutputType>Library</OutputType>
+     <RootNamespace>Sharpen</RootNamespace>
+     <AssemblyName>Sharpen</AssemblyName>
+-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
++    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+   </PropertyGroup>
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+     <DebugSymbols>true</DebugSymbols>
+@@ -157,4 +157,4 @@
+   <ItemGroup>
+     <Folder Include="Sharpen\" />
+   </ItemGroup>
+-</Project>
+\ No newline at end of file
++</Project>
+Index: monodevelop.git/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
+@@ -4,7 +4,7 @@
+ REFS =  \
+ 	-r:Microsoft.Build.Engine \
+ 	-r:Microsoft.Build.Framework \
+-	-r:Microsoft.Build.Utilities.v3.5 \
++	-r:Microsoft.Build.Utilities.v4.0 \
+ 	-r:System \
+ 	-r:System.Runtime.Remoting
+ 
+@@ -24,7 +24,7 @@
+ 
+ # Mono's 2.0/3.5 compiler doesn't recognize 3.5 variants of the MSBuild assemblies
+ # so patch up the references
+-MSB_REF_PREFIX:=$(shell pkg-config --variable prefix mono)/lib/mono/3.5/
++MSB_REF_PREFIX:=$(shell pkg-config --variable prefix mono)/lib/mono/4.0/
+ FIXED_REFS:=$(shell echo '$(REFS)' | sed -e 's at Microsoft.Build[^ ]*@$(MSB_REF_PREFIX)&.dll at g')
+ 
+ all: $(ASSEMBLY) $(ASSEMBLY).mdb

-- 
monodevelop