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

[Jo Shields]

The following commit has been merged in the master branch:
commit 6833aa12eec77009fba9fdaa75eae85fec5f677a
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Feb 6 17:13:23 2012 +0000

    Use net40dir not net20dir in mono-uia.pc - otherwise mono-uia-winforms
    build fails due to different versions of WindowsBase.

diff --git a/debian/patches/series b/debian/patches/series
index d36aa84..83dc11c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 use_specific_libX11_soname
 use_compiler_specified_by_configure
 avoid_obsolete_security_requests
+use_net40dir_for_pcfile
diff --git a/debian/patches/use_net40dir_for_pcfile b/debian/patches/use_net40dir_for_pcfile
new file mode 100644
index 0000000..2faa01d
--- /dev/null
+++ b/debian/patches/use_net40dir_for_pcfile
@@ -0,0 +1,32 @@
+Index: mono-uia.git/data/Makefile.am
+===================================================================
+--- mono-uia.git.orig/data/Makefile.am	2012-02-06 17:12:38.154508732 +0000
++++ mono-uia.git/data/Makefile.am	2012-02-06 17:13:04.142689270 +0000
+@@ -1,7 +1,7 @@
+ 
+ EXTRA_DIST =  
+ 
+-net20dir   = $(prefix)/lib/mono/2.0
++net40dir   = $(prefix)/lib/mono/4.0
+ a11ydir    = $(prefix)/lib/mono/accessibility
+ 
+ SHELL = /bin/sh
+@@ -13,7 +13,7 @@
+ 
+ REWRITE=
+ mono-uia.pc: mono-uia.pc.in Makefile
+-	sed -e "s, at net20dir@,$(net20dir),g" < mono-uia.pc.in > $@.tmp
++	sed -e "s, at net40dir@,$(net40dir),g" < mono-uia.pc.in > $@.tmp
+ 	sed -e "s, at a11ydir@,$(a11ydir),g" < $@.tmp > $@.tmp2
+ 	mv $@.tmp2 $@
+ 	rm $@.tmp
+Index: mono-uia.git/data/mono-uia.pc.in.in
+===================================================================
+--- mono-uia.git.orig/data/mono-uia.pc.in.in	2012-02-06 17:12:26.002424264 +0000
++++ mono-uia.git/data/mono-uia.pc.in.in	2012-02-06 17:12:32.146466976 +0000
+@@ -2,4 +2,4 @@
+ Name: UIAutomation Libraries
+ Description: UIAutomation implementation for Mono.
+ Version: @VERSION@
+-Libs: -r:@a11ydir@/UIAutomationTypes.dll -r:@a11ydir@/UIAutomationBridge.dll -r:@a11ydir@/UIAutomationProvider.dll -r:@a11ydir@/UIAutomationSource.dll -r:@a11ydir@/UIAutomationClient.dll -r:@net20dir@/WindowsBase.dll
++Libs: -r:@a11ydir@/UIAutomationTypes.dll -r:@a11ydir@/UIAutomationBridge.dll -r:@a11ydir@/UIAutomationProvider.dll -r:@a11ydir@/UIAutomationSource.dll -r:@a11ydir@/UIAutomationClient.dll -r:@net40dir@/WindowsBase.dll

-- 
mono-uia