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

Mon Jan 23 19:18:00 UTC 2012

The following commit has been merged in the master branch:
commit d1731513333be2aed10568274bd391e183ebbe03
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Jan 23 18:34:39 2012 +0000

    Add upstream commit 326220d51c7fb96151802576d978399693d6bae4 to fix FTBFS on Mono 2.8+

diff --git a/debian/patches/0001-uia-Fix-building-with-Mono-2.8.patch b/debian/patches/0001-uia-Fix-building-with-Mono-2.8.patch
new file mode 100644
index 0000000..97fb14d
--- /dev/null
+++ b/debian/patches/0001-uia-Fix-building-with-Mono-2.8.patch
@@ -0,0 +1,151 @@
+From 326220d51c7fb96151802576d978399693d6bae4 Mon Sep 17 00:00:00 2001
+From: Mario Carrion <mcarrion at novell.com>
+Date: Tue, 31 Aug 2010 16:29:27 -0400
+Subject: [uia] Fix building with Mono 2.8.
+
+---
+ UIAutomation/UIAutomationBridge/AssemblyInfo.cs.in |    2 --
+ UIAutomation/UIAutomationBridge/Makefile.am        |    2 +-
+ UIAutomation/UIAutomationClient/AssemblyInfo.cs.in |    2 --
+ UIAutomation/UIAutomationClient/Makefile.am        |    2 +-
+ .../UIAutomationProvider/AssemblyInfo.cs.in        |    2 --
+ UIAutomation/UIAutomationProvider/Makefile.am      |    2 +-
+ UIAutomation/UIAutomationSource/AssemblyInfo.cs.in |    2 --
+ UIAutomation/UIAutomationSource/Makefile.am        |    2 +-
+ UIAutomation/UIAutomationTypes/AssemblyInfo.cs.in  |    2 --
+ UIAutomation/UIAutomationTypes/Makefile.am         |    2 +-
+ 10 files changed, 5 insertions(+), 15 deletions(-)
+
+diff --git a/UIAutomationBridge/AssemblyInfo.cs.in b/UIAutomationBridge/AssemblyInfo.cs.in
+index 6e29e8a..3608dc4 100644
+--- a/UIAutomationBridge/AssemblyInfo.cs.in
++++ b/UIAutomationBridge/AssemblyInfo.cs.in
+@@ -43,8 +43,6 @@ using System.Security.Permissions;
+ 
+ [assembly: NeutralResourcesLanguage ("en")]
+ [assembly: CLSCompliant (true)]
+-[assembly: AssemblyDelaySign (true)]
+-[assembly: AssemblyKeyFile ("@abs_top_srcdir@/winfx3.pub")]
+ 
+ [assembly: ComVisible (false)]
+ [assembly: AllowPartiallyTrustedCallers]
+diff --git a/UIAutomationBridge/Makefile.am b/UIAutomationBridge/Makefile.am
+index f7b768c..e8d95fb 100644
+--- a/UIAutomationBridge/Makefile.am
++++ b/UIAutomationBridge/Makefile.am
+@@ -2,7 +2,7 @@
+ EXTRA_DIST =  
+ 
+ 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
++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
+ ASSEMBLY_MDB = $(ASSEMBLY).mdb
+diff --git a/UIAutomationClient/AssemblyInfo.cs.in b/UIAutomationClient/AssemblyInfo.cs.in
+index 0223309..e4df27d 100644
+--- a/UIAutomationClient/AssemblyInfo.cs.in
++++ b/UIAutomationClient/AssemblyInfo.cs.in
+@@ -43,8 +43,6 @@ using System.Security.Permissions;
+ 
+ [assembly: NeutralResourcesLanguage ("en")]
+ [assembly: CLSCompliant (true)]
+-[assembly: AssemblyDelaySign (true)]
+-[assembly: AssemblyKeyFile ("@abs_top_srcdir@/winfx3.pub")]
+ 
+ [assembly: ComVisible (false)]
+ 
+diff --git a/UIAutomationClient/Makefile.am b/UIAutomationClient/Makefile.am
+index 16c5b90..a358ed1 100644
+--- a/UIAutomationClient/Makefile.am
++++ b/UIAutomationClient/Makefile.am
+@@ -2,7 +2,7 @@
+ EXTRA_DIST =  
+ 
+ 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
++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
+ ASSEMBLY_MDB = $(ASSEMBLY).mdb
+diff --git a/UIAutomationProvider/AssemblyInfo.cs.in b/UIAutomationProvider/AssemblyInfo.cs.in
+index 21bba13..c66987c 100644
+--- a/UIAutomationProvider/AssemblyInfo.cs.in
++++ b/UIAutomationProvider/AssemblyInfo.cs.in
+@@ -43,8 +43,6 @@ using System.Security.Permissions;
+ 
+ [assembly: NeutralResourcesLanguage ("en")]
+ [assembly: CLSCompliant (true)]
+-[assembly: AssemblyDelaySign (true)]
+-[assembly: AssemblyKeyFile ("@abs_top_srcdir@/winfx3.pub")]
+ 
+ [assembly: ComVisible (false)]
+ [assembly: AllowPartiallyTrustedCallers]
+diff --git a/UIAutomationProvider/Makefile.am b/UIAutomationProvider/Makefile.am
+index 8f1d29b..0cc7ba5 100644
+--- a/UIAutomationProvider/Makefile.am
++++ b/UIAutomationProvider/Makefile.am
+@@ -2,7 +2,7 @@
+ EXTRA_DIST =  
+ 
+ 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
++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
+ ASSEMBLY_MDB = $(ASSEMBLY).mdb
+diff --git a/UIAutomationSource/AssemblyInfo.cs.in b/UIAutomationSource/AssemblyInfo.cs.in
+index c14796b..b98b36c 100644
+--- a/UIAutomationSource/AssemblyInfo.cs.in
++++ b/UIAutomationSource/AssemblyInfo.cs.in
+@@ -43,8 +43,6 @@ using System.Security.Permissions;
+ 
+ [assembly: NeutralResourcesLanguage ("en")]
+ [assembly: CLSCompliant (true)]
+-[assembly: AssemblyDelaySign (true)]
+-[assembly: AssemblyKeyFile ("@abs_top_srcdir@/winfx3.pub")]
+ 
+ [assembly: ComVisible (false)]
+ [assembly: AllowPartiallyTrustedCallers]
+diff --git a/UIAutomationSource/Makefile.am b/UIAutomationSource/Makefile.am
+index 3a623e9..5587df7 100644
+--- a/UIAutomationSource/Makefile.am
++++ b/UIAutomationSource/Makefile.am
+@@ -2,7 +2,7 @@
+ EXTRA_DIST =  
+ 
+ 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
++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
+ ASSEMBLY_MDB = $(ASSEMBLY).mdb
+diff --git a/UIAutomationTypes/AssemblyInfo.cs.in b/UIAutomationTypes/AssemblyInfo.cs.in
+index 9ea6a83..dc1753e 100644
+--- a/UIAutomationTypes/AssemblyInfo.cs.in
++++ b/UIAutomationTypes/AssemblyInfo.cs.in
+@@ -43,8 +43,6 @@ using System.Security.Permissions;
+ 
+ [assembly: NeutralResourcesLanguage ("en")]
+ [assembly: CLSCompliant (true)]
+-[assembly: AssemblyDelaySign (true)]
+-[assembly: AssemblyKeyFile ("@abs_top_srcdir@/winfx3.pub")]
+ 
+ [assembly: ComVisible (false)]
+ [assembly: AllowPartiallyTrustedCallers]
+diff --git a/UIAutomationTypes/Makefile.am b/UIAutomationTypes/Makefile.am
+index b8beb9b..83a2007 100644
+--- a/UIAutomationTypes/Makefile.am
++++ b/UIAutomationTypes/Makefile.am
+@@ -2,7 +2,7 @@
+ EXTRA_DIST =  
+ 
+ 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
++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
+ ASSEMBLY_MDB = $(ASSEMBLY).mdb
+-- 
+1.7.5.4
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..44313aa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-uia-Fix-building-with-Mono-2.8.patch

-- 
mono-uia

