[Pkg-cli-libs-commits] [SCM] mono-fuse branch, master, updated. 968f91b651ad67feb45eea82c7e079801156cb24

Marco Nenciarini mnencia at debian.org
Thu Dec 31 16:07:18 UTC 2009


The following commit has been merged in the master branch:
commit 968f91b651ad67feb45eea82c7e079801156cb24
Author: Marco Nenciarini <mnencia at debian.org>
Date:   Thu Dec 31 16:18:07 2009 +0100

    Fixed wrong substitution variable in 0002-native-libs-should-be-private.patch

diff --git a/debian/patches/0002-native-libs-should-be-private.patch b/debian/patches/0002-native-libs-should-be-private.patch
index 2abb895..f1ee1d3 100644
--- a/debian/patches/0002-native-libs-should-be-private.patch
+++ b/debian/patches/0002-native-libs-should-be-private.patch
@@ -6,9 +6,8 @@ Subject: [PATCH] native libs should be private
  configure.in                          |    6 ++++++
  lib/mono-fuse/Makefile.am             |    2 ++
  lib/mono-fuse/Mono.Fuse.dll.config.in |    4 ++++
- lib/pkgconfig/mono-fuse.pc.in         |    2 +-
  src/MonoFuseHelper/Makefile.am        |    2 +-
- 5 files changed, 14 insertions(+), 2 deletions(-)
+ 4 files changed, 13 insertions(+), 1 deletions(-)
  create mode 100644 lib/mono-fuse/Mono.Fuse.dll.config.in
 
 diff --git a/configure.in b/configure.in
@@ -50,18 +49,6 @@ index 0000000..69cf5c3
 +  <dllmap dll="MonoFuseHelper" target="@expanded_libdir@/@PACKAGE@/libMonoFuseHelper.so" os="!osx"/>
 +  <dllmap dll="MonoFuseHelper" target="@expanded_libdir@/@PACKAGE@/libMonoFuseHelper.dylib" os="osx" />
 +</configuration>
-diff --git a/lib/pkgconfig/mono-fuse.pc.in b/lib/pkgconfig/mono-fuse.pc.in
-index e6d759b..fa65e8b 100644
---- a/lib/pkgconfig/mono-fuse.pc.in
-+++ b/lib/pkgconfig/mono-fuse.pc.in
-@@ -1,6 +1,6 @@
- prefix=${pcfiledir}/../..
- exec_prefix=${pcfiledir}/../..
--libdir=@libdir@
-+libdir=@pkglibdir@
- includedir=${prefix}/include
- assemblies_dir=${libdir}/mono-fuse
- Libraries=${assemblies_dir}/Mono.Fuse.dll
 diff --git a/src/MonoFuseHelper/Makefile.am b/src/MonoFuseHelper/Makefile.am
 index d06a506..cd9cd98 100644
 --- a/src/MonoFuseHelper/Makefile.am

-- 
mono-fuse



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