[Pkg-cli-libs-commits] [SCM] mono-addins branch, master, updated. debian/0.6.2-2

Jo Shields directhex at apebox.org
Mon Jan 23 01:14:44 UTC 2012


The following commit has been merged in the master branch:
commit 32bd46fd83ce15904184729f9d6fa5a0b028ea6a
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Jan 23 01:10:00 2012 +0000

    Add patch from Iain Lane to use the correct version of
    Microsoft.Build.Utilities

diff --git a/debian/patches/series b/debian/patches/series
index 569c153..b29db4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-fix_mono-addins-setup.pc.patch.patch
 0005-fix_mono-addins-msbuild.pc.patch.patch
 automake_1.11.2_pkglibdir_workaround.patch
+use-microsoft-build-utilities-4.0
diff --git a/debian/patches/use-microsoft-build-utilities-4.0 b/debian/patches/use-microsoft-build-utilities-4.0
new file mode 100644
index 0000000..19618fe
--- /dev/null
+++ b/debian/patches/use-microsoft-build-utilities-4.0
@@ -0,0 +1,32 @@
+Description: Update Microsoft.Build.Utilities references to
+ Microsoft.Build.Utilities.v4.0 for the CLR 4.0. Change will arrive in Debian
+ soon, so we can sync again then.
+Author: Iain Lane <laney at debian.org>
+Forwarded: not-needed
+
+Index: mono-addins-0.6.1/Mono.Addins.MSBuild/Makefile.in
+===================================================================
+--- mono-addins-0.6.1.orig/Mono.Addins.MSBuild/Makefile.in	2011-07-12 18:53:43.000000000 +0100
++++ mono-addins-0.6.1/Mono.Addins.MSBuild/Makefile.in	2011-07-12 18:53:43.000000000 +0100
+@@ -171,7 +171,7 @@
+ 
+ REFERENCES = \
+ 	-r:Microsoft.Build.Framework \
+-	-r:Microsoft.Build.Utilities \
++	-r:Microsoft.Build.Utilities.v4.0 \
+ 	-r:System
+ 
+ DLL_REFERENCES = 
+Index: mono-addins-0.6.1/Mono.Addins.MSBuild/Makefile.am
+===================================================================
+--- mono-addins-0.6.1.orig/Mono.Addins.MSBuild/Makefile.am	2011-07-12 18:53:43.000000000 +0100
++++ mono-addins-0.6.1/Mono.Addins.MSBuild/Makefile.am	2011-07-12 18:53:43.000000000 +0100
+@@ -28,7 +28,7 @@
+ 
+ REFERENCES =  \
+ 	-r:Microsoft.Build.Framework \
+-	-r:Microsoft.Build.Utilities \
++	-r:Microsoft.Build.Utilities.v4.0 \
+ 	-r:System
+ 
+ DLL_REFERENCES = 

-- 
mono-addins



More information about the Pkg-cli-libs-commits mailing list