--- gvfs-1.4.0.orig/debian/rules +++ gvfs-1.4.0/debian/rules @@ -0,0 +1,15 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +DEB_DH_MAKESHLIBS_ARGS_libgvfscommon0 := -V "libgvfscommon0 (>= 1.1.7)" +DEB_DH_MAKESHLIBS_ARGS_gvfs := --no-act --- gvfs-1.4.0.orig/debian/changelog +++ gvfs-1.4.0/debian/changelog @@ -0,0 +1,733 @@ +gvfs (1.4.0-0ubuntu6) karmic; urgency=low + + * Add 04_dont_automount_internal_partitions.patch: Disable automounting for + internal partitions. This avoids automounting them on the live system. + This does not change behaviour in installed system, since internal + partitions require polkit authorization, and those do not get automounted. + (LP: #451613) + + -- Martin Pitt Mon, 19 Oct 2009 13:54:30 +0200 + +gvfs (1.4.0-0ubuntu5) karmic; urgency=low + + * debian/patches/03_http_input_query_info.patch: + - Support querying information from HTTP input streams, Required for + Rhythmbox podcast bug (LP: #437454) + + -- Robert Ancell Thu, 15 Oct 2009 13:42:25 +1100 + +gvfs (1.4.0-0ubuntu4) karmic; urgency=low + + * Add 02_music-player-mimetype.patch: Add media player content type if we + have a multimedia-player icon. This is a kludge until + https://bugs.freedesktop.org/show_bug.cgi?id=24500 gets discussed/solved + properly. (LP: #440290) + + -- Martin Pitt Wed, 14 Oct 2009 11:57:35 +0200 + +gvfs (1.4.0-0ubuntu3) karmic; urgency=low + + * Add 01_mtp_content_types.patch: Set correct MIME type for MTP music + players. (LP: #444083) + + -- Martin Pitt Mon, 12 Oct 2009 16:41:54 +0200 + +gvfs (1.4.0-0ubuntu2) karmic; urgency=low + + * Add 00git-separate-eject-detach.patch: Some systems use internal USB + devices. Automatically detaching such drives when calling + gdu_drive_eject() (triggered by e.g. the eject button in the Nautilus + sidebar) as we do right now leads to loss of the drive until reboot (since + the device is internal). The only viable option right now is to separate + "Safely Remove Drive" and "Eject". + If we gain infrastructure to let us know with 100% accuracy that a + given receptacle is external we can go back to the previous behavior. + (LP: #404185) + + -- Martin Pitt Fri, 09 Oct 2009 08:35:05 +0200 + +gvfs (1.4.0-0ubuntu1) karmic; urgency=low + + * New upstream version + + -- Sebastien Bacher Mon, 21 Sep 2009 16:59:55 +0200 + +gvfs (1.3.6-0ubuntu1) karmic; urgency=low + + * New upstream version: + - Translation updates + - ftp: robustness fixes + - gdu: Avoid unnecessary authentication dialogs + * debian/patches/00git-noninteractive-mounting-at-startup.patch: + - the change is in the new version + + -- Sebastien Bacher Mon, 07 Sep 2009 12:50:58 +0200 + +gvfs (1.3.5-0ubuntu2) karmic; urgency=low + + * Add 00git-noninteractive-mounting-at-startup.patch: Do not attempt to + mount drives at startup which need authentication. (LP: #396448) + * debian/control: Bump libgdu-dev requirement for above patch. + + -- Martin Pitt Mon, 31 Aug 2009 19:14:04 +0200 + +gvfs (1.3.5-0ubuntu1) karmic; urgency=low + + * New upstream version: + - Properly translate gvfs-* programs + - Implement support for g_cancellable_release_fd + - sftp: Handle existing file on mkdir + - smb: Better performance when reading files + - ftp: Fix memory leaks + - Make dav mounts work be accessible with fuse (#590730,#590862) + - metadata: Fix memory leaks in daemon + - metadata: Fix rare write error on journal wrapover + - gphoto: Handle removal of camera with multiple storage heads + - hal: Fix crash for volumes with no HAL UDI + * Drop 03-don-t-build-hal-monitor-when-building-gdu-monitor.patch: It's not + really necessary and causes us having to autoreconf. (It's sent to + upstream). + * Drop 01_maintainer_mode.patch, we don't have patches touching Makefile.am + etc. any more. + * Drop 90_relibtoolize.patch. \o/ + * debian/control: Bump libglib2.0-dev build dependency (depends on new + symbol in 2.21.5). + + -- Martin Pitt Tue, 25 Aug 2009 22:19:56 +0200 + +gvfs (1.3.4-0ubuntu1) karmic; urgency=low + + * New upstream version: + - ftp: Make large FTP transfers work + - gphoto: use udev instead of hal + - Fix build on FreeBSD + - Bugs fixed: 588187, 589915, 573994, 590793, 576229, 589434 + (lp: #403223, #404490, #291259, #364084, #395216) + * debian/patches/02-port-gphoto2-backend-and-monitor-to-gudev.patch: + - the change is in the new version + * debian/patches/90_relibtoolize.patch: + - new version update + + -- Sebastien Bacher Mon, 10 Aug 2009 22:24:25 +0200 + +gvfs (1.3.3-0ubuntu1) karmic; urgency=low + + * New upstream release: + - Some bug fixes. + - Lots of translation updates. + * Drop 04-metadata-init-dbus.patch, applied upstream. + * debian/rules: Switch back to quilt. + + -- Martin Pitt Mon, 03 Aug 2009 08:34:15 +0100 + +gvfs (1.3.2-0ubuntu4) karmic; urgency=low + + * 04-metadata-init-dbus.patch: Fix stupid typo. + + -- Martin Pitt Mon, 20 Jul 2009 15:25:23 +0200 + +gvfs (1.3.2-0ubuntu3) karmic; urgency=low + + * debian/gvfs.install: Install gvfs-metadata. + * Add 04-metadata-init-dbus.patch: Fix crash of gvfsd-metadata, caused by + uninitialized D-BUS error. (LP: #401367) + + -- Martin Pitt Mon, 20 Jul 2009 15:17:50 +0200 + +gvfs (1.3.2-0ubuntu2) karmic; urgency=low + + * 02-port-gphoto2-backend-and-monitor-to-gudev.patch: Don't use + g_udev_device_get_property_as_int(), since it interprets a number like + "018" (as DEVNUM might look like) as octal number. Use atoi() to force + decimal. This fixes the correct detection of USB bus and device number, + and thus restores proper names and automatic unmounting. (LP: #399320) + + -- Martin Pitt Thu, 16 Jul 2009 18:40:06 +0200 + +gvfs (1.3.2-0ubuntu1) karmic; urgency=low + + [ Robert Ancell ] + * New upstream release: (LP: #399142) + - metadata-store: initial implementation + - gvfs-ls: add a -n option to gvfs-ls for nofollow-symlinks + - gvfsd-computer: better handling of PC floppy drives + - ftp: EPTR support + - cdda: Support gudev (and prefer it instead of hal) + - Add support user interaction when unmounting mounts (gdu, gphoto2) + - Add support starting/stopping drives (gdu monitor) + - Fix 'make distcheck' + - Bugs fixed: 582175, 516704, 586280, 585853, 582772, 585591, 587484 + * debian/patches/02-cdda-backend-support-and-prefer-gudev.patch: + * debian/patches/05-conditionalize-hal-support-in-obexftp-backend.patch: + * debian/patches/90_git_change_fix_computer_crash.patch: + - Applied upstream + * debian/patches/01_maintainer_mode.patch + * debian/patches/90_relibtoolize.patch + - Refreshed + + [ Martin Pitt ] + * Replace gphoto monitor/backend hal→gudev ports with newest patch proposed + upstream. + * Add 03-don-t-build-hal-monitor-when-building-gdu-monitor.patch: Don't + build hal monitor when building gdu monitor. Patch proposed upstream in + bz#586410, and avoids build-conflicting to libhal-dev for reproducible + results. + * 90_relibtoolize.patch: Refresh. + + -- Robert Ancell Tue, 14 Jul 2009 11:49:21 +0200 + +gvfs (1.3.1-0ubuntu3) karmic; urgency=low + + The "bye-bye, hal!" release. + + [ Sebastien Bacher ] + * debian/watch: define version watch + + [ Martin Pitt ] + * debian/control.in: Add libgudev-1.0-dev build dependency, drop libhal-dev + build dependency. + * debian/control.in: Drop hal recommends. + * Add 02-cdda-backend-support-and-prefer-gudev.patch: Port cdda backend from + hal to gudev. + * Add 03-port-gphoto2-backend-to-gudev.patch: Port gphoto2 backend from hal + to gudev. + * Add 04-port-gphoto2-monitor-to-gudev.patch: Port gphoto volume monitor + from hal to gudev. + * Add 05-conditionalize-hal-support-in-obexftp-backend.patch: Only build + against and query hal in the obexftp backend if hal is available. It + currently only checks for devices with the "obex" capability, but this is + neither supported in bluez/hal nor necessary for connecting to a bluetooth + device through bluez-gnome & friends. (See fd.o #586411 for details) + * Refresh 90_relibtoolize.patch to pick up changes from above patches. + * debian/gvfs.install: Drop hal volume monitor. + + -- Martin Pitt Fri, 03 Jul 2009 10:55:27 +0200 + +gvfs (1.3.1-0ubuntu2) karmic; urgency=low + + * debian/patches/90_git_change_fix_computer_crash.patch: + - git change to fix the gvfsd-computer crashing when devices have no names + (lp: #387036) + * debian/control.in: + - gvfs depends on policykit-1-gnome which is required for mounting now + + -- Sebastien Bacher Mon, 29 Jun 2009 14:38:51 +0200 + +gvfs (1.3.1-0ubuntu1) karmic; urgency=low + + * New upstream version: + - Add Gnome Disk utility based volume monitor + - Emit pre-unmount signal on GMounts + - Use new race-free cancellation connect APIs + - fix crash with newer glib + - avoid sending progress info if not needed + - ftp: Convert to use gio network APIs + - ftp: Restructure code significantly + - ftp: Fix logging in to a FTP server only works for the 2nd attempt + - ftp: Handle files > 4 gig + - gphoto: Fix support for Canon EOS 5D + - sftp: Pick up SSH_AUTH_SOCK from gnome-keyring + - sftp: Don't trust remote permissions for uids other than user + - cdda: verify filenames before using + - gvfs-copy: Show speed when copying + * debian/control.in: + - updated gdu and glib requirement + * debian/patches/90_relibtoolize.patch: + - new version update + + -- Sebastien Bacher Mon, 15 Jun 2009 11:50:47 +0200 + +gvfs (1.3git20090512-0ubuntu2) karmic; urgency=low + + * debian/control.in: + - depends on devicekit-disks + - lists vcs information + - use replaces for the gdu backend binary change + * debian/gvfs.install, debian/gvfs-backends.install: + - install the gdu backend in the gvfs binary + + -- Sebastien Bacher Fri, 05 Jun 2009 11:21:20 +0200 + +gvfs (1.3git20090512-0ubuntu1) karmic; urgency=low + + * New git version with gnome-disk-utility backend, this one is used when + gnome-disk-utility is installed, don't recommends this one for now though + to not disrupt the current cds builds + * debian/control.in: + - build-depends on libgdu-dev to get the new backend built + * debian/gvfs-backends.install: + - list the new monitor files to install + * debian/patches/01_maintainer_mode.patch: + - enable this change + * debian/patches/90_relibtoolize.patch: + - new version update + * debian/patches/91_svn_change_ssh_use_gnome_keyring.patch: + - the change is in the new version + + -- Sebastien Bacher Tue, 12 May 2009 14:15:23 +0200 + +gvfs (1.2.2-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - ftp: Fix error handling in some cases + - proxy monitor: Fix warning spew + * debian/patches/91_svn_change_ssh_use_gnome_keyring.patch: + - svn change to get the ssh backend to use gnome-keyring (lp: #345496) + + -- Sebastien Bacher Mon, 13 Apr 2009 21:04:33 +0200 + +gvfs (1.2.1-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - Fix duplicate CD audio icons after remount + - Fix problems mounting encrypted volumes + - Handle usernames with @ in them better in uris + - trash: handle weird filenames correctly + - sftp: Fix various error conditions + - volume monitors: emit pre-unmount signals + - smb: Fix various error conditions + - fuse: Make sure closing a file flushed the file on the backend + * debian/patches/90_svn_update.patch: + - the change is the new version + + -- Sebastien Bacher Fri, 03 Apr 2009 16:51:09 +0200 + +gvfs (1.2.0-0ubuntu2) jaunty; urgency=low + + * debian/patches/90_svn_update.patch: + - update to current svn to give it some testing and make the 2.26.1 update + easier to review + * debian/patches/90_relibtoolize.patch: + - reactivated and updated + + -- Sebastien Bacher Thu, 02 Apr 2009 00:41:20 +0200 + +gvfs (1.2.0-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - sftp: Don't hang if ssh no authentication method availible + - Don't leak file monitors + - computer: don't show shadowed mounts + + -- Sebastien Bacher Mon, 16 Mar 2009 13:19:50 +0100 + +gvfs (1.1.8-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - Fix crashers and leaks (lp: #201519) + - Handle file:// uris with anchors in gvfs-open + - fuse: Support ftruncate to the current file size (lp: #234532) + - escape/unescape hostname part in uris, allowing spaces in e.g. smb domains + - hal: Fix "No mount object" error on mount + - Change details of the new .xdg-volume-info file format + - Fix races in cancellation of gvfs streams + - Remove debug spew from backends + - ftp: Fix anonymous login (lp: #334540) + - gphoto2: Ignore broken storages with no capacity (lp: #326029) + - Don't globally modify COMP_WORDBREAKS in bash completion script + (lp: #290784) + - Don't ask for username when getting ssh key passphrase + * debian/patches/91_upstream_change_fix_trash_crasher.patch: + - the change is in the new version + + -- Sebastien Bacher Tue, 10 Mar 2009 13:02:47 +0100 + +gvfs (1.1.7-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - Fix build on some platforms + - ftp: Fix short read errors (lp: #208750) + - gphoto2: Make it work on iphone + - sftp: Fix symlink creation + - fuse: Better support of truncation, fixing OOo save (lp: #317587) + - proxy monitors: Support mount operations, etc + - gvfs-mount: add --device commandline support + - sftp: Fix protocol bug that made some servers not work (lp: #286053) + - general support for query_info over streams, implemented for smb, sftp + - Initial support for .xdg-volume-info reading (lp: #269159) + - fix trash crasher (lp: #332554) + - use ssh config (lp: #264803) + * debian/patches/02_support_xdg_volume_info.patch: + - the new version fixes this issue + * debian/patches/91_upstream_change_fix_trash_crasher.patch: + - upstream change to fix a trash crasher (lp: #333791) + * debian/rules: + - shlibs version update + + -- Sebastien Bacher Mon, 02 Mar 2009 18:10:40 +0100 + +gvfs (1.1.6-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - Fix crashes + - trash: Better messages + - Clean up glib and gtk includes + - archive: Build with later versions of libarchive + - dav: Fix folder creation + - dav: Fix redirection when user is specified in url + - http: fix error propagation + - sftp: Try to preserve ownership when replacing a file + * debian/control.in: + - gvfs-fuse depends on fuse-utils to work (lp: #327858) + * debian/patches/90_upstream_change_fix_rhythmbox_crasher.patch: + - the change is in the new version + + -- Sebastien Bacher Mon, 16 Feb 2009 14:57:52 +0100 + +gvfs (1.1.5-0ubuntu2) jaunty; urgency=low + + * Add 02_support_xdg_volume_info.patch: Support reading a + .volume-info file on mounts. This allows non-hal mounts (such as + FUSE) to have custom icons and names. Patch by Rodney Dawes. + + -- Martin Pitt Thu, 12 Feb 2009 19:37:49 +0100 + +gvfs (1.1.5-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - network: Pick up SMB shares from zeroconf + - obexftp: Write support for + - obexftp: Support obexftp over usb + - trash: Don't follow symlinks on delete + - fix crashes (lp: #320386) + * debian/patches/91_dnssd_use_libglib.patch, + debian/patches/92_svn_change_fix_incorrect_trash_write.patch, + debian/patches/93_svn_change_fix_trash_enumerate_issue.patch: + - the change is in the new version + * debian/rules: + - updated shlibs version (lp: #322763) + + -- Sebastien Bacher Mon, 02 Feb 2009 14:38:23 +0100 + +gvfs (1.1.4-0ubuntu3) jaunty; urgency=low + + * debian/patches/93_svn_change_fix_trash_enumerate_issue.patch: + - svn change to fix trashing issue (lp: #323321) + + -- Sebastien Bacher Fri, 30 Jan 2009 22:47:26 +0100 + +gvfs (1.1.4-0ubuntu2) jaunty; urgency=low + + * debian/patches/92_svn_change_fix_incorrect_trash_write.patch: + - svn change to fix an incorrect write issue + + -- Sebastien Bacher Wed, 28 Jan 2009 18:03:22 +0100 + +gvfs (1.1.4-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - Trash performance fixes + - Fuse performance fixes + * debian/patches/91_dnssd_use_libglib.patch: + - new patch to fix a build issue + + -- Sebastien Bacher Mon, 19 Jan 2009 22:44:40 +0100 + +gvfs (1.1.3-0ubuntu2) jaunty; urgency=low + + * debian/control.in: + - use the new libsoup-gnome variant + + -- Sebastien Bacher Thu, 08 Jan 2009 16:39:07 +0100 + +gvfs (1.1.3-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - ftp: fix limited number of connections causes commands to fail + - trash: fix parallel build doesn't work + - trash: add trash::orig-path and trash::deletion-date info + - trash: set files to mode 700 before deleting to deal with users trashing + read-only directories + - smb-browse: browsing authentication support (lp: #193232, #207072) + - smb-browse: make backend not automounted anymore + - New trash backend (lp: #7560, #187565, #201393, #206747, #207835, #216739) + - Use the new shadow mount facility in gio + - gphoto2: Use shadow mounts + - obex: Fix icon for root directory + - http: Fix major memory leak (lp: #225615) + - http: Support proxies + * debian/patches/01_maintainer_mode.patch, + debian/patches/90_relibtoolize.patch: + - commented debian change for now since it's not really required and create + build issue using the jaunty libtool version + * debian/patches/90_correct_glib_use.patch: + - the issue is fixed in the new version + + -- Sebastien Bacher Wed, 07 Jan 2009 22:52:11 +0100 + +gvfs (1.1.1-0ubuntu2) jaunty; urgency=low + + * debian/control.in: + - updated glib requirement + + -- Sebastien Bacher Tue, 02 Dec 2008 18:39:10 +0100 + +gvfs (1.1.1-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - Reverse map FUSE pathnames to gvfs locations + - Fix crashes + - Show better icon info in gvfs-info + - Support custom icons for gvfs backends + - dav: support uris (dav+sd://) which specify dns-sd services instead of resolved ip+port + - ftp: Fix time parsing + - ftp: Show username in auth dialog if specified in uri + - ftp: Support UTF8 server feature + - ftp: Use LIST -a instead of LIST on unix servers + - fuse: Fix major race in that caused crashes + - fuse: Set st_blocks so that e.g. the "du" command works + - gphoto: use custom icons for faster thumbnails + - obexftp: Port to bluez 4 API + - sftp: If name specified in mount, use in name too so that fuse paths are unique + - sftp: Support /etc/favicon.png + - smb: Don't ask for password twice if cancelled + - smb: support setting timestamp + * debian/gvfs-backends.install: + - new version update + * debian/patches/updated_obex_apis.patch: + - the changes are in the new version + * debian/patches/90_correct_glib_use.patch: + - correctly use glib to fix a build issue + + -- Sebastien Bacher Tue, 02 Dec 2008 17:26:35 +0100 + +gvfs (1.0.3-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - Fixed custom mimetype icon won't display problem + - Fixed a memory leak + - Fixed paste into menu item blinking in nautilus + + -- Sebastien Bacher Tue, 25 Nov 2008 10:53:34 +0100 + +gvfs (1.0.2-1ubuntu1) jaunty; urgency=low + + * Sync on Debian + * debian/patches/updated_obex_apis.patch: + - update the obex api to the current version + * debian/patches/90_upstream_change_fix_rhythmbox_crasher.patch: + - change to fix incorrectly url parsing leading to a rhythmbox crasher + + -- Sebastien Bacher Mon, 17 Nov 2008 10:37:16 +0100 + +gvfs (1.0.2-1) experimental; urgency=low + + [ Andreas Henriksson ] + * New upstream release. + - disable all patches (from upstream). + - bump build-dependency on libglib2.0-dev to >= 2.17.6. + - add build-dependency on intltool. + - add version >= 2.23.91 to libsoup2.4-dev build-dependency. + + [ Josselin Mouette ] + * Build-depend on openssh-client. + * Bump requirement on libgphoto2. + * Bump shlibs version to 0.99.6. + * Fix D-Bus spelling error in descriptions. Make them a bit more + complete. + * Include clean-la.mk; require gnome-pkg-tools 0.7. + * Include the volume monitors. + * Move the computer, localtest and trash backends to gvfs. + * Add the corresponding conflict. + * Do not run dh_makeshlibs on gvfs. + * 01_maintainer_mode.patch: enable AM_MAINTAINER_MODE. + * 90_relibtoolize.patch: relibtoolize to avoid the amd64 rpath issue. + * 99_ltmain_as-needed.patch: the best friend of --as-needed. + * Pass -z defs --as-needed -O1 to the linker. + * gvfs-fuse and gvfs-bin depend on gvfs (= ${binary:Version}). + + -- Josselin Mouette Sun, 16 Nov 2008 19:51:57 +0100 + +gvfs (0.2.5-1.1) unstable; urgency=high + + * NMU + * Apply upstream SVN r1819 - "(reindex_file_handle_for_path): Steal the old + file handle record from the global hash table before replacing its path, + not after." + * Apply upstream SVN r1822: "(vfs_create): Hold the file handle lock while + opening the stream." + * Apply upstream SVN r1844: "Don't call statvfs on /." + * Apply upstream SVN r1854: "Avoid a race between the subthread and the + main thread in the case of dbus going bye-bye." + * Apply part of r2052: "Set st_blocks & co so that du works." + * Apply upstream SVN r2056: "Attempt to prevent potential race conditions in + the FUSE backend when file handles get closed while still in use in + another thread, if that ever happens." closes: #496269. + + -- Clint Adams Sat, 25 Oct 2008 09:29:53 -0400 + +gvfs (0.2.5-1) unstable; urgency=low + + * New upstream bugfix release: + + Fixes trash problems with files beginning with an _ (Closes: #474616). + * debian/control.in: + + Update Standards-Version to 3.8.0, no additional changes needed. + + -- Sebastian Dröge Mon, 30 Jun 2008 12:07:05 +0200 + +gvfs (0.2.4-1) unstable; urgency=low + + * New upstream bugfix release: + + Fixes a few FUSE issues (Closes: #476280). + * debian/control.in: + + Recommend obex-data-server to make ObexFTP work out of the + box (Closes: #480005). + + -- Sebastian Dröge Thu, 29 May 2008 09:21:32 +0200 + +gvfs (0.2.3-1) unstable; urgency=low + + * debian/gvfs-backends.postinst: + + Use killall -q to not complain if there are no gvfsd processes. Thanks + to Daniel Hahler (Closes: #473172). + * New upstream release. + + -- Sebastian Dröge Tue, 08 Apr 2008 13:24:00 +0200 + +gvfs (0.2.2-1) unstable; urgency=low + + * debian/gvfs-backends.postinst: + + Send SIGHUP to all gvfsd processes to let them reload their + backends list. + * debian/control.in: + + Let gvfs recommend gvfs-backends. + * New upstream release: + + debian/patches/01_sftp_krb5.patch: + - Dropped, merged upstream. + + -- Sebastian Dröge Fri, 28 Mar 2008 18:04:37 +0100 + +gvfs (0.2.1-1) unstable; urgency=low + + * New upstream release: + + debian/patches/90_from_svn_fix_async_cancellation.patch: + - Dropped, merged upstream. + + debian/control.in, + debian/gvfs-backends.install: + - Add archive backend, allows reading many different archive types, + for example tar and zip. + + -- Sebastian Dröge Mon, 17 Mar 2008 19:36:11 +0100 + +gvfs (0.2.0.1-2) unstable; urgency=low + + [ Josselin Mouette ] + * Use quilt for patch handling. + * 01_sftp_krb5.patch: ported from GnomeVFS. Make the sftp backend work + when pam_krb5 is used on the server side. + + [ Sebastian Dröge ] + * debian/patches/90_from_svn_fix_async_cancellation.patch: + + Patch from upstream SVN (and Ubuntu) to fix async cancellation. + + -- Sebastian Dröge Mon, 17 Mar 2008 00:56:13 +0100 + +gvfs (0.2.0.1-1) unstable; urgency=low + + * New upstream stable release. + * debian/control.in: + + Build depend on libltdl3-dev again to make libtool happy. + + -- Sebastian Dröge Mon, 10 Mar 2008 21:29:54 +0100 + +gvfs (0.1.11-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + + Remove libltdl3-dev from Build-Depends, workaround is not needed anymore + for some reason. + + -- Sebastian Dröge Wed, 05 Mar 2008 05:28:14 +0100 + +gvfs (0.1.10-1) experimental; urgency=low + + * New upstream release: + + debian/control, + debian/gvfs-backends.install: + - Update build dependencies. + - Add obexftp to the backends. + + -- Sebastian Dröge Tue, 04 Mar 2008 16:13:56 +0100 + +gvfs (0.1.8-1) experimental; urgency=low + + * New upstream release: + + debian/control.in: + - Update libglib2.0-dev build dependency to >= 2.15.6. + - Build depend on libavahi-client-dev and libavahi-glib-dev. + - Update libhal-dev build dependency to >= 0.5.10. + - Build depend on libgphoto2-2-dev. + - Build depend on libgnome-keyring-dev. + - Add new backends to the gvfs-backends description. + - Build depend on libltdl3-dev. + + debian/gvfs-backends.install: + - Add new backends. + + debian/gvfs-bin.install: + - Add new /etc/profile.d directory. + * debian/control.in: + + Add libglib2.0-dev to the dependencies of the -dev package. + + Let gvfs Recommend hal and dbus as they're required for it to work. + + -- Sebastian Dröge Tue, 26 Feb 2008 07:19:53 +0100 + +gvfs (0.1.7-1) experimental; urgency=low + + * New upstream release: + + debian/control.in: + - Update glib build dependency. + - Build depend on libgconf2-dev. + * debian/control.in: + + Let gvfs-backends depend on gvfs. The backends are useless without it. + + -- Sebastian Dröge Tue, 12 Feb 2008 06:55:57 +0100 + +gvfs (0.1.6-1) experimental; urgency=low + + [ Loic Minier ] + * Add ${shlibs:Depends} and ${misc:Depends} to libgvfscommon-dev. + * Wrap deps and remove trailing whitespace in control :-P + + [ Sebastian Dröge ] + * New upstream release: + + debian/control.in: + - Build depend on libglib2.0-dev (>= 2.15.4). + * debian/control.in: + + Let gvfs-backends depend on gvfs. Taken from the Ubuntu package. + + -- Sebastian Dröge Tue, 29 Jan 2008 12:37:10 +0100 + +gvfs (0.1.4-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + + Update descriptions. + + Update build dependencies. + * debian/gvfs-backends.install: + + Add burn:// backend. + + -- Sebastian Dröge Tue, 22 Jan 2008 12:56:52 +0100 + +gvfs (0.1.2-1) experimental; urgency=low + + [ Sebastien Bacher ] + * Initial packaging. + + [ Sebastian Dröge ] + * Synced package from Ubuntu and uploaded to experimental (Closes: #444299). + * debian/control.in: + + Build depend on libsoup2.2-dev. + + Update minimal versions of build dependencies. + + Build depend on libxml-parser-perl. + * debian/copyright: + + Add another copyright holder. + + -- Sebastian Dröge Thu, 17 Jan 2008 12:32:52 +0100 + +gvfs (0.2.2-2.1) unstable; urgency=low + + * debian/gvfs-backends.postinst: + + Use killall -q to not complain if there are no gvfsd processes. Thanks + to Daniel Hahler (Closes: #473172). + * + + -- Sebastian Dröge Tue, 08 Apr 2008 13:24:00 +0200 --- gvfs-1.4.0.orig/debian/libgvfscommon-dev.install +++ gvfs-1.4.0/debian/libgvfscommon-dev.install @@ -0,0 +1,2 @@ +debian/tmp/usr/include/* +debian/tmp/usr/lib/lib*.so --- gvfs-1.4.0.orig/debian/watch +++ gvfs-1.4.0/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://ftp.gnome.org/pub/gnome/sources/gvfs/([\d\.]+)[0-9]/gvfs-([\d\.]+)\.tar\.gz + --- gvfs-1.4.0.orig/debian/gvfs-bin.install +++ gvfs-1.4.0/debian/gvfs-bin.install @@ -0,0 +1,2 @@ +debian/tmp/usr/bin/gvfs-* +debian/tmp/etc/profile.d --- gvfs-1.4.0.orig/debian/gvfs-fuse.install +++ gvfs-1.4.0/debian/gvfs-fuse.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/gvfs/gvfs-fuse-daemon --- gvfs-1.4.0.orig/debian/copyright +++ gvfs-1.4.0/debian/copyright @@ -0,0 +1,36 @@ +This package was debianized by Sebastien Bacher on +Mon, 19 Nov 2007 15:39:01 +0100. + +It was downloaded from http://download.gnome.org/sources/gvfs + +Upstream Author: Alexander Larsson + +Copyright: + + Copyright (C) 2002, 2003 CodeFactory AB + Copyright (C) 2001,2002,2004 Red Hat, Inc. + Copyright (C) 2003, 2004 Red Hat, Inc. + Copyright (C) 2006-2007 Red Hat, Inc. + Copyright (C) 2007 David Zeuthen + +License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + +The Debian packaging is (C) 2007, Sebastien Bacher and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- gvfs-1.4.0.orig/debian/libgvfscommon0.install +++ gvfs-1.4.0/debian/libgvfscommon0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/lib*.so.* --- gvfs-1.4.0.orig/debian/gvfs.install +++ gvfs-1.4.0/debian/gvfs.install @@ -0,0 +1,14 @@ +debian/tmp/usr/lib/gio/modules/*.so +debian/tmp/usr/lib/gvfs/gvfsd +debian/tmp/usr/lib/gvfs/gvfsd-computer +debian/tmp/usr/lib/gvfs/gvfsd-localtest +debian/tmp/usr/lib/gvfs/gvfsd-trash +debian/tmp/usr/lib/gvfs/gvfsd-metadata +debian/tmp/usr/lib/gvfs/gvfs-gdu-volume-monitor +debian/tmp/usr/share/dbus-1/services/gvfs-daemon.service +debian/tmp/usr/share/dbus-1/services/gvfs-metadata.service +debian/tmp/usr/share/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service +debian/tmp/usr/share/locale +debian/tmp/usr/share/gvfs/mounts/computer.mount +debian/tmp/usr/share/gvfs/mounts/localtest.mount +debian/tmp/usr/share/gvfs/mounts/trash.mount --- gvfs-1.4.0.orig/debian/compat +++ gvfs-1.4.0/debian/compat @@ -0,0 +1 @@ +5 --- gvfs-1.4.0.orig/debian/control.in +++ gvfs-1.4.0/debian/control.in @@ -0,0 +1,131 @@ +Source: gvfs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + autotools-dev, + cdbs, + quilt, + gnome-pkg-tools (>= 0.7), + intltool (>= 0.35.0), + libglib2.0-dev (>= 2.21.5), + libdbus-1-dev, + libdbus-glib-1-dev, + libfuse-dev, + libexpat1-dev, + libsmbclient-dev (>= 3.0), + libcdio-paranoia-dev (>= 0.78.2), + libgudev-1.0-dev, + libsoup-gnome2.4-dev (>= 2.23.91), + libgconf2-dev, + libavahi-client-dev (>= 0.6), + libavahi-glib-dev (>= 0.6), + libgphoto2-2-dev (>= 2.4.0), + libgnome-keyring-dev, + libgdu-dev (>= 0.4), + libxml2-dev, + libbluetooth-dev (>= 3.12), + libltdl3-dev, + libarchive-dev, + openssh-client +Standards-Version: 3.8.1 +Section: libs +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gvfs/ubuntu + +Package: libgvfscommon0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: userspace virtual filesystem - library + gvfs is a userspace virtual filesystem where mount runs as a separate + processes which you talk to via D-Bus. It also contains a gio module + that seamlessly adds gvfs support to all applications using the gio + API. It also supports exposing the gvfs mounts to non-gio applications + using fuse. + . + This package contains the libgvfscommon library that is used by the + backends. + +Package: libgvfscommon-dev +Section: libdevel +Architecture: any +Depends: libgvfscommon0 (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends}, + libglib2.0-dev (>= 2.19) +Description: userspace virtual filesystem - development files + gvfs is a userspace virtual filesystem where mount runs as a separate + processes which you talk to via D-Bus. It also contains a gio module + that seamlessly adds gvfs support to all applications using the gio + API. It also supports exposing the gvfs mounts to non-gio applications + using fuse. + . + This package contains the libgvfscommon development files, needed to + build new backends that make use of the same functions. + +Package: gvfs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + devicekit-disks, + policykit-1-gnome +Recommends: dbus, gvfs-backends +Conflicts: gvfs-backends (<< 1.0.2-1) +Replaces: gvfs-backends (<< 1.3git20090512-0ubuntu2) +Description: userspace virtual filesystem - server + gvfs is a userspace virtual filesystem where mount runs as a separate + processes which you talk to via D-Bus. It also contains a gio module + that seamlessly adds gvfs support to all applications using the gio + API. It also supports exposing the gvfs mounts to non-gio applications + using fuse. + . + This package contains the gvfs server that provides gvfs mounts to all + gio applications, and the minimal set of backends. + +Package: gvfs-fuse +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gvfs (= ${binary:Version}), + fuse-utils +Description: userspace virtual filesystem - fuse server + gvfs is a userspace virtual filesystem where mount runs as a separate + processes which you talk to via D-Bus. It also contains a gio module + that seamlessly adds gvfs support to all applications using the gio + API. It also supports exposing the gvfs mounts to non-gio applications + using fuse. + . + This package contains the gvfs-fuse server that exports gvfs mounts to + all applications using FUSE. + +Package: gvfs-backends +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gvfs (= ${binary:Version}) +Recommends: obex-data-server +Description: userspace virtual filesystem - backends + gvfs is a userspace virtual filesystem where mount runs as a separate + processes which you talk to via D-Bus. It also contains a gio module + that seamlessly adds gvfs support to all applications using the gio + API. It also supports exposing the gvfs mounts to non-gio applications + using fuse. + . + This package contains the archive, burn, cdda, dav, dnssd, ftp, + gphoto2, http, network, obexftp, sftp, smb and smb-browse backends. + +Package: gvfs-bin +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gvfs (= ${binary:Version}) +Description: userspace virtual filesystem - binaries + gvfs is a userspace virtual filesystem where mount runs as a separate + processes which you talk to via D-Bus. It also contains a gio module + that seamlessly adds gvfs support to all applications using the gio + API. It also supports exposing the gvfs mounts to non-gio applications + using fuse. + . + This package contains the support binaries. --- gvfs-1.4.0.orig/debian/gvfs-backends.install +++ gvfs-1.4.0/debian/gvfs-backends.install @@ -0,0 +1,31 @@ +debian/tmp/usr/lib/gvfs/gvfsd-archive +debian/tmp/usr/lib/gvfs/gvfsd-burn +debian/tmp/usr/lib/gvfs/gvfsd-cdda +debian/tmp/usr/lib/gvfs/gvfsd-dav +debian/tmp/usr/lib/gvfs/gvfsd-dnssd +debian/tmp/usr/lib/gvfs/gvfsd-ftp +debian/tmp/usr/lib/gvfs/gvfsd-gphoto2 +debian/tmp/usr/lib/gvfs/gvfsd-http +debian/tmp/usr/lib/gvfs/gvfsd-network +debian/tmp/usr/lib/gvfs/gvfsd-obexftp +debian/tmp/usr/lib/gvfs/gvfsd-sftp +debian/tmp/usr/lib/gvfs/gvfsd-smb +debian/tmp/usr/lib/gvfs/gvfsd-smb-browse +debian/tmp/usr/lib/gvfs/gvfs-gphoto2-volume-monitor +debian/tmp/usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service +debian/tmp/usr/share/gvfs/mounts/archive.mount +debian/tmp/usr/share/gvfs/mounts/burn.mount +debian/tmp/usr/share/gvfs/mounts/cdda.mount +debian/tmp/usr/share/gvfs/mounts/dav.mount +debian/tmp/usr/share/gvfs/mounts/dav+sd.mount +debian/tmp/usr/share/gvfs/mounts/dns-sd.mount +debian/tmp/usr/share/gvfs/mounts/ftp.mount +debian/tmp/usr/share/gvfs/mounts/gphoto2.mount +debian/tmp/usr/share/gvfs/mounts/http.mount +debian/tmp/usr/share/gvfs/mounts/network.mount +debian/tmp/usr/share/gvfs/mounts/obexftp.mount +debian/tmp/usr/share/gvfs/mounts/sftp.mount +debian/tmp/usr/share/gvfs/mounts/smb-browse.mount +debian/tmp/usr/share/gvfs/mounts/smb.mount +debian/tmp/usr/share/gvfs/remote-volume-monitors/gdu.monitor +debian/tmp/usr/share/gvfs/remote-volume-monitors/gphoto2.monitor --- gvfs-1.4.0.orig/debian/control +++ gvfs-1.4.0/debian/control @@ -0,0 +1,131 @@ +Source: gvfs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: Debian GNOME Maintainers +Build-Depends: debhelper (>= 5), + autotools-dev, + cdbs, + quilt, + gnome-pkg-tools (>= 0.7), + intltool (>= 0.35.0), + libglib2.0-dev (>= 2.21.5), + libdbus-1-dev, + libdbus-glib-1-dev, + libfuse-dev, + libexpat1-dev, + libsmbclient-dev (>= 3.0), + libcdio-paranoia-dev (>= 0.78.2), + libgudev-1.0-dev, + libsoup-gnome2.4-dev (>= 2.23.91), + libgconf2-dev, + libavahi-client-dev (>= 0.6), + libavahi-glib-dev (>= 0.6), + libgphoto2-2-dev (>= 2.4.0), + libgnome-keyring-dev, + libgdu-dev (>= 0.4), + libxml2-dev, + libbluetooth-dev (>= 3.12), + libltdl3-dev, + libarchive-dev, + openssh-client +Standards-Version: 3.8.1 +Section: libs +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gvfs/ubuntu + +Package: libgvfscommon0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: userspace virtual filesystem - library + gvfs is a userspace virtual filesystem where mount runs as a separate + processes which you talk to via D-Bus. It also contains a gio module + that seamlessly adds gvfs support to all applications using the gio + API. It also supports exposing the gvfs mounts to non-gio applications + using fuse. + . + This package contains the libgvfscommon library that is used by the + backends. + +Package: libgvfscommon-dev +Section: libdevel +Architecture: any +Depends: libgvfscommon0 (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends}, + libglib2.0-dev (>= 2.19) +Description: userspace virtual filesystem - development files + gvfs is a userspace virtual filesystem where mount runs as a separate + processes which you talk to via D-Bus. It also contains a gio module + that seamlessly adds gvfs support to all applications using the gio + API. It also supports exposing the gvfs mounts to non-gio applications + using fuse. + . + This package contains the libgvfscommon development files, needed to + build new backends that make use of the same functions. + +Package: gvfs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + devicekit-disks, + policykit-1-gnome +Recommends: dbus, gvfs-backends +Conflicts: gvfs-backends (<< 1.0.2-1) +Replaces: gvfs-backends (<< 1.3git20090512-0ubuntu2) +Description: userspace virtual filesystem - server + gvfs is a userspace virtual filesystem where mount runs as a separate + processes which you talk to via D-Bus. It also contains a gio module + that seamlessly adds gvfs support to all applications using the gio + API. It also supports exposing the gvfs mounts to non-gio applications + using fuse. + . + This package contains the gvfs server that provides gvfs mounts to all + gio applications, and the minimal set of backends. + +Package: gvfs-fuse +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gvfs (= ${binary:Version}), + fuse-utils +Description: userspace virtual filesystem - fuse server + gvfs is a userspace virtual filesystem where mount runs as a separate + processes which you talk to via D-Bus. It also contains a gio module + that seamlessly adds gvfs support to all applications using the gio + API. It also supports exposing the gvfs mounts to non-gio applications + using fuse. + . + This package contains the gvfs-fuse server that exports gvfs mounts to + all applications using FUSE. + +Package: gvfs-backends +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gvfs (= ${binary:Version}) +Recommends: obex-data-server +Description: userspace virtual filesystem - backends + gvfs is a userspace virtual filesystem where mount runs as a separate + processes which you talk to via D-Bus. It also contains a gio module + that seamlessly adds gvfs support to all applications using the gio + API. It also supports exposing the gvfs mounts to non-gio applications + using fuse. + . + This package contains the archive, burn, cdda, dav, dnssd, ftp, + gphoto2, http, network, obexftp, sftp, smb and smb-browse backends. + +Package: gvfs-bin +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gvfs (= ${binary:Version}) +Description: userspace virtual filesystem - binaries + gvfs is a userspace virtual filesystem where mount runs as a separate + processes which you talk to via D-Bus. It also contains a gio module + that seamlessly adds gvfs support to all applications using the gio + API. It also supports exposing the gvfs mounts to non-gio applications + using fuse. + . + This package contains the support binaries. --- gvfs-1.4.0.orig/debian/gvfs-backends.postinst +++ gvfs-1.4.0/debian/gvfs-backends.postinst @@ -0,0 +1,11 @@ +#! /bin/sh +set -e + +#DEBHELPER# + +if [ "$1" = "configure" ]; then + # Let gvfsd reload it's backend list + killall -q /usr/lib/gvfs/gvfsd -HUP || true +fi + +exit 0 --- gvfs-1.4.0.orig/debian/patches/series +++ gvfs-1.4.0/debian/patches/series @@ -0,0 +1,6 @@ +01_mtp_content_types.patch +02_music-player-mimetype.patch +03_http_input_query_info.patch +04_dont_automount_internal_partitions.patch +00git-separate-eject-detach.patch +99_ltmain_as-needed.patch --- gvfs-1.4.0.orig/debian/patches/04_dont_automount_internal_partitions.patch +++ gvfs-1.4.0/debian/patches/04_dont_automount_internal_partitions.patch @@ -0,0 +1,53 @@ +From 771b1d897212f365f256e74bcb5106d096bc2aab Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Mon, 19 Oct 2009 13:36:50 +0200 +Subject: [PATCH 3/3] =?utf-8?q?Bug=20598914=20=E2=80=94=20Attempts=20to=20automount=20internal=20partitions?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +On a live system, where the user does not have a password, internal partitions +often get automounted. This is not quite desirable, since a live system isn't +supposed to modify your system (at least not automatically). + +Disable automounting for system internal drives to fix this. + +For real installed systems this does not actually change behaviour, since +internal drives require polkit authorization, and all drives which do are not +automounted at nautilus startup anyway. +--- + monitor/gdu/ggduvolume.c | 17 +++++++++++------ + 1 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c +index 865a7b7..3f9b2ab 100644 +--- a/monitor/gdu/ggduvolume.c ++++ b/monitor/gdu/ggduvolume.c +@@ -329,13 +329,18 @@ update_volume (GGduVolume *volume) + * can only be because the media was repartitioned. We don't want to automount + * such volumes. + */ +- volume->should_automount = TRUE; +- if (volume->drive != NULL) ++ if (gdu_device_is_system_internal (device)) ++ volume->should_automount = FALSE; ++ else + { +- now = time (NULL); +- if (now - g_gdu_drive_get_time_of_last_media_insertion (volume->drive) > 5) +- volume->should_automount = FALSE; +- } ++ volume->should_automount = TRUE; ++ if (volume->drive != NULL) ++ { ++ now = time (NULL); ++ if (now - g_gdu_drive_get_time_of_last_media_insertion (volume->drive) > 5) ++ volume->should_automount = FALSE; ++ } ++ } + + /* Respect the presentation hint for whether the volume should be automounted - normally + * nopolicy is only FALSE for "physical" devices - e.g. only "physical" devices will +-- +1.6.3.3 + --- gvfs-1.4.0.orig/debian/patches/99_ltmain_as-needed.patch +++ gvfs-1.4.0/debian/patches/99_ltmain_as-needed.patch @@ -0,0 +1,32 @@ +Index: gvfs-1.3git20090512/ltmain.sh +=================================================================== +--- gvfs-1.3git20090512.orig/ltmain.sh 2009-01-16 11:58:47.000000000 +0100 ++++ gvfs-1.3git20090512/ltmain.sh 2009-05-12 14:56:24.000000000 +0200 +@@ -4716,6 +4716,11 @@ + arg=$func_stripname_result + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result +@@ -5070,6 +5075,15 @@ + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" --- gvfs-1.4.0.orig/debian/patches/02_music-player-mimetype.patch +++ gvfs-1.4.0/debian/patches/02_music-player-mimetype.patch @@ -0,0 +1,24 @@ +# Description: Add media player content type if we have a multimedia-player icon. This is a kludge until https://bugs.freedesktop.org/show_bug.cgi?id=24500 gets discussed/solved properly. +# Ubuntu: https://launchpad.net/bugs/440290 + +Index: gvfs-1.4.0/monitor/gdu/ggdumount.c +=================================================================== +--- gvfs-1.4.0.orig/monitor/gdu/ggdumount.c 2009-10-14 11:31:29.000000000 +0200 ++++ gvfs-1.4.0/monitor/gdu/ggdumount.c 2009-10-14 11:31:35.000000000 +0200 +@@ -1323,6 +1323,16 @@ + } + } + ++ /* also add media player if we have the multimedia-player icon (or a variant ++ * like multimedia-player-ipod-white); basing this on the icon is a kludge, ++ * better solution is being discussed in FD#24500 */ ++ if (device != NULL) ++ { ++ const char* icon = gdu_device_get_presentation_icon_name (device); ++ if (icon != NULL && g_str_has_prefix (icon, "multimedia-player")) ++ g_ptr_array_add (p, g_strdup ("x-content/audio-player")); ++ } ++ + if (p->len == 0) + { + result = NULL; --- gvfs-1.4.0.orig/debian/patches/00git-separate-eject-detach.patch +++ gvfs-1.4.0/debian/patches/00git-separate-eject-detach.patch @@ -0,0 +1,84 @@ +From 6e70902ee77cb0bd6063bcf4d215b13a13bf5ee4 Mon Sep 17 00:00:00 2001 +From: David Zeuthen +Date: Fri, 09 Oct 2009 00:20:27 +0000 +Subject: Bug 597864 – Need to separate "Safely Remove Drive" from "Eject" + +Some systems use internal USB devices. Automatically detaching such +drives when calling gdu_drive_eject() (triggered by e.g. the eject +button in the Nautilus sidebar) as we do right now leads to loss of +the drive until reboot (since the device is internal). The only viable +option right now is to separate "Safely Remove Drive" and "Eject". + +If we gain infrastructure to let us know with 100% accuracy that a +given receptacle is external we can go back to the previous behavior. + +See http://bugs.freedesktop.org/show_bug.cgi?id=24343 for details. +--- +diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c +index b99ef6e..9920829 100644 +--- a/monitor/gdu/ggdudrive.c ++++ b/monitor/gdu/ggdudrive.c +@@ -212,39 +212,31 @@ update_drive (GGduDrive *drive) + } + else if (device != NULL && gdu_device_drive_get_can_detach (device)) + { +- /* If the device is not ejectable, just detach on Eject() and claim to be ejectable. ++ /* Ideally, for non-ejectable devices (e.g. non-cdrom, non-zip) ++ * such as USB sticks we'd display "Eject" instead of "Shutdown" ++ * since it is more familiar and the common case. The way this ++ * should work is that after the Eject() method returns we call ++ * Detach() - see eject_cb() below. + * +- * This is so we get the UI to display "Eject" instead of "Shutdown" since it is +- * more familiar and the common case. The way this works is that after the Eject() +- * method returns we call Detach() - see eject_cb() below. ++ * (Note that it's not enough to just call Detach() since some ++ * devices, such as the Kindle, only works with Eject(). So we ++ * call them both in order). + * +- * (Note that it's not enough to just call Detach() since some devices, such as +- * the Kindle, only works with Eject(). So we call them both in order) ++ * We actually used to do this (and that's why eject_cb() still ++ * has this code) but some systems use internal USB devices for ++ * e.g. SD card readers. If we were to detach these then the ++ * user would have to power-cycle the system to get the device ++ * back. See http://bugs.freedesktop.org/show_bug.cgi?id=24343 ++ * for more details. ++ * ++ * In the future, if we know for sure that a port is external ++ * (like, from DMI data) we can go back to doing this. For now ++ * the user will get all the options... + */ +- if (!gdu_device_drive_get_is_media_ejectable (device)) +- { +- drive->can_eject = TRUE; +- /* we still set this since +- * +- * a) it helps when debugging things using gvfs-mount(1) output +- * since the tool will print can_stop=0 but start_stop_type=shutdown +- * +- * b) we use it in eject_cb() to determine we need to call Detach() +- * after Eject() successfully completes +- */ +- drive->start_stop_type = G_DRIVE_START_STOP_TYPE_SHUTDOWN; +- } +- else +- { +- /* So here the device is ejectable and detachable - for example, a USB CD-ROM +- * drive or a CD-ROM drive in an Ultrabay - for these, we want to offer both +- * "Eject" and "Shutdown" options in the UI +- */ +- drive->can_stop = TRUE; +- drive->can_start = FALSE; +- drive->can_start_degraded = FALSE; +- drive->start_stop_type = G_DRIVE_START_STOP_TYPE_SHUTDOWN; +- } ++ drive->can_stop = TRUE; ++ drive->can_start = FALSE; ++ drive->can_start_degraded = FALSE; ++ drive->start_stop_type = G_DRIVE_START_STOP_TYPE_SHUTDOWN; + } + + if (device != NULL) +-- +cgit v0.8.2 --- gvfs-1.4.0.orig/debian/patches/03_http_input_query_info.patch +++ gvfs-1.4.0/debian/patches/03_http_input_query_info.patch @@ -0,0 +1,142 @@ +# +# Description: Adds support for g_file_input_stream_query_info() to HTTP backend +# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=598505 +# +Index: gvfs-1.4.0/daemon/gvfsbackendhttp.c +=================================================================== +--- gvfs-1.4.0.orig/daemon/gvfsbackendhttp.c 2009-10-15 13:21:15.000000000 +1100 ++++ gvfs-1.4.0/daemon/gvfsbackendhttp.c 2009-10-15 13:24:46.000000000 +1100 +@@ -528,29 +528,15 @@ + + /* *** query_info () *** */ + +-static void +-query_info_ready (SoupSession *session, +- SoupMessage *msg, +- gpointer user_data) ++static void ++set_query_info_from_message (SoupMessage *msg, ++ GFileInfo *info, ++ GFileAttributeMatcher *matcher) + { +- GFileAttributeMatcher *matcher; +- GVfsJobQueryInfo *job; + const SoupURI *uri; + const char *text; +- GFileInfo *info; + char *basename; + +- job = G_VFS_JOB_QUERY_INFO (user_data); +- info = job->file_info; +- matcher = job->attribute_matcher; +- +- if (! SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) +- { +- g_vfs_job_failed_from_http_status (G_VFS_JOB (job), msg->status_code, +- msg->reason_phrase); +- return; +- } +- + uri = soup_message_get_uri (msg); + basename = http_uri_get_basename (uri->path); + +@@ -638,7 +624,29 @@ + G_FILE_ATTRIBUTE_ETAG_VALUE, + text); + } ++} ++ ++static void ++query_info_ready (SoupSession *session, ++ SoupMessage *msg, ++ gpointer user_data) ++{ ++ GFileAttributeMatcher *matcher; ++ GVfsJobQueryInfo *job; ++ GFileInfo *info; ++ ++ job = G_VFS_JOB_QUERY_INFO (user_data); ++ info = job->file_info; ++ matcher = job->attribute_matcher; ++ ++ if (! SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) ++ { ++ g_vfs_job_failed_from_http_status (G_VFS_JOB (job), msg->status_code, ++ msg->reason_phrase); ++ return; ++ } + ++ set_query_info_from_message (msg, info, matcher); + + g_vfs_job_succeeded (G_VFS_JOB (job)); + } +@@ -666,6 +674,19 @@ + + + static void ++query_info_on_read (GVfsBackend *backend, ++ GVfsJobQueryInfoRead *job, ++ GVfsBackendHandle handle, ++ GFileInfo *info, ++ GFileAttributeMatcher *attribute_matcher) ++{ ++ set_query_info_from_message (soup_input_stream_get_message (G_INPUT_STREAM (handle)), ++ info, attribute_matcher); ++ g_vfs_job_succeeded (G_VFS_JOB (job)); ++} ++ ++ ++static void + g_vfs_backend_http_class_init (GVfsBackendHttpClass *klass) + { + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); +@@ -675,11 +696,11 @@ + + backend_class = G_VFS_BACKEND_CLASS (klass); + +- backend_class->try_mount = try_mount; +- backend_class->try_open_for_read = try_open_for_read; +- backend_class->try_read = try_read; +- backend_class->try_seek_on_read = try_seek_on_read; +- backend_class->try_close_read = try_close_read; +- backend_class->try_query_info = try_query_info; +- ++ backend_class->try_mount = try_mount; ++ backend_class->try_open_for_read = try_open_for_read; ++ backend_class->try_read = try_read; ++ backend_class->try_seek_on_read = try_seek_on_read; ++ backend_class->try_close_read = try_close_read; ++ backend_class->try_query_info = try_query_info; ++ backend_class->query_info_on_read = query_info_on_read; + } +Index: gvfs-1.4.0/daemon/soup-input-stream.c +=================================================================== +--- gvfs-1.4.0.orig/daemon/soup-input-stream.c 2009-10-15 13:21:15.000000000 +1100 ++++ gvfs-1.4.0/daemon/soup-input-stream.c 2009-10-15 13:22:31.000000000 +1100 +@@ -912,6 +912,13 @@ + return FALSE; + } + ++SoupMessage * ++soup_input_stream_get_message (GInputStream *stream) ++{ ++ SoupInputStreamPrivate *priv = SOUP_INPUT_STREAM_GET_PRIVATE (stream); ++ return priv->msg; ++} ++ + GQuark + soup_http_error_quark (void) + { +Index: gvfs-1.4.0/daemon/soup-input-stream.h +=================================================================== +--- gvfs-1.4.0.orig/daemon/soup-input-stream.h 2009-10-15 13:21:15.000000000 +1100 ++++ gvfs-1.4.0/daemon/soup-input-stream.h 2009-10-15 13:22:31.000000000 +1100 +@@ -70,6 +70,8 @@ + GAsyncResult *result, + GError **error); + ++SoupMessage *soup_input_stream_get_message (GInputStream *stream); ++ + #define SOUP_HTTP_ERROR soup_http_error_quark() + GQuark soup_http_error_quark (void); + --- gvfs-1.4.0.orig/debian/patches/01_mtp_content_types.patch +++ gvfs-1.4.0/debian/patches/01_mtp_content_types.patch @@ -0,0 +1,45 @@ +# Description: Set correct MIME type for MTP music players. +# Ubuntu: https://launchpad.net/bugs/444083 +# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=597585 + +Index: gvfs-1.4.0/daemon/gvfsbackendgphoto2.c +=================================================================== +--- gvfs-1.4.0.orig/daemon/gvfsbackendgphoto2.c 2009-10-12 16:15:59.000000000 +0200 ++++ gvfs-1.4.0/daemon/gvfsbackendgphoto2.c 2009-10-12 16:19:32.000000000 +0200 +@@ -740,7 +740,9 @@ + { + gchar *devname; + char *comma; ++ gboolean is_media_player = FALSE; + char *camera_x_content_types[] = {"x-content/image-dcf", NULL}; ++ char *media_player_x_content_types[] = {"x-content/audio-player", NULL}; + + /* turn usb:001,041 string into an udev device name */ + if (!g_str_has_prefix (gphoto2_backend->gphoto2_port, "usb:")) +@@ -763,16 +765,25 @@ + + /* determine icon name */ + if (g_udev_device_has_property (gphoto2_backend->udev_device, "ID_MEDIA_PLAYER_ICON_NAME")) ++ { + gphoto2_backend->icon_name = g_strdup (g_udev_device_get_property (gphoto2_backend->udev_device, "ID_MEDIA_PLAYER_ICON_NAME")); ++ is_media_player = TRUE; ++ } + else if (g_udev_device_has_property (gphoto2_backend->udev_device, "ID_MEDIA_PLAYER")) ++ { + gphoto2_backend->icon_name = g_strdup ("multimedia-player"); ++ is_media_player = TRUE; ++ } + else + gphoto2_backend->icon_name = g_strdup ("camera-photo"); + } + else + DEBUG ("-> did not find matching udev device"); + +- g_vfs_backend_set_x_content_types (G_VFS_BACKEND (gphoto2_backend), camera_x_content_types); ++ if (is_media_player) ++ g_vfs_backend_set_x_content_types (G_VFS_BACKEND (gphoto2_backend), media_player_x_content_types); ++ else ++ g_vfs_backend_set_x_content_types (G_VFS_BACKEND (gphoto2_backend), camera_x_content_types); + } + + static void