[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.3-4-34-gd1bf954

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit 874151da6b31dede54159763274b5937ec979aea
Merge: c3d3f41e9c678ab3d6553746d57a57b42e56c670 e594fa981398e5674cf28eadf5812b3634f99f68
Author: Mirco Bauer <meebey at meebey.net>
Date:   Tue Aug 3 01:08:38 2010 +0200

    Merge branch 'debian/patches/remove_relative_paths_from_pkg-config_files' into merge/2.6.7

diff --combined data/mono-cairo.pc.in
index 067236f,ac62e3e..e47a316
--- a/data/mono-cairo.pc.in
+++ b/data/mono-cairo.pc.in
@@@ -1,9 -1,9 +1,9 @@@
- prefix=${pcfiledir}/../..
- exec_prefix=${pcfiledir}/../..
+ prefix=@prefix@
+ exec_prefix=${prefix}
  libdir=${prefix}/@reloc_libdir@
  includedir=${prefix}/include
  
  Name: Mono.Cairo
  Description: Cairo bindings for Mono
  Version: @VERSION@
 -Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll
 +Libs: -r:${prefix}/lib/mono/2.0/Mono.Cairo.dll
diff --combined data/mono.pc.in
index 01e0a9e,0f21952..410fe98
--- a/data/mono.pc.in
+++ b/data/mono.pc.in
@@@ -1,5 -1,5 +1,5 @@@
- prefix=${pcfiledir}/../..
- exec_prefix=${pcfiledir}/../..
+ prefix=@prefix@
+ exec_prefix=${prefix}
  libdir=${prefix}/@reloc_libdir@
  includedir=${prefix}/include/mono- at API_VER@
  sysconfdir=@sysconfdir@
@@@ -7,8 -7,6 +7,8 @@@
  Name: Mono
  Description: Mono Runtime
  Version: @VERSION@
 -Requires: glib-2.0 gthread-2.0
 +## Commented out because SLE hides devel files in the SLE SDK,
 +## which not all customers will have.
 +#Requires: glib-2.0 gthread-2.0
  Libs: -L${libdir} @export_ldflags@ -lmono @libmono_ldflags@
  Cflags: -I${includedir} @libmono_cflags@

-- 
mono