Merge lp:~jm-leddy/ubuntu/oneiric/gvfs/fix-899858 into lp:ubuntu/oneiric/gvfs

[James M. Leddy]

[Mathieu Trudel-Lapierre (cyphermox)]

AFAICS, this looks good. The only thing I noticed wrong was that for an upload for SRU to Oneiric, the changelog entry should target oneiric-proposed, not oneiric-updates. I made the change myself while preparing the merge for an upload.

There was also some confusion with .pc/gvfs/daemon/Makefile.am, which shouldn't have been removed in the branch.

Needless to say, this will require careful testing on oneiric to verify that there are no regressions introduced with that change.

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

So, there was also the version number wrong (ubuntu1.1 is better to use for a SRU than ubuntu2).

[James M. Leddy (jm-leddy)]

Thanks for the information Mathieu. I'll keep that in mind next time.

=== 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 'daemon/Makefile.am'
--- daemon/Makefile.am	2011-09-06 09:24:10 +0000
+++ daemon/Makefile.am	2012-04-17 13:24:19 +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	2011-09-27 07:04:01 +0000
+++ debian/changelog	2012-04-17 13:24:19 +0000
@@ -1,3 +1,13 @@
+gvfs (1.10.0-0ubuntu2) oneiric-updates; urgency=low
+
+  [ Sebastien Bacher ]
+  * 05_shared_lib: don't turn libgvfsdaemon into a static library,
+    gvfs redefine some dbus-glib functions and having a library
+    leads to load the wrong symbols, should fix the obex mount not
+    working, thanks Eric Miao (lp: #899858)
+
+ -- James M Leddy <[e-mail]>  Mon, 16 Apr 2012 17:23:08 -0400
+
 gvfs (1.10.0-0ubuntu1) oneiric; urgency=low
 
   [ Adam Glasgall ]

=== modified file 'debian/gvfs.install'
--- debian/gvfs.install	2011-04-13 17:17:02 +0000
+++ debian/gvfs.install	2012-04-17 13:24:19 +0000
@@ -5,7 +5,6 @@
 debian/tmp/usr/lib/gvfs/gvfsd-localtest
 debian/tmp/usr/lib/gvfs/gvfsd-metadata
 debian/tmp/usr/lib/gvfs/gvfsd-trash
-debian/tmp/usr/lib/gvfs/libgvfsdaemon.so
 debian/tmp/usr/lib/gvfs/libgvfscommon.so
 debian/tmp/usr/share/dbus-1/services/gvfs-daemon.service
 debian/tmp/usr/share/dbus-1/services/gvfs-metadata.service

=== modified 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	2012-04-17 13:24:19 +0000
@@ -1,47 +1,3 @@
-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