r36113 - in /desktop/experimental/gvfs/debian: changelog patches/05_shared_libdaemon.patch

[smcv at users.alioth.debian.org]

Author: smcv
Date: Tue Oct 23 08:55:19 2012
New Revision: 36113

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36113
Log:
refresh 05_shared_libdaemon.patch

Modified:
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=36113&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Tue Oct 23 08:55:19 2012
@@ -22,6 +22,7 @@
     - Add patch from Christian Kellner, via Ubuntu, to erase broken metadata
       files (related to LP #405432)
     - refresh 04_hurd_path_max.patch
+    - refresh 05_shared_libdaemon.patch
 
  -- Simon McVittie <smcv at debian.org>  Tue, 23 Oct 2012 09:21:04 +0100
 

Modified: desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch?rev=36113&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch [utf-8] Tue Oct 23 08:55:19 2012
@@ -1,8 +1,44 @@
-Index: gvfs-exp/daemon/Makefile.am
-===================================================================
---- gvfs-exp.orig/daemon/Makefile.am	2012-03-19 17:18:57.000000000 +0100
-+++ gvfs-exp/daemon/Makefile.am	2012-03-21 09:01:10.620172442 +0100
-@@ -18,12 +18,14 @@
+From 0309aa780e000bbd23b17aea497ef13827e89d53 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv at debian.org>
+Date: Thu, 18 Oct 2012 16:06:13 +0100
+Subject: [PATCH] Put common code for gvfsd-* in private libraries
+
+Patch originally by Josselin Mouette.
+
+Origin: vendor, Debian
+---
+ common/Makefile.am |    6 ++++--
+ daemon/Makefile.am |   14 +++++++++++---
+ 2 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/common/Makefile.am b/common/Makefile.am
+index 07ac8f4..5db22f9 100644
+--- a/common/Makefile.am
++++ b/common/Makefile.am
+@@ -1,6 +1,8 @@
+ NULL =
+ 
+-lib_LTLIBRARIES=libgvfscommon.la
++privlibdir=$(libdir)/gvfs
++
++privlib_LTLIBRARIES=libgvfscommon.la
+ noinst_LTLIBRARIES = libgvfscommon-monitor.la
+ 
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
+@@ -31,7 +33,7 @@ libgvfscommon_la_SOURCES = 	\
+ 	$(NULL)
+ 
+ # needed by cygwin (see bug #564003)
+-libgvfscommon_la_LDFLAGS = -no-undefined
++libgvfscommon_la_LDFLAGS = -no-undefined  -avoid-version
+ 
+ libgvfscommon_la_LIBADD =	\
+ 	$(GLIB_LIBS)		\
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index 1cb0cba..5ae6d79 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -18,10 +18,12 @@ INCLUDES =					\
  	-DMOUNTABLE_DIR=\"$(mountdir)/\" 	\
  	-DGVFS_LOCALEDIR=\""$(localedir)"\"
  
@@ -15,12 +51,9 @@
 -	libdaemon.la					\
 +	libgvfsdaemon.la				\
  	$(top_builddir)/common/libgvfscommon.la		\
--	$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
-+	$(GLIB_LIBS) $(DBUS_LIBS)
+ 	$(GLIB_LIBS) $(KEYRING_LIBS)
  
- gvfs_gschemas =
- gvfs_gschemas_convert =
-@@ -132,7 +134,7 @@
+@@ -138,7 +140,7 @@ noinst_PROGRAMS =				\
  	gvfsd-test			\
  	$(NULL)
  
@@ -29,7 +62,7 @@
  	gvfsdaemon.c gvfsdaemon.h \
  	gvfsbackend.c gvfsbackend.h \
  	gvfschannel.c gvfschannel.h \
-@@ -180,6 +182,12 @@
+@@ -186,6 +188,12 @@ libdaemon_la_SOURCES = \
  	gvfskeyring.h gvfskeyring.c \
          $(NULL)
  
@@ -37,49 +70,11 @@
 +
 +libgvfsdaemon_la_LIBADD = \
 +	$(top_builddir)/common/libgvfscommon.la		\
-+	$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
++	$(GLIB_LIBS) $(KEYRING_LIBS)
 +
  gvfsd_SOURCES = \
  	mount.c mount.h \
  	main.c
-Index: gvfs-exp/common/Makefile.am
-===================================================================
---- gvfs-exp.orig/common/Makefile.am	2012-03-19 17:18:57.000000000 +0100
-+++ gvfs-exp/common/Makefile.am	2012-03-21 09:01:10.620172442 +0100
-@@ -1,6 +1,8 @@
- NULL =
- 
--lib_LTLIBRARIES=libgvfscommon.la
-+privlibdir=$(libdir)/gvfs
-+
-+privlib_LTLIBRARIES=libgvfscommon.la
- 
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
- 	-I$(top_srcdir)/daemon \
-@@ -22,7 +24,7 @@
- 	$(NULL)
- 
- # needed by cygwin (see bug #564003)
--libgvfscommon_la_LDFLAGS = -no-undefined
-+libgvfscommon_la_LDFLAGS = -no-undefined  -avoid-version
- 
- libgvfscommon_la_LIBADD =	\
- 	$(DBUS_LIBS) 		\
-@@ -30,7 +32,7 @@
- 	$(BLURAY_LIBS)
- 
- if HAVE_AVAHI
--lib_LTLIBRARIES += libgvfscommon-dnssd.la
-+privlib_LTLIBRARIES += libgvfscommon-dnssd.la
- 
- libgvfscommon_dnssd_la_SOURCES = 	\
- 	gvfsdnssdutils.c gvfsdnssdutils.h \
-@@ -40,6 +42,8 @@
- libgvfscommon_dnssd_la_CFLAGS =	\
- 	$(AVAHI_CFLAGS)
- 
-+libgvfscommon_dnssd_la_LDFLAGS = -avoid-version
-+
- libgvfscommon_dnssd_la_LIBADD =	\
- 	libgvfscommon.la \
- 	$(AVAHI_LIBS) \
+-- 
+1.7.10.4
+