diff -durN gvfs-1.14.1.orig/client/Makefile.am gvfs-1.14.1/client/Makefile.am --- gvfs-1.14.1.orig/client/Makefile.am 2012-11-01 17:46:10.000000000 +0400 +++ gvfs-1.14.1/client/Makefile.am 2012-11-02 15:08:41.281977811 +0400 @@ -15,7 +15,7 @@ ## Common to dynamic and static client libs -gvfsclientincludedir=$(includedir)/gvfs-client/gvfs/ +gvfsclientincludedir=$(includedir)/gvfs-1.0/client/ gvfsclientinclude_HEADERS = \ gvfsuriutils.h gvfsurimapper.h \ $(NULL) diff -durN gvfs-1.14.1.orig/common/Makefile.am gvfs-1.14.1/common/Makefile.am --- gvfs-1.14.1.orig/common/Makefile.am 2012-11-01 17:46:10.000000000 +0400 +++ gvfs-1.14.1/common/Makefile.am 2012-11-02 15:08:41.281977811 +0400 @@ -19,6 +19,13 @@ $(srcdir)/org.gtk.vfs.xml \ $(NULL) +libgvfscommonincludedir=$(includedir)/gvfs-1.0/common/ +libgvfscommoninclude_HEADERS = \ + gmountspec.h \ + gmountsource.h \ + gvfsdaemonprotocol.h \ + $(NULL) + libgvfscommon_la_SOURCES = \ gmountspec.c gmountspec.h \ gmountoperationdbus.c gmountoperationdbus.h \ diff -durN gvfs-1.14.1.orig/configure.ac gvfs-1.14.1/configure.ac --- gvfs-1.14.1.orig/configure.ac 2012-11-01 17:46:10.000000000 +0400 +++ gvfs-1.14.1/configure.ac 2012-11-02 15:08:41.285977736 +0400 @@ -834,6 +834,7 @@ man/Makefile test/Makefile po/Makefile.in +gvfs-daemon.pc ]) echo diff -durN gvfs-1.14.1.orig/daemon/Makefile.am gvfs-1.14.1/daemon/Makefile.am --- gvfs-1.14.1.orig/daemon/Makefile.am 2012-11-01 17:46:10.000000000 +0400 +++ gvfs-1.14.1/daemon/Makefile.am 2012-11-02 15:08:41.285977736 +0400 @@ -18,10 +18,10 @@ -DMOUNTABLE_DIR=\"$(mountdir)/\" \ -DGVFS_LOCALEDIR=\""$(localedir)"\" -noinst_LTLIBRARIES=libdaemon.la +lib_LTLIBRARIES=libgvfsdaemon.la libraries = \ - libdaemon.la \ + libgvfsdaemon.la \ $(top_builddir)/common/libgvfscommon.la \ $(GLIB_LIBS) $(KEYRING_LIBS) @@ -138,7 +138,7 @@ gvfsd-test \ $(NULL) -libdaemon_la_SOURCES = \ +libgvfsdaemon_la_SOURCES = \ gvfsdaemon.c gvfsdaemon.h \ gvfsbackend.c gvfsbackend.h \ gvfschannel.c gvfschannel.h \ @@ -186,6 +186,52 @@ gvfskeyring.h gvfskeyring.c \ $(NULL) +libgvfsdaemonincludedir=$(includedir)/gvfs-1.0/daemon/ +libgvfsdaemoninclude_HEADERS = \ + gvfsdaemon.h \ + gvfsbackend.h \ + gvfschannel.h \ + gvfsreadchannel.h \ + gvfswritechannel.h \ + gvfsmonitor.h \ + gvfsdaemonutils.h \ + gvfsjob.h \ + gvfsjobsource.h \ + gvfsjobdbus.h \ + gvfsjobmount.h \ + gvfsjobunmount.h \ + gvfsjobmountmountable.h \ + gvfsjobunmountmountable.h \ + gvfsjobopenforread.h \ + gvfsjobread.h \ + gvfsjobseekread.h \ + gvfsjobcloseread.h \ + gvfsjobopenforwrite.h \ + gvfsjobwrite.h \ + gvfsjobseekwrite.h \ + gvfsjobclosewrite.h \ + gvfsjobqueryinfo.h \ + gvfsjobqueryfsinfo.h \ + gvfsjobenumerate.h \ + gvfsjobsetdisplayname.h \ + gvfsjobtrash.h \ + gvfsjobdelete.h \ + gvfsjobcopy.h \ + gvfsjobmove.h \ + gvfsjobpush.h \ + gvfsjobpull.h \ + gvfsjobmakedirectory.h \ + gvfsjobmakesymlink.h \ + gvfsjobsetattribute.h \ + gvfsjobqueryattributes.h \ + gvfsjobcreatemonitor.h \ + gvfskeyring.h \ + $(NULL) + +libgvfsdaemon_la_LIBADD = \ + $(top_builddir)/common/libgvfscommon.la \ + $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS) + gvfsd_SOURCES = \ mount.c mount.h \ main.c diff -durN gvfs-1.14.1.orig/gvfs-daemon.pc.in gvfs-1.14.1/gvfs-daemon.pc.in --- gvfs-1.14.1.orig/gvfs-daemon.pc.in 1970-01-01 03:00:00.000000000 +0300 +++ gvfs-1.14.1/gvfs-daemon.pc.in 2012-11-02 15:08:41.285977736 +0400 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gvfs-daemon +Description: GNOME Virtual File-System Library +Requires: gio-2.0 +Version: @VERSION@ +Libs: -L${libdir} -lgvfscommon -lgvfsdaemon +Cflags: -I${includedir}/gvfs-1.0/common -I${includedir}/gvfs-1.0/daemon -I${includedir}/gvfs-1.0/client diff -durN gvfs-1.14.1.orig/Makefile.am gvfs-1.14.1/Makefile.am --- gvfs-1.14.1.orig/Makefile.am 2012-11-02 15:08:07.000000000 +0400 +++ gvfs-1.14.1/Makefile.am 2012-11-02 15:08:41.285977736 +0400 @@ -32,6 +32,9 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gvfs-daemon.pc + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc EXTRA_DIST = \