[Pkg-mono-svn-commits] [SCM] mono-uia branch, master, updated. debian/2.1-3

[Jo Shields]

The following commit has been merged in the master branch:
commit 3da992ba3a8cf42ac63c8a3b372770696e38d5b5
Author: Jo Shields <directhex at apebox.org>
Date:   Tue Jan 24 19:23:15 2012 +0000

    Use compiler from GMCS configure variable, not hardcoded gmcs

diff --git a/debian/patches/series b/debian/patches/series
index 5a4b185..4e57abf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-uia-Fix-building-with-Mono-2.8.patch
 0001-UIAutomationClient-AutomationElement.FromLocalProvid.patch
 use_specific_libX11_soname
+use_compiler_specified_by_configure
diff --git a/debian/patches/use_compiler_specified_by_configure b/debian/patches/use_compiler_specified_by_configure
new file mode 100644
index 0000000..ee430bb
--- /dev/null
+++ b/debian/patches/use_compiler_specified_by_configure
@@ -0,0 +1,139 @@
+Index: mono-uia/UIAutomationBridge/Makefile.am
+===================================================================
+--- mono-uia.orig/UIAutomationBridge/Makefile.am	2012-01-24 19:21:37.000000000 +0000
++++ mono-uia/UIAutomationBridge/Makefile.am	2012-01-24 19:21:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ EXTRA_DIST =  
+ 
+-ASSEMBLY_COMPILER_COMMAND = gmcs
++ASSEMBLY_COMPILER_COMMAND = $(GMCS)
+ ASSEMBLY_COMPILER_FLAGS = -lib:@expanded_libdir@/mono/2.0 -lib:../bin -lib:@expanded_libdir@/mono/accessibility -noconfig -codepage:utf8 -warn:4 -warnaserror -optimize+ -debug "-define:DEBUG" -d:NET_2_0 -delaysign+ -keyfile:@abs_top_srcdir@/winfx3.pub
+ 
+ ASSEMBLY = ../bin/UIAutomationBridge.dll
+Index: mono-uia/UIAutomationClient/Makefile.am
+===================================================================
+--- mono-uia.orig/UIAutomationClient/Makefile.am	2012-01-24 19:21:37.000000000 +0000
++++ mono-uia/UIAutomationClient/Makefile.am	2012-01-24 19:21:54.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ EXTRA_DIST =  
+ 
+-ASSEMBLY_COMPILER_COMMAND = gmcs
++ASSEMBLY_COMPILER_COMMAND = $(GMCS)
+ ASSEMBLY_COMPILER_FLAGS = -lib:@expanded_libdir@/mono/2.0 -lib:../bin -lib:@expanded_libdir@/mono/accessibility -noconfig -codepage:utf8 -warn:4 -warnaserror -optimize+ -debug "-define:DEBUG" -d:NET_2_0 -delaysign+ -keyfile:@abs_top_srcdir@/winfx3.pub
+ 
+ ASSEMBLY = ../bin/UIAutomationClient.dll
+Index: mono-uia/UIAutomationClientTests/AtspiUiaClientTests/Makefile.am
+===================================================================
+--- mono-uia.orig/UIAutomationClientTests/AtspiUiaClientTests/Makefile.am	2012-01-24 19:21:37.000000000 +0000
++++ mono-uia/UIAutomationClientTests/AtspiUiaClientTests/Makefile.am	2012-01-24 19:22:08.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ EXTRA_DIST =  
+ 
+-ASSEMBLY_COMPILER_COMMAND = gmcs
++ASSEMBLY_COMPILER_COMMAND = $(GMCS)
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -warnaserror -optimize+ -debug "-define:DEBUG"
+ 
+ ASSEMBLY = bin/Debug/AtspiUiaClientTests.dll
+Index: mono-uia/UIAutomationClientTests/GtkForm/Makefile.am
+===================================================================
+--- mono-uia.orig/UIAutomationClientTests/GtkForm/Makefile.am	2012-01-24 19:21:37.000000000 +0000
++++ mono-uia/UIAutomationClientTests/GtkForm/Makefile.am	2012-01-24 19:22:15.000000000 +0000
+@@ -1,7 +1,7 @@
+ EXTRA_DIST =
+ 
+ if ENABLE_DEBUG
+-ASSEMBLY_COMPILER_COMMAND = gmcs
++ASSEMBLY_COMPILER_COMMAND = $(GMCS)
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -debug "-define:DEBUG"
+ 
+ ASSEMBLY = bin/Debug/GtkForm.exe
+@@ -16,7 +16,7 @@
+ endif
+ 
+ if ENABLE_RELEASE
+-ASSEMBLY_COMPILER_COMMAND = gmcs
++ASSEMBLY_COMPILER_COMMAND = $(GMCS)
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -keyfile:$(top_srcdir)/mono-uia.snk
+ ASSEMBLY = bin/Release/GtkForm.exe
+ ASSEMBLY_MDB = 
+Index: mono-uia/UIAutomationClientTests/SampleForm/Makefile.am
+===================================================================
+--- mono-uia.orig/UIAutomationClientTests/SampleForm/Makefile.am	2012-01-24 19:21:37.000000000 +0000
++++ mono-uia/UIAutomationClientTests/SampleForm/Makefile.am	2012-01-24 19:22:21.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ EXTRA_DIST =  
+ 
+-ASSEMBLY_COMPILER_COMMAND = gmcs
++ASSEMBLY_COMPILER_COMMAND = $(GMCS)
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
+ ASSEMBLY = bin/Debug/SampleForm.exe
+ ASSEMBLY_MDB = $(ASSEMBLY).mdb
+Index: mono-uia/UIAutomationClientTests/UIAutomationClientTests/Makefile.am
+===================================================================
+--- mono-uia.orig/UIAutomationClientTests/UIAutomationClientTests/Makefile.am	2012-01-24 19:21:37.000000000 +0000
++++ mono-uia/UIAutomationClientTests/UIAutomationClientTests/Makefile.am	2012-01-24 19:22:01.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ EXTRA_DIST =  
+ 
+-ASSEMBLY_COMPILER_COMMAND = gmcs
++ASSEMBLY_COMPILER_COMMAND = $(GMCS)
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE"
+ ASSEMBLY = bin/Debug/UIAutomationClientTests.dll
+ 
+Index: mono-uia/UIAutomationProvider/Makefile.am
+===================================================================
+--- mono-uia.orig/UIAutomationProvider/Makefile.am	2012-01-24 19:21:37.000000000 +0000
++++ mono-uia/UIAutomationProvider/Makefile.am	2012-01-24 19:22:28.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ EXTRA_DIST =  
+ 
+-ASSEMBLY_COMPILER_COMMAND = gmcs
++ASSEMBLY_COMPILER_COMMAND = $(GMCS)
+ ASSEMBLY_COMPILER_FLAGS = -lib:@expanded_libdir@/mono/2.0 -lib:../bin -lib:@expanded_libdir@/mono/accessibility -noconfig -codepage:utf8 -warn:4 -warnaserror -optimize+ -debug "-define:DEBUG" -d:NET_2_0 -delaysign+ -keyfile:@abs_top_srcdir@/winfx3.pub
+ 
+ ASSEMBLY = ../bin/UIAutomationProvider.dll
+Index: mono-uia/UIAutomationSource/Makefile.am
+===================================================================
+--- mono-uia.orig/UIAutomationSource/Makefile.am	2012-01-24 19:21:37.000000000 +0000
++++ mono-uia/UIAutomationSource/Makefile.am	2012-01-24 19:22:34.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ EXTRA_DIST =  
+ 
+-ASSEMBLY_COMPILER_COMMAND = gmcs
++ASSEMBLY_COMPILER_COMMAND = $(GMCS)
+ ASSEMBLY_COMPILER_FLAGS = -lib:@expanded_libdir@/mono/2.0 -lib:../bin -lib:@expanded_libdir@/mono/accessibility -noconfig -codepage:utf8 -warn:4 -warnaserror -optimize+ -debug "-define:DEBUG" -d:NET_2_0 -delaysign+ -keyfile:@abs_top_srcdir@/winfx3.pub
+ 
+ ASSEMBLY = ../bin/UIAutomationSource.dll
+Index: mono-uia/UIAutomationTypes/Makefile.am
+===================================================================
+--- mono-uia.orig/UIAutomationTypes/Makefile.am	2012-01-24 19:21:37.000000000 +0000
++++ mono-uia/UIAutomationTypes/Makefile.am	2012-01-24 19:22:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ EXTRA_DIST =  
+ 
+-ASSEMBLY_COMPILER_COMMAND = gmcs
++ASSEMBLY_COMPILER_COMMAND = $(GMCS)
+ ASSEMBLY_COMPILER_FLAGS = -lib:@expanded_libdir@/mono/2.0 -lib:../bin -noconfig -codepage:utf8 -warn:4 -warnaserror -optimize+ -debug "-define:DEBUG" -d:NET_2_0 -delaysign+ -keyfile:@abs_top_srcdir@/winfx3.pub
+ 
+ ASSEMBLY = ../bin/UIAutomationTypes.dll
+Index: mono-uia/WindowsBase/Makefile.am
+===================================================================
+--- mono-uia.orig/WindowsBase/Makefile.am	2012-01-24 19:21:37.000000000 +0000
++++ mono-uia/WindowsBase/Makefile.am	2012-01-24 19:22:55.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ EXTRA_DIST =  
+ 
+-ASSEMBLY_COMPILER_COMMAND = gmcs
++ASSEMBLY_COMPILER_COMMAND = $(GMCS)
+ ASSEMBLY_COMPILER_FLAGS = -lib:@expanded_libdir@/mono/2.0 -noconfig -codepage:utf8 -warn:4 -warnaserror -optimize+ -debug "-define:DEBUG" -d:NET_2_0
+ 
+ ASSEMBLY = ../bin/WindowsBase.dll

-- 
mono-uia