[Pkg-cli-libs-commits] [SCM] mono-fuse branch, master, updated. debian/0.4.2-1-4-g16db592

Marco Nenciarini mnencia at debian.org
Thu Jan 7 09:50:40 UTC 2010 

The following commit has been merged in the master branch:
commit 8678de5153f62df45b08f7a829ef8f3c131c2c7c
Author: Marco Nenciarini <mnencia at debian.org>
Date:   Wed Jan 6 22:28:27 2010 +0100

    Add glue native library and library config file to pkg-config file

diff --git a/debian/patches/0002-native-libs-should-be-private.patch b/debian/patches/0002-native-libs-should-be-private.patch
index 5a44b42..6f8dbb3 100644
--- a/debian/patches/0002-native-libs-should-be-private.patch
+++ b/debian/patches/0002-native-libs-should-be-private.patch
@@ -3,29 +3,37 @@ Date: Wed, 30 Dec 2009 17:41:08 +0100
 Subject: [PATCH] native libs should be private
 
 ---
- configure.in                          |    6 ++++++
+ configure.in                          |    7 ++++---
+ example/HelloFS/hellofs.in            |    2 +-
+ example/RedirectFS/redirectfs-fh.in   |    2 +-
+ example/RedirectFS/redirectfs.in      |    2 +-
  lib/mono-fuse/Makefile.am             |    2 ++
- lib/mono-fuse/Mono.Fuse.dll.config.in |    4 ++++
- lib/pkgconfig/mono-fuse.pc.in         |    4 ++--
- src/MonoFuseHelper/Makefile.am        |    2 +-
- 5 files changed, 15 insertions(+), 3 deletions(-)
+ lib/mono-fuse/Mono.Fuse.dll.config.in |    3 +++
+ lib/pkgconfig/mono-fuse.pc.in         |    6 +++---
+ src/MonoFuseHelper/Makefile.am        |   10 +++++-----
+ 8 files changed, 20 insertions(+), 14 deletions(-)
  create mode 100644 lib/mono-fuse/Mono.Fuse.dll.config.in
 
 diff --git a/configure.in b/configure.in
-index 2b6339e..6116eb3 100644
+index 2b6339e..a2ab34f 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -133,11 +133,17 @@ AC_SUBST(MONODOCER)
+@@ -51,11 +51,11 @@ if test "x$has_mono" = "xtrue"; then
+ 	AC_PATH_PROG(RUNTIME, mono, no)
+ 	AC_PATH_PROG(CSC, gmcs, no)
+ 	if test `uname -s` = "Darwin"; then
+-		LIB_PREFIX=
++		LIB_PREFIX=lib
+ 		LIB_SUFFIX=.dylib
+ 	else
+-		LIB_PREFIX=.so
+-		LIB_SUFFIX=
++		LIB_PREFIX=lib
++		LIB_SUFFIX=.so
+ 	fi
+ fi
  
- AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes")
- 
-+expanded_libdir=`( case $prefix in NONE) prefix=$ac_default_prefix ;; *) ;; esac
-+		   case $exec_prefix in NONE) exec_prefix=$prefix ;; *) ;; esac
-+		   eval echo $libdir )`
-+AC_SUBST(expanded_libdir)
-+
- AC_OUTPUT([
- Makefile
+@@ -138,6 +138,7 @@ Makefile
  doc/Makefile
  lib/Makefile
  lib/mono-fuse/Makefile
@@ -33,6 +41,42 @@ index 2b6339e..6116eb3 100644
  lib/pkgconfig/Makefile
  lib/pkgconfig/mono-fuse.pc
  src/Makefile
+diff --git a/example/HelloFS/hellofs.in b/example/HelloFS/hellofs.in
+index af904a1..ae9a55c 100644
+--- a/example/HelloFS/hellofs.in
++++ b/example/HelloFS/hellofs.in
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-libdir="@TOP_BUILDDIR@/lib"
++libdir="@TOP_BUILDDIR@/lib/mono-fuse"
+ builddir="@BUILDDIR@"
+ 
+ DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}$libdir" \
+diff --git a/example/RedirectFS/redirectfs-fh.in b/example/RedirectFS/redirectfs-fh.in
+index bc27d25..e29fe53 100644
+--- a/example/RedirectFS/redirectfs-fh.in
++++ b/example/RedirectFS/redirectfs-fh.in
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-libdir="@TOP_BUILDDIR@/lib"
++libdir="@TOP_BUILDDIR@/lib/mono-fuse"
+ builddir="@BUILDDIR@"
+ 
+ DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}$libdir" \
+diff --git a/example/RedirectFS/redirectfs.in b/example/RedirectFS/redirectfs.in
+index a402978..c050b5a 100644
+--- a/example/RedirectFS/redirectfs.in
++++ b/example/RedirectFS/redirectfs.in
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-libdir="@TOP_BUILDDIR@/lib"
++libdir="@TOP_BUILDDIR@/lib/mono-fuse"
+ builddir="@BUILDDIR@"
+ 
+ DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}$libdir" \
 diff --git a/lib/mono-fuse/Makefile.am b/lib/mono-fuse/Makefile.am
 index e69de29..5b6679f 100644
 --- a/lib/mono-fuse/Makefile.am
