Package: gvfs
Version: 1.10.0-0
The version of gvfs in sid has a regression which causes bluetooth
browsing not to work. Instead of properly connecting and mounting an
obex mount point via gvfs, the user is presented with an error:
Error mounting location: DBus error org.freedesktop.DBus.Error.NoReply:
Did not receive a reply. Possible causes include: the remote application
did not send a reply, the message bus security policy blocked the reply,
the reply timeout expired, or the network connection was broken.
Bisection revealed that the first bad version is gvfs-1.8.0-1. The cause
of the problem is 05_shared_libdaemon.patch which never made it
upstream. I'm unsure why this change causes dbus timeouts.
I have built a version of gvfs that works for me, but I could not figure
out a way to build without reintroducing the libgvfscommon0 package.
Without this, dpkg-shlibdeps complains, though I don't think
libgvfscommon0 has anything to do with fixing the bug and would like to
see these libraries in the gvfs and gvfs-backend packages as they are today.
For more information, please see: https://bugs.launchpad.net/bugs/899858
=== removed directory '.pc/05_shared_libdaemon.patch'
=== removed directory '.pc/05_shared_libdaemon.patch/common'
=== removed file '.pc/05_shared_libdaemon.patch/common/Makefile.am'
--- .pc/05_shared_libdaemon.patch/common/Makefile.am 2011-07-08 07:05:54 +0000
+++ .pc/05_shared_libdaemon.patch/common/Makefile.am 1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-NULL =
-
-lib_LTLIBRARIES=libgvfscommon.la
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
- -I$(top_srcdir)/daemon \
- $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(BLURAY_CFLAGS) \
- -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
- -DDBUS_API_SUBJECT_TO_CHANGE
-
-libgvfscommon_la_SOURCES = \
- gsysutils.c gsysutils.h \
- gvfsdbusutils.c gvfsdbusutils.h \
- gmountspec.c gmountspec.h \
- gmountoperationdbus.c gmountoperationdbus.h \
- gmountsource.c gmountsource.h \
- gmounttracker.c gmounttracker.h \
- gvfsdaemonprotocol.c gvfsdaemonprotocol.h \
- gvfsicon.h gvfsicon.c \
- gvfsmountinfo.h gvfsmountinfo.c \
- gvfsfileinfo.c gvfsfileinfo.h \
- $(NULL)
-
-# needed by cygwin (see bug #564003)
-libgvfscommon_la_LDFLAGS = -no-undefined
-
-libgvfscommon_la_LIBADD = \
- $(DBUS_LIBS) \
- $(GLIB_LIBS) \
- $(BLURAY_LIBS)
-
-if HAVE_AVAHI
-lib_LTLIBRARIES += libgvfscommon-dnssd.la
-
-libgvfscommon_dnssd_la_SOURCES = \
- gvfsdnssdutils.c gvfsdnssdutils.h \
- gvfsdnssdresolver.c gvfsdnssdresolver.h \
- $(NULL)
-
-libgvfscommon_dnssd_la_CFLAGS = \
- $(AVAHI_CFLAGS)
-
-libgvfscommon_dnssd_la_LIBADD = \
- libgvfscommon.la \
- $(AVAHI_LIBS) \
- $(GLIB_LIBS)
-endif
-
=== removed directory '.pc/05_shared_libdaemon.patch/daemon'
=== removed file '.pc/05_shared_libdaemon.patch/daemon/Makefile.am'
--- .pc/05_shared_libdaemon.patch/daemon/Makefile.am 2011-09-06 09:24:10 +0000
+++ .pc/05_shared_libdaemon.patch/daemon/Makefile.am 1970-01-01 00:00:00 +0000
@@ -1,529 +0,0 @@
-SUBDIRS = trashlib
-
-NULL =
-
-mountdir = $(datadir)/gvfs/mounts
-
-INCLUDES = \
- $(SAMBA_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/common \
- -I$(top_builddir) \
- $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
- $(OBEXFTP_CFLAGS) $(EXPAT_CFLAGS) \
- $(KEYRING_CFLAGS) \
- -DDBUS_API_SUBJECT_TO_CHANGE \
- -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
- -DLIBEXEC_DIR=\"$(libexecdir)/\" \
- -DMOUNTABLE_DIR=\"$(mountdir)/\" \
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
- -DG_DISABLE_DEPRECATED
-
-noinst_LTLIBRARIES=libdaemon.la
-
-libraries = \
- libdaemon.la \
- $(top_builddir)/common/libgvfscommon.la \
- $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
-
-gvfs_gschemas =
-gvfs_gschemas_convert =
-
-# D-BUS service file
-%.service: %.service.in ../config.log
- $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-servicedir = $(DBUS_SERVICE_DIR)
-service_in_files = gvfs-daemon.service.in
-service_DATA = gvfs-daemon.service
-
-%.mount: %.mount.in ../config.log
- $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network
-
-mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in
-mount_DATA = sftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount
-
-mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in ftp.mount.in
-if HAVE_HTTP
-mount_DATA += http.mount dav.mount ftp.mount
-if HAVE_AVAHI
-mount_DATA += dav+sd.mount
-endif
-libexec_PROGRAMS += gvfsd-http gvfsd-dav
-endif
-
-mount_in_files += smb.mount.in smb-browse.mount.in
-if HAVE_SAMBA
-mount_DATA += smb.mount smb-browse.mount
-libexec_PROGRAMS += gvfsd-smb-browse gvfsd-smb
-gvfs_gschemas += org.gnome.system.smb.gschema.xml
-gvfs_gschemas_convert += gvfs-smb.convert
-endif
-
-mount_in_files += cdda.mount.in
-if USE_CDDA
-mount_DATA += cdda.mount
-libexec_PROGRAMS += gvfsd-cdda
-endif
-
-mount_in_files += gphoto2.mount.in
-if USE_GPHOTO2
-mount_DATA += gphoto2.mount
-libexec_PROGRAMS += gvfsd-gphoto2
-endif
-
-mount_in_files += obexftp.mount.in
-if USE_OBEXFTP
-mount_DATA += obexftp.mount
-libexec_PROGRAMS += gvfsd-obexftp
-BUILT_SOURCES = obexftp-marshal.c obexftp-marshal.h
-
-obexftp-marshal.h: obexftp-marshal.list
- $(AM_V_GEN) glib-genmarshal $< --prefix=obexftp_marshal --header > $@
-
-obexftp-marshal.c: obexftp-marshal.list
- $(AM_V_GEN) echo "#include \"obexftp-marshal.h\"" > $@ && glib-genmarshal $< --prefix=obexftp_marshal --body >> $@
-
-endif
-
-mount_in_files += dns-sd.mount.in
-if HAVE_AVAHI
-mount_DATA += dns-sd.mount
-libexec_PROGRAMS += gvfsd-dnssd
-gvfs_gschemas += org.gnome.system.dns_sd.gschema.xml
-gvfs_gschemas_convert += gvfs-dns-sd.convert
-endif
-
-mount_in_files += archive.mount.in
-if HAVE_ARCHIVE
-mount_DATA += archive.mount
-libexec_PROGRAMS += gvfsd-archive
-endif
-
-mount_in_files += afc.mount.in
-if USE_AFC
-mount_DATA += afc.mount
-libexec_PROGRAMS += gvfsd-afc
-endif
-
-mount_in_files += afp-browse.mount.in afp.mount.in
-if USE_AFP
-mount_DATA += afp-browse.mount afp.mount
-libexec_PROGRAMS += gvfsd-afp-browse gvfsd-afp
-endif
-
-EXTRA_DIST = \
- gvfs-daemon.service.in \
- $(mount_in_files) \
- obexftp-marshal.list \
- $(gvfs_gschemas) \
- $(gvfs_gschemas_convert_DATA) \
- $(gsettings_ENUM_FILES) \
- $(NULL)
-
-DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
-
-CLEANFILES = \
- $(gsettings__enum_file) \
- *.gschema.valid
-
-noinst_PROGRAMS = \
- gvfsd-test \
- $(NULL)
-
-libdaemon_la_SOURCES = \
- gvfsdaemon.c gvfsdaemon.h \
- gvfsbackend.c gvfsbackend.h \
- gvfschannel.c gvfschannel.h \
- gvfsreadchannel.c gvfsreadchannel.h \
- gvfswritechannel.c gvfswritechannel.h \
- gvfsmonitor.c gvfsmonitor.h \
- gvfsdaemonutils.c gvfsdaemonutils.h \
- gvfsjob.c gvfsjob.h \
- gvfsjobsource.c gvfsjobsource.h \
- gvfsjobdbus.c gvfsjobdbus.h \
- gvfsjobmount.c gvfsjobmount.h \
- gvfsjobunmount.c gvfsjobunmount.h \
- gvfsjobmountmountable.c gvfsjobmountmountable.h \
- gvfsjobunmountmountable.c gvfsjobunmountmountable.h \
- gvfsjobstartmountable.c gvfsjobstartmountable.h \
- gvfsjobstopmountable.c gvfsjobstopmountable.h \
- gvfsjobpollmountable.c gvfsjobpollmountable.h \
- gvfsjobopenforread.c gvfsjobopenforread.h \
- gvfsjobopeniconforread.c gvfsjobopeniconforread.h \
- gvfsjobread.c gvfsjobread.h \
- gvfsjobseekread.c gvfsjobseekread.h \
- gvfsjobcloseread.c gvfsjobcloseread.h \
- gvfsjobopenforwrite.c gvfsjobopenforwrite.h \
- gvfsjobwrite.c gvfsjobwrite.h \
- gvfsjobseekwrite.c gvfsjobseekwrite.h \
- gvfsjobclosewrite.c gvfsjobclosewrite.h \
- gvfsjobqueryinfo.c gvfsjobqueryinfo.h \
- gvfsjobqueryinforead.c gvfsjobqueryinforead.h \
- gvfsjobqueryinfowrite.c gvfsjobqueryinfowrite.h \
- gvfsjobqueryfsinfo.c gvfsjobqueryfsinfo.h \
- gvfsjobenumerate.c gvfsjobenumerate.h \
- gvfsjobsetdisplayname.c gvfsjobsetdisplayname.h \
- gvfsjobtrash.c gvfsjobtrash.h \
- gvfsjobdelete.c gvfsjobdelete.h \
- gvfsjobcopy.c gvfsjobcopy.h \
- gvfsjobmove.c gvfsjobmove.h \
- gvfsjobpush.c gvfsjobpush.h \
- gvfsjobpull.c gvfsjobpull.h \
- gvfsjobmakedirectory.c gvfsjobmakedirectory.h \
- gvfsjobmakesymlink.c gvfsjobmakesymlink.h \
- gvfsjobsetattribute.c gvfsjobsetattribute.h \
- gvfsjobqueryattributes.c gvfsjobqueryattributes.h \
- gvfsjobcreatemonitor.c gvfsjobcreatemonitor.h \
- dbus-gmain.h dbus-gmain.c \
- gvfskeyring.h gvfskeyring.c \
- $(NULL)
-
-gvfsd_SOURCES = \
- mount.c mount.h \
- main.c
-
-gvfsd_LDADD = $(libraries)
-
-gvfsd_test_SOURCES = \
- gvfsbackendtest.c gvfsbackendtest.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_test_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendtest.h \
- -DDEFAULT_BACKEND_TYPE=test \
- -DBACKEND_TYPES='"test", G_VFS_TYPE_BACKEND_TEST,'
-
-gvfsd_test_LDADD = $(libraries)
-
-gvfsd_localtest_SOURCES = \
- gvfsbackendlocaltest.c gvfsbackendlocaltest.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_localtest_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendlocaltest.h \
- -DDEFAULT_BACKEND_TYPE=localtest \
- -DBACKEND_TYPES='"localtest", G_VFS_TYPE_BACKEND_LOCALTEST,'
-
-gvfsd_localtest_LDADD = $(libraries)
-
-gvfsd_smb_SOURCES = \
- gvfsbackendsmb.c gvfsbackendsmb.h libsmb-compat.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_smb_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendsmb.h \
- -DDEFAULT_BACKEND_TYPE=smb-share \
- -DMAX_JOB_THREADS=1 \
- -DBACKEND_TYPES='"smb-share", G_VFS_TYPE_BACKEND_SMB,'
-
-gvfsd_smb_LDADD = $(SAMBA_LIBS) $(libraries)
-
-gvfsd_smb_browse_SOURCES = \
- gvfsbackendsmbbrowse.c gvfsbackendsmbbrowse.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_smb_browse_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendsmbbrowse.h \
- -DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint.smb_browse \
- -DMAX_JOB_THREADS=1 \
- -DBACKEND_TYPES='"smb-network", G_VFS_TYPE_BACKEND_SMB_BROWSE,"smb-server", G_VFS_TYPE_BACKEND_SMB_BROWSE,'
-
-gvfsd_smb_browse_LDADD = $(SAMBA_LIBS) $(libraries)
-
-gvfsd_obexftp_SOURCES = \
- gvfsbackendobexftp.c gvfsbackendobexftp.h \
- obexftp-marshal.c obexftp-marshal.h \
- gvfsbackendobexftp-fl-parser.c gvfsbackendobexftp-fl-parser.h \
- gvfsbackendobexftp-cap-parser.c gvfsbackendobexftp-cap-parser.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_obexftp_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendobexftp.h \
- -DDEFAULT_BACKEND_TYPE=obex \
- -DMAX_JOB_THREADS=1 \
- -DBACKEND_TYPES='"obex", G_VFS_TYPE_BACKEND_OBEXFTP,'
-if USE_HAL
-gvfsd_obexftp_CPPFLAGS += $(HAL_CFLAGS)
-endif
-
-gvfsd_obexftp_LDADD = $(OBEXFTP_LIBS) $(EXPAT_LIBS) $(libraries)
-if USE_HAL
-gvfsd_obexftp_LDADD += $(HAL_LIBS)
-endif
-
-gvfsd_ftp_SOURCES = \
- gvfsftpconnection.c gvfsftpconnection.h \
- gvfsftpdircache.c gvfsftpdircache.h \
- gvfsftpfile.c gvfsftpfile.h \
- gvfsftptask.c gvfsftptask.h \
- gvfsbackendftp.c gvfsbackendftp.h \
- ParseFTPList.c ParseFTPList.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_ftp_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendftp.h \
- -DDEFAULT_BACKEND_TYPE=ftp \
- -DMAX_JOB_THREADS=10 \
- -DBACKEND_TYPES='"ftp", G_VFS_TYPE_BACKEND_FTP,'
-
-gvfsd_ftp_LDADD = $(libraries)
-
-gvfsd_sftp_SOURCES = \
- sftp.h \
- gvfsbackendsftp.c gvfsbackendsftp.h \
- pty_open.c pty_open.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_sftp_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendsftp.h \
- -DDEFAULT_BACKEND_TYPE=sftp \
- -DMAX_JOB_THREADS=1 \
- -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \
- -DBACKEND_TYPES='"sftp", G_VFS_TYPE_BACKEND_SFTP,'
-
-gvfsd_sftp_LDADD = $(libraries)
-
-gvfsd_trash_SOURCES = \
- gvfsbackendtrash.c gvfsbackendtrash.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_trash_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendtrash.h \
- -DDEFAULT_BACKEND_TYPE=trash \
- -DMAX_JOB_THREADS=10 \
- -DBACKEND_TYPES='"trash", G_VFS_TYPE_BACKEND_TRASH,' \
- -Itrashlib
-
-gvfsd_trash_LDADD = trashlib/libtrash.a $(libraries)
-
-gvfsd_computer_SOURCES = \
- gvfsbackendcomputer.c gvfsbackendcomputer.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_computer_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendcomputer.h \
- -DDEFAULT_BACKEND_TYPE=computer \
- -DMAX_JOB_THREADS=1 \
- -DBACKEND_TYPES='"computer", G_VFS_TYPE_BACKEND_COMPUTER,'
-
-gvfsd_computer_LDADD = $(libraries)
-
-gvfsd_network_SOURCES = \
- gvfsbackendnetwork.c gvfsbackendnetwork.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_network_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendnetwork.h \
- -DDEFAULT_BACKEND_TYPE=network \
- -DMAX_JOB_THREADS=1 \
- -DBACKEND_TYPES='"network", G_VFS_TYPE_BACKEND_NETWORK,'
-
-gvfsd_network_LDADD = $(libraries)
-
-gvfsd_dnssd_SOURCES = \
- gvfsbackenddnssd.c gvfsbackenddnssd.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_dnssd_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackenddnssd.h \
- -DDEFAULT_BACKEND_TYPE=dns-sd \
- -DMAX_JOB_THREADS=1 \
- $(AVAHI_CFLAGS) \
- -DBACKEND_TYPES='"dns-sd", G_VFS_TYPE_BACKEND_DNS_SD,'
-
-gvfsd_dnssd_LDADD = $(libraries) $(AVAHI_LIBS) $(top_builddir)/common/libgvfscommon-dnssd.la
-
-
-gvfsd_archive_SOURCES = \
- gvfsbackendarchive.c gvfsbackendarchive.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_archive_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendarchive.h \
- -DDEFAULT_BACKEND_TYPE=archive \
- -DMAX_JOB_THREADS=1 \
- $(ARCHIVE_CFLAGS) \
- -DBACKEND_TYPES='"archive", G_VFS_TYPE_BACKEND_ARCHIVE,'
-
-gvfsd_archive_LDADD = $(libraries) $(ARCHIVE_LIBS)
-
-gvfsd_burn_SOURCES = \
- gvfsbackendburn.c gvfsbackendburn.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_burn_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendburn.h \
- -DDEFAULT_BACKEND_TYPE=burn \
- -DMAX_JOB_THREADS=1 \
- -DBACKEND_TYPES='"burn", G_VFS_TYPE_BACKEND_BURN,'
-
-gvfsd_burn_LDADD = $(libraries)
-
-gvfsd_cdda_SOURCES = \
- gvfsbackendcdda.c gvfsbackendcdda.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_cdda_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendcdda.h \
- -DDEFAULT_BACKEND_TYPE=cdda \
- -DMAX_JOB_THREADS=1 \
- -DBACKEND_TYPES='"cdda", G_VFS_TYPE_BACKEND_CDDA,' \
- $(CDDA_CFLAGS)
-if USE_GUDEV
-gvfsd_cdda_CPPFLAGS += $(GUDEV_CFLAGS)
-else
-gvfsd_cdda_CPPFLAGS += $(HAL_CFLAGS)
-endif
-
-if USE_GUDEV
-gvfsd_cdda_LDADD = $(libraries) $(CDDA_LIBS) $(GUDEV_LIBS)
-else
-gvfsd_cdda_LDADD = $(libraries) $(CDDA_LIBS) $(HAL_LIBS)
-endif
-
-gvfsd_gphoto2_SOURCES = \
- gvfsbackendgphoto2.c gvfsbackendgphoto2.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_gphoto2_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendgphoto2.h \
- -DDEFAULT_BACKEND_TYPE=gphoto2 \
- -DMAX_JOB_THREADS=1 \
- $(GPHOTO2_CFLAGS) \
- -DBACKEND_TYPES='"gphoto2", G_VFS_TYPE_BACKEND_GPHOTO2,'
-if USE_GUDEV
-gvfsd_gphoto2_CPPFLAGS += $(GUDEV_CFLAGS)
-else
-gvfsd_gphoto2_CPPFLAGS += $(HAL_CFLAGS)
-endif
-
-if USE_GUDEV
-gvfsd_gphoto2_LDADD = $(libraries) $(GPHOTO2_LIBS) $(GUDEV_LIBS)
-else
-gvfsd_gphoto2_LDADD = $(libraries) $(GPHOTO2_LIBS) $(HAL_LIBS)
-endif
-
-gvfsd_http_SOURCES = \
- soup-input-stream.c soup-input-stream.h \
- gvfsbackendhttp.c gvfsbackendhttp.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_http_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendhttp.h \
- -DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint.http \
- -DDEFAULT_BACKEND_TYPE=http \
- -DMAX_JOB_THREADS=1 \
- $(HTTP_CFLAGS) \
- -DBACKEND_TYPES='"http", G_VFS_TYPE_BACKEND_HTTP,'
-
-gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)
-
-gvfsd_dav_SOURCES = \
- soup-input-stream.c soup-input-stream.h \
- soup-output-stream.c soup-output-stream.h \
- gvfsbackendhttp.c gvfsbackendhttp.h \
- gvfsbackenddav.c gvfsbackenddav.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_dav_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackenddav.h \
- -DDEFAULT_BACKEND_TYPE=dav \
- -DMAX_JOB_THREADS=1 \
- $(HTTP_CFLAGS)
-
-if HAVE_AVAHI
-gvfsd_dav_CPPFLAGS += -DBACKEND_TYPES='"dav", G_VFS_TYPE_BACKEND_DAV, "dav+sd", G_VFS_TYPE_BACKEND_DAV, "davs+sd", G_VFS_TYPE_BACKEND_DAV,'
-else
-gvfsd_dav_CPPFLAGS += -DBACKEND_TYPES='"dav", G_VFS_TYPE_BACKEND_DAV,'
-endif
-
-gvfsd_dav_LDADD = $(libraries) $(HTTP_LIBS)
-if HAVE_AVAHI
-gvfsd_dav_LDADD += $(top_builddir)/common/libgvfscommon-dnssd.la
-endif
-
-gvfsd_afc_SOURCES = \
- gvfsbackendafc.c gvfsbackendafc.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c
-
-gvfsd_afc_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendafc.h \
- -DDEFAULT_BACKEND_TYPE=afc \
- -DMAX_JOB_THREADS=1 \
- $(AFC_CFLAGS) \
- -DBACKEND_TYPES='"afc", G_VFS_TYPE_BACKEND_AFC,'
-
-gvfsd_afc_LDADD = \
- $(libraries) \
- $(AFC_LIBS)
-
-gvfsd_afp_browse_SOURCES = \
- gvfsbackendafpbrowse.c gvfsbackendafpbrowse.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c \
- gvfsafpconnection.h \
- gvfsafpconnection.c \
- gvfsafpserver.h \
- gvfsafpserver.c
-
-gvfsd_afp_browse_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendafpbrowse.h \
- -DMAX_JOB_THREADS=1 \
- -DBACKEND_TYPES='"afp-server", G_VFS_TYPE_BACKEND_AFP_BROWSE,' \
- $(LIBGCRYPT_CFLAGS)
-
-gvfsd_afp_browse_LDADD = \
- $(libraries) \
- $(LIBGCRYPT_LIBS)
-
-gvfsd_afp_SOURCES = \
- gvfsbackendafp.c gvfsbackendafp.h \
- daemon-main.c daemon-main.h \
- daemon-main-generic.c \
- gvfsafpconnection.h \
- gvfsafpconnection.c \
- gvfsafpserver.h \
- gvfsafpserver.c
-
-gvfsd_afp_CPPFLAGS = \
- -DBACKEND_HEADER=gvfsbackendafp.h \
- -DMAX_JOB_THREADS=1 \
- -DBACKEND_TYPES='"afp-volume", G_VFS_TYPE_BACKEND_AFP,' \
- $(LIBGCRYPT_CFLAGS)
-
-gvfsd_afp_LDADD = \
- $(libraries) \
- $(LIBGCRYPT_LIBS)
-
-
-# GSettings stuff
-gsettings_ENUM_NAMESPACE = org.gnome.system.gvfs
-gsettings_ENUM_FILES = $(top_srcdir)/daemon/gvfs-enums.h
-
-gsettings_SCHEMAS = $(gvfs_gschemas)
-
-@GSETTINGS_RULES@
-
-gvfs_gschemas_convertdir = $(datadir)/GConf/gsettings
-gvfs_gschemas_convert_DATA = $(gvfs_gschemas_convert)
=== modified file '.pc/applied-patches'
--- .pc/applied-patches 2011-09-19 12:18:02 +0000
+++ .pc/applied-patches 2012-03-05 13:09:02 +0000
@@ -1,4 +1,3 @@
03_xdg-mount.patch
04_hurd_path_max.patch
-05_shared_libdaemon.patch
06_no_crash_on_unmount.patch
=== modified file 'common/Makefile.am'
--- common/Makefile.am 2011-07-08 07:05:54 +0000
+++ common/Makefile.am 2012-03-05 13:08:54 +0000
@@ -1,8 +1,6 @@
NULL =
-privlibdir=$(libdir)/gvfs
-
-privlib_LTLIBRARIES=libgvfscommon.la
+lib_LTLIBRARIES=libgvfscommon.la
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
-I$(top_srcdir)/daemon \
@@ -24,7 +22,7 @@
$(NULL)
# needed by cygwin (see bug #564003)
-libgvfscommon_la_LDFLAGS = -no-undefined -avoid-version
+libgvfscommon_la_LDFLAGS = -no-undefined
libgvfscommon_la_LIBADD = \
$(DBUS_LIBS) \
@@ -32,7 +30,7 @@
$(BLURAY_LIBS)
if HAVE_AVAHI
-privlib_LTLIBRARIES += libgvfscommon-dnssd.la
+lib_LTLIBRARIES += libgvfscommon-dnssd.la
libgvfscommon_dnssd_la_SOURCES = \
gvfsdnssdutils.c gvfsdnssdutils.h \
@@ -42,8 +40,6 @@
libgvfscommon_dnssd_la_CFLAGS = \
$(AVAHI_CFLAGS)
-libgvfscommon_dnssd_la_LDFLAGS = -avoid-version
-
libgvfscommon_dnssd_la_LIBADD = \
libgvfscommon.la \
$(AVAHI_LIBS) \
=== modified file 'daemon/Makefile.am'
--- daemon/Makefile.am 2011-09-06 09:24:10 +0000
+++ daemon/Makefile.am 2012-03-05 13:08:54 +0000
@@ -19,14 +19,12 @@
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
-DG_DISABLE_DEPRECATED
-privlibdir = $(libdir)/gvfs
-
-privlib_LTLIBRARIES=libgvfsdaemon.la
+noinst_LTLIBRARIES=libdaemon.la
libraries = \
- libgvfsdaemon.la \
+ libdaemon.la \
$(top_builddir)/common/libgvfscommon.la \
- $(GLIB_LIBS) $(DBUS_LIBS)
+ $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
gvfs_gschemas =
gvfs_gschemas_convert =
@@ -135,7 +133,7 @@
gvfsd-test \
$(NULL)
-libgvfsdaemon_la_SOURCES = \
+libdaemon_la_SOURCES = \
gvfsdaemon.c gvfsdaemon.h \
gvfsbackend.c gvfsbackend.h \
gvfschannel.c gvfschannel.h \
@@ -183,12 +181,6 @@
gvfskeyring.h gvfskeyring.c \
$(NULL)
-libgvfsdaemon_la_LDFLAGS = -avoid-version
-
-libgvfsdaemon_la_LIBADD = \
- $(top_builddir)/common/libgvfscommon.la \
- $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
-
gvfsd_SOURCES = \
mount.c mount.h \
main.c
=== modified file 'debian/changelog'
--- debian/changelog 2012-03-05 01:47:36 +0000
+++ debian/changelog 2012-03-05 13:11:46 +0000
@@ -1,3 +1,10 @@
+gvfs (1.10.0-0ubuntu2+jml2) UNRELEASED; urgency=low
+
+ [James M Leddy ]
+ * Revert 05_shared_libdaemon.patch.
+
+ -- James M. Leddy <james.le...@ubuntu.com> Mon, 05 Mar 2012 08:10:47 -0500
+
gvfs (1.10.0-0ubuntu2+jml1) UNRELEASED; urgency=low
[James M Leddy ]
=== modified file 'debian/control.in'
--- debian/control.in 2012-03-05 01:47:36 +0000
+++ debian/control.in 2012-03-05 13:39:15 +0000
@@ -75,7 +75,8 @@
Package: gvfs
Architecture: any
Section: libs
-Depends: ${shlibs:Depends},
+Depends: libgvfscommon0 (= ${binary:Version}),
+ ${shlibs:Depends},
${misc:Depends},
x11-utils,
Recommends: dbus,
=== modified file 'debian/libgvfscommon-dev.install'
--- debian/libgvfscommon-dev.install 2012-03-05 01:47:36 +0000
+++ debian/libgvfscommon-dev.install 2012-03-05 13:59:50 +0000
@@ -1,2 +1,2 @@
debian/tmp/usr/include/*
-
+debian/tmp/usr/lib/lib*.so
=== modified file 'debian/libgvfscommon0.install'
--- debian/libgvfscommon0.install 2012-03-05 01:47:36 +0000
+++ debian/libgvfscommon0.install 2012-03-05 14:02:15 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/gvfs/lib*.so
+debian/tmp/usr/lib/lib*.so.*
=== removed file 'debian/patches/05_shared_libdaemon.patch'
--- debian/patches/05_shared_libdaemon.patch 2011-07-08 07:05:54 +0000
+++ debian/patches/05_shared_libdaemon.patch 1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-Index: gvfs-1.9.1/daemon/Makefile.am
-===================================================================
---- gvfs-1.9.1.orig/daemon/Makefile.am 2011-06-13 17:31:01.000000000 +0200
-+++ gvfs-1.9.1/daemon/Makefile.am 2011-07-08 07:12:15.498273284 +0200
-@@ -19,12 +19,14 @@
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
- -DG_DISABLE_DEPRECATED
-
--noinst_LTLIBRARIES=libdaemon.la
-+privlibdir = $(libdir)/gvfs
-+
-+privlib_LTLIBRARIES=libgvfsdaemon.la
-
- libraries = \
-- libdaemon.la \
-+ libgvfsdaemon.la \
- $(top_builddir)/common/libgvfscommon.la \
-- $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
-+ $(GLIB_LIBS) $(DBUS_LIBS)
-
- gvfs_gschemas =
- gvfs_gschemas_convert =
-@@ -127,7 +129,7 @@
- gvfsd-test \
- $(NULL)
-
--libdaemon_la_SOURCES = \
-+libgvfsdaemon_la_SOURCES = \
- gvfsdaemon.c gvfsdaemon.h \
- gvfsbackend.c gvfsbackend.h \
- gvfschannel.c gvfschannel.h \
-@@ -175,6 +177,12 @@
- gvfskeyring.h gvfskeyring.c \
- $(NULL)
-
-+libgvfsdaemon_la_LDFLAGS = -avoid-version
-+
-+libgvfsdaemon_la_LIBADD = \
-+ $(top_builddir)/common/libgvfscommon.la \
-+ $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
-+
- gvfsd_SOURCES = \
- mount.c mount.h \
- main.c
-Index: gvfs-1.9.1/common/Makefile.am
-===================================================================
---- gvfs-1.9.1.orig/common/Makefile.am 2011-06-13 17:31:01.000000000 +0200
-+++ gvfs-1.9.1/common/Makefile.am 2011-07-08 07:12:15.498273284 +0200
-@@ -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) \
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-09-19 12:18:02 +0000
+++ debian/patches/series 2012-03-05 13:08:54 +0000
@@ -1,4 +1,3 @@
03_xdg-mount.patch
04_hurd_path_max.patch
-05_shared_libdaemon.patch
06_no_crash_on_unmount.patch
=== modified file 'debian/rules'
--- debian/rules 2011-04-13 17:17:02 +0000
+++ debian/rules 2012-03-05 13:36:27 +0000
@@ -13,6 +13,7 @@
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
DEB_DH_STRIP_ARGS := --dbg-package=gvfs-dbg
+DEB_DH_MAKESHLIBS_ARGS_libgvfscommon0 := -V "libgvfscommon0 (>= 1.1.7)"
DEB_DH_MAKESHLIBS_ARGS_ALL := -Xlib/gio -Xlib/gvfs
DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