@@ -42,28 +86,33 @@ index e69de29..5b6679f 100644
 +DISTCLEANFILES = Mono.Fuse.dll.config
 diff --git a/lib/mono-fuse/Mono.Fuse.dll.config.in b/lib/mono-fuse/Mono.Fuse.dll.config.in
 new file mode 100644
-index 0000000..69cf5c3
+index 0000000..7064f97
 --- /dev/null
 +++ b/lib/mono-fuse/Mono.Fuse.dll.config.in
-@@ -0,0 +1,4 @@
+@@ -0,0 +1,3 @@
 +<configuration>
-+  <dllmap dll="MonoFuseHelper" target="@expanded_libdir@/@PACKAGE@/libMonoFuseHelper.so" os="!osx"/>
-+  <dllmap dll="MonoFuseHelper" target="@expanded_libdir@/@PACKAGE@/libMonoFuseHelper.dylib" os="osx" />
++  <dllmap dll="MonoFuseHelper" target="@LIB_PREFIX at MonoFuseHelper@LIB_SUFFIX@" />
 +</configuration>
 diff --git a/lib/pkgconfig/mono-fuse.pc.in b/lib/pkgconfig/mono-fuse.pc.in
-index e6d759b..14c4a47 100644
+index e6d759b..fb88cdd 100644
 --- a/lib/pkgconfig/mono-fuse.pc.in
 +++ b/lib/pkgconfig/mono-fuse.pc.in
-@@ -8,5 +8,5 @@ Libraries=${assemblies_dir}/Mono.Fuse.dll
+@@ -3,10 +3,10 @@ exec_prefix=${pcfiledir}/../..
+ libdir=@libdir@
+ includedir=${prefix}/include
+ assemblies_dir=${libdir}/mono-fuse
+-Libraries=${assemblies_dir}/Mono.Fuse.dll
+- 
++Libraries=${assemblies_dir}/Mono.Fuse.dll ${assemblies_dir}/Mono.Fuse.dll.config ${assemblies_dir}/@LIB_PREFIX at MonoFuseHelper@LIB_SUFFIX@
++
  Name: Mono.Fuse
  Description: C# Binding for FUSE
  Version: @VERSION@
 -Requires: 
--Libs: -r:Mono.Fuse.dll -r:Mono.Posix.dll
 +Requires:
-+Libs: -r:${assemblies_dir}/Mono.Fuse.dll -r:Mono.Posix.dll
+ Libs: -r:Mono.Fuse.dll -r:Mono.Posix.dll
 diff --git a/src/MonoFuseHelper/Makefile.am b/src/MonoFuseHelper/Makefile.am
-index d06a506..cd9cd98 100644
+index d06a506..de1abc8 100644
 --- a/src/MonoFuseHelper/Makefile.am
 +++ b/src/MonoFuseHelper/Makefile.am
 @@ -1,4 +1,4 @@
@@ -72,4 +121,24 @@ index d06a506..cd9cd98 100644
  
  INCLUDES = $(GLIB_CFLAGS) $(FUSE_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/lib
  AM_CFLAGS = $(MFH_CFLAGS) -DHAVE_STRUCT_FUSE_ARGS
+@@ -14,7 +14,7 @@ libMonoFuseHelper_la_SOURCES = $(MFH_SOURCE)
+ libMonoFuseHelper_la_LIBADD  = $(MFH_LIBS)
+ libMonoFuseHelper_la_LDFLAGS = -no-undefined -avoid-version
+ 
+-buildlibdir = $(shell cd $(top_builddir)/lib && pwd)
++buildlibdir = $(shell cd $(top_builddir)/lib/mono-fuse && pwd)
+ 
+ all: libMonoFuseHelper.la $(buildlibdir)/libMonoFuseHelper.so
+ 
+@@ -22,7 +22,7 @@ $(buildlibdir)/libMonoFuseHelper.so: $(MFH_SOURCE)
+ 	$(LIBTOOL) --mode=install install -c libMonoFuseHelper.la $(buildlibdir)
+ 
+ CLEANFILES = \
+-	$(top_builddir)/lib/libMonoFuseHelper.so \
+-	$(top_builddir)/lib/libMonoFuseHelper.la \
+-	$(top_builddir)/lib/libMonoFuseHelper.a
++	$(top_builddir)/lib/mono-fuse/libMonoFuseHelper.so \
++	$(top_builddir)/lib/mono-fuse/libMonoFuseHelper.la \
++	$(top_builddir)/lib/mono-fuse/libMonoFuseHelper.a
+ 
 -- 
diff --git a/debian/patches/0003-fix-reported-version.patch b/debian/patches/0003-fix-reported-version.patch
index 72a3b23..0558269 100644
--- a/debian/patches/0003-fix-reported-version.patch
+++ b/debian/patches/0003-fix-reported-version.patch
@@ -9,7 +9,7 @@ Such version it's used in the pkg-config file.
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index 6116eb3..e076f84 100644
+index a2ab34f..da126f6 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -1,4 +1,4 @@

-- 
mono-fuse

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