--- gnome-vfs-2.24.0.orig/debian/rules +++ gnome-vfs-2.24.0/debian/rules @@ -0,0 +1,32 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.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 + +GNOME_MODULE := gnome-vfs + +ifeq ($(DEB_HOST_ARCH),hurd-i386) + HOST_ARCH_CONFIGURE_FLAGS=--disable-samba +else + HOST_ARCH_CONFIGURE_FLAGS=--enable-ipv6 --enable-hal \ + --with-hal-mount=/usr/bin/pmount-hal --with-hal-umount=/usr/bin/pumount \ + --enable-avahi +endif + +#debug lib +DEB_DH_STRIP_ARGS := --dbg-package=libgnomevfs2-0-dbg + +DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --disable-openssl \ + --enable-gnutls \ + --libexecdir=/usr/lib/gnome-vfs-2.0 \ + $(HOST_ARCH_CONFIGURE_FLAGS) + +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" + +DEB_DH_MAKESHLIBS_ARGS_libgnomevfs2-extra := --no-act +DEB_COMPRESS_EXCLUDE := html --- gnome-vfs-2.24.0.orig/debian/changelog +++ gnome-vfs-2.24.0/debian/changelog @@ -0,0 +1,1555 @@ +gnome-vfs (1:2.24.0-1ubuntu3) jaunty; urgency=low + + * No-change rebuild to get .schema translations stripped. + + -- Martin Pitt Mon, 09 Mar 2009 17:30:28 +0100 + +gnome-vfs (1:2.24.0-1ubuntu2) jaunty; urgency=low + + * No-change rebuild to fix incorrect libfam0 dependency on armel. + + -- Colin Watson Tue, 18 Nov 2008 23:12:30 +0000 + +gnome-vfs (1:2.24.0-1ubuntu1) jaunty; urgency=low + + * Sync on Debian + * debian/control.in: + - don't Build-Depends on type-handling + - don't use quilt + - Build-Depends and Recommends gamin before fam + - libgnomevfs2-dev Replaces libgnomevfs2-common (<< 1:2.20.0-0ubuntu2) + - update maintainer information + * debian/libgnomevfs2-common.install, + debian/libgnomevfs2-common.links: + - don't install the default list of apps, this is Debian specific. + * renamed debian/libgnomevfs2-common.links debian/libgnomevfs2-dev.links + * debian/libgnomevfs2-common.install, + debian/libgnomevfs2-dev.install: + - install the API documentation in the dev package + * debian/libgnomevfs2-common.gconf-defaults: + - firefox is the default Ubuntu webbrowser + * debian/patches/03_usr_share_gnome_applications.patch: + - dropped, Debian specific change. + * debian/patches/11_network-volumes-in-network.patch: + - ubuntu changes + * debian/patches/17_improve_volume_labels.patch: + - Ignore '/' volume labels, they lead to much confusion. Closes: LP#38764 + * debian/patches/21_proxy_ignore_local.patch: + - ignore .local for proxy + * debian/patches/23_ignore_ltspfs_volumes.patch: Ignore ltspfs mounts + since the current ltspfs implementation creates associated bind mounts to + /media. This prevents generating two volumes for the same mount. + + -- Sebastien Bacher Wed, 12 Nov 2008 17:28:27 +0100 + +gnome-vfs (1:2.24.0-1) experimental; urgency=low + + * New upstream bugfix release. + + 90_from_svn_no_range_for_youtube.patch: removed, merged upstream. + + -- Josselin Mouette Tue, 11 Nov 2008 12:00:14 +0100 + +gnome-vfs (1:2.22.0-5) unstable; urgency=low + + * Recommend dbus-x11 for the availability of dbus-launch. + * defaults.list: add swfdec-player. + + -- Josselin Mouette Thu, 18 Sep 2008 16:22:55 +0200 + +gnome-vfs (1:2.22.0-4) unstable; urgency=low + + * defaults.list: make OOo the default handler for MS Word files, since + Abiword is still not good enough at that. + * 11_mime_text_parent.patch: new patch. Make all text/* mime types + inherit from text/plain, as specified by the XDG documents. + Closes: #485660. + + -- Josselin Mouette Sat, 14 Jun 2008 12:56:41 +0200 + +gnome-vfs (1:2.22.0-3) unstable; urgency=low + + * defaults.list: update to the 2.22 applications capabilities. + * 07_trash_location.patch: new patch. Make gnome-vfs return the new + location for the trash. Beware, it is NOT conforming to the + specification, especially it doesn’t create the .trashinfo files. + However nautilus 2.22 is backwards-compatible with this behavior. + + -- Josselin Mouette Wed, 28 May 2008 01:46:46 +0200 + +gnome-vfs (1:2.22.0-2) unstable; urgency=low + + * debian/patches/90_from_svn_no_range_for_youtube.patch: + + Patch from upstream SVN to not use the Range header for youtube.com + as it answers with 403 on ranged requests. This fixes the totem + youtube plugin. + + -- Sebastian Dröge Tue, 18 Mar 2008 21:48:32 +0100 + +gnome-vfs (1:2.22.0-1) unstable; urgency=low + + * New upstream stable release: + + debian/patches/40_http_seeking.patch: + - Dropped, merged upstream. + + -- Sebastian Dröge Tue, 11 Mar 2008 06:22:37 +0100 + +gnome-vfs (1:2.20.1-2) unstable; urgency=low + + [ Josselin Mouette ] + * libgnomevfs2-common.gconf-defaults: make ekiga the default h323 + handler. Closes: #459968. + * Demote fam to a Suggests; only gnome-desktop-environment really + needs to recommend it. + + [ Sebastian Dröge ] + * New patch 40_http_seeking.patch: Patch from upstream SVN to allow seeking with + GNOME_VFS_OPEN_RANDOM and don't fail to open an URI if GNOME_VFS_OPEN_RANDOM + is given but seeking does not work. This makes the http method consistent with + the others and also fixes seeking on HTTP files via GStreamer when using + the gnomevfssrc (Closes: #370371). + * Update Standards-Version to 3.7.3, no additional changes needed. + + -- Sebastian Dröge Fri, 15 Feb 2008 06:18:23 +0100 + +gnome-vfs (1:2.20.1-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Wed, 14 Nov 2007 05:42:10 +0100 + +gnome-vfs (1:2.20.0-3) unstable; urgency=low + + * 24_home_dir_fakeroot.patch: fix implicit conversion of pointer to + int. Closes: #446032. (I wonder how this could even work on amd64.) + + -- Josselin Mouette Thu, 11 Oct 2007 10:15:28 +0200 + +gnome-vfs (1:2.20.0-2) unstable; urgency=low + + [ Josselin Mouette ] + * Remove orbit hack, it's useless now. + * Rename source package to gnome-vfs. This will magically remove + gnome-vfs 1.0 from the archive. + + [ Loic Minier ] + * Drop the linux-libc-dev build-dep altogether. + + [ Sebastian Dröge ] + * debian/watch: + + Fix location for newer versions. + + [ Josselin Mouette ] + * 24_home_dir_fakeroot.patch: replaces 24_gnome_vfs_home_dir.patch. + Add a new function, _gnome_vfs_get_home_dir, and use it only where + appropriate, i.e. when dot files need to be written. + + -- Josselin Mouette Sat, 06 Oct 2007 12:15:14 +0200 + +gnome-vfs2 (1:2.20.0-1) unstable; urgency=low + + * New upstream release - no ABI and API changes. + * debian/rules: + + Don't include autotools.mk, it's already included by gnome.mk. + * Upload to unstable, new changes from experimental: + [ Marc 'HE' Brockschmidt ] + + debian/patches synced a bit with the Ubuntu tree: + - 14_app_cdda.patch: Register sound-juicer as default application + for cdda URLs + - 15_uuid_mount.patch: Look at disk UUIDs to not display dupes of + the same disks. + - 16_no_extra_dbus_messages.patch: Turn off some annoying warnings + when dbus isn't running. + + -- Sebastian Dröge Mon, 17 Sep 2007 22:12:21 +0200 + +gnome-vfs2 (1:2.18.1-5) unstable; urgency=low + + [ Loic Minier ] + * Drop the linux-libc-dev build-dep altogether. + + [ Sebastian Dröge ] + * debian/patches/24_gnome_vfs_home_dir.patch: + + Include stdlib.h for getenv(). Otherwise it will segfault on amd64 at + least. Thanks to Andreas Henriksson for debugging. + + -- Sebastian Dröge Mon, 10 Sep 2007 10:49:36 +0200 + +gnome-vfs2 (1:2.18.1-4) unstable; urgency=low + + [ Loic Minier ] + * Build-dep on linux-libc-dev instead of linux-kernel-headers; keep the + version intact (Closes: #439097). + + [ Sebastian Dröge ] + * debian/patches/24_gnome_vfs_home_dir.patch: + + Add a new environment variable GNOME_VFS_HOME to specify the home + directory that GnomeVFS should use. Currently it only uses the value + from g_get_home_dir() which can be changed easily. + Setting this environment variable to a writable directory is necessary + to use GnomeVFS in the buildd chroots. + + -- Sebastian Dröge Fri, 07 Sep 2007 15:10:37 +0200 + +gnome-vfs2 (1:2.18.1-3) unstable; urgency=low + + [ Josselin Mouette ] + * libgnomevfs2-common.preinst, libgnomevfs2-extra.preinst: use + dpkg-query instead of parsing the status file directly. + * 99_ltmain_as-needed.patch: get --as-needed back to work. + + [ Otavio Salvador ] + * 23_improve_volume_labels.patch: Improve volume labels. Thanks to + Luis Gustavo S. Barreto for the patch. + * 06_blacklist-directories.patch: Modified to blacklist /live/cow and + /live/image that are being use by live-initramfs while booting and + hence completely useless for end-users. + + [ Josselin Mouette ] + * 23_improve_volume_labels.patch: we are rich: display both mount + point and volume size. Also fix a leak with size_str. + + -- Josselin Mouette Wed, 27 Jun 2007 22:49:33 +0200 + +gnome-vfs2 (1:2.18.1-2) unstable; urgency=low + + [ Loic Minier ] + * Wrap build-deps and deps. + * Drop libc6-dev dep. + * Make the build-dep on libdbus-glib-1-dev unconditional; thanks + Michael Banck; closes: #419860. + + [ Josselin Mouette ] + * Convert to quilt for patch handling, build-depend on quilt. + * Convert all patches to -p1 and refresh them. + * 06_blacklist-directories.patch: add a few commonly found + non-toplevel FHS direcories to the mountpoint blacklist. + Closes: #365670. + + -- Josselin Mouette Thu, 03 May 2007 23:14:05 +0200 + +gnome-vfs2 (1:2.18.1-1) unstable; urgency=low + + [ Josselin Mouette ] + * 22_ignore_inaccessible_volumes.patch: patch from Ubuntu to ignore + volumes on which the current user doesn't have permissions. + Closes: #416692. + * Update patch 30_nfs4 to also update the do_is_local() method; thanks + John Goerzen; closes: #413993. + * defaults.list: updated using the lists in the latest available + .desktop files. + + [ Sebastian Dröge ] + * New upstream release. + * Upload to unstable, drop the check-dist include. + * Build depend on gnome-pkg-tools >= 0.11.3 to get me into Uploaders. + * Update watch file with the new location. + * 20_dont_register_keys_for_gaim.patch: patch from Ubuntu to not register + URL handlers for gaim as gaim already registers them itself. + * 30_nfs4.patch: Updated for new upstream version. + + -- Sebastian Dröge Mon, 16 Apr 2007 11:43:21 +0200 + +gnome-vfs2 (1:2.18.0.1-1) experimental; urgency=low + + * New upstream release. + * Bump shlibs to 2.17.90. + * Bump avahi requirement to version 0.6. + * Bump HAL requirement to 0.5.7. + * Bump gtk-doc-tools build-dependency to 1.0. + * libgnomevfs2-0 recommends gnome-mount (closes: #395361). + * Build-depend on linux-kernel-headers 2.6.13 for inotify. + + Merged from 2.14 branch: + * New patch, 30_nfs4, NFSv4 support fixes handling of Trash in Nautilus for + NFS /home; thanks John Goerzen; closes: 403129. + + -- Josselin Mouette Mon, 19 Mar 2007 22:07:16 +0100 + +gnome-vfs2 (1:2.16.3-7) experimental; urgency=low + + * libgnomevfs2-common conflicts with libgnomevfs2-extra << 1:2.16.3-6. + * 04_sftp_pam_krb5.patch: include support for just another new prompt + the pam_krb5 authors invented. + + -- Josselin Mouette Wed, 28 Feb 2007 18:28:31 +0100 + +gnome-vfs2 (1:2.16.3-6) experimental; urgency=low + + * libgnomevfs2-common.preinst: + + Remove the conffile dance, it's not needed anymore when + upgrading from 2.14. + * Merge ssl-modules.conf, smb-module.conf and a part of + default-modules.conf in extra-modules.conf. + * Ship this file in libgnomevfs2-extra. + * Remove the old files in the preinsts. + * 05_default_modules.patch: remove non-default modules from the + default configuration (closes: #402357). + + -- Josselin Mouette Sat, 24 Feb 2007 11:02:44 +0100 + +gnome-vfs2 (1:2.16.3-5) experimental; urgency=low + + [ Loic Minier ] + * Unify descriptions and casing. + + [ Josselin Mouette ] + * 04_sftp_pam_krb5.patch: add support for the password prompt as + requested by pam_krb5 (closes: #379106). + + -- Josselin Mouette Sat, 24 Feb 2007 10:17:09 +0100 + +gnome-vfs2 (1:2.16.3-4) experimental; urgency=low + + * Merge gnome-vfs2/unstable 2.14.2-4 and -5 up-to SVN r8407. + * Add epoch to shlibs. + * Bump conflict of libgnomevfs2-extra on libgnomevfs2-0. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + + -- Loic Minier Tue, 23 Jan 2007 18:40:12 +0100 + +gnome-vfs2 (2.16.3-3) unstable; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + + -- Loic Minier Tue, 9 Jan 2007 15:04:10 +0100 + +gnome-vfs2 (2.16.3-2) experimental; urgency=low + + * 02_audiocd_readonly.patch: correctly flag audio CDs as + being read-only media. + + -- Josselin Mouette Sat, 9 Dec 2006 01:23:05 +0100 + +gnome-vfs2 (2.16.3-1) experimental; urgency=low + + [ Loic Minier ] + * Merge 2.14.2-3. + + [ Josselin Mouette ] + * New upstream release. + * 02_monitor_infinite_loop.patch: removed, integrated upstream. + * 20_dont-always-cancel-if-file-exists.patch: idem. + + -- Josselin Mouette Sun, 26 Nov 2006 20:30:06 +0100 + +gnome-vfs2 (2.16.1-2) experimental; urgency=low + + * 02_monitor_infinite_loop.patch, stolen from CVS: fix the infinite + loops in monitoring code (closes: #392889). + + -- Josselin Mouette Mon, 6 Nov 2006 14:10:00 +0100 + +gnome-vfs2 (2.16.1-1) experimental; urgency=low + + [ Josselin Mouette ] + * Bump shlibs to 2.16.0-1 for the SELinux support. + + [ Loic Minier ] + * New upstream release; no API change; closes: #394451. + + -- Loic Minier Sat, 21 Oct 2006 13:44:49 +0200 + +gnome-vfs2 (2.16.0-1) experimental; urgency=low + + * New upstream release. + * Conflict with libbonobo2-0 (<< 2.15.0) because of the functions that + moved to libbonobo. + * (Build-)depend on libselinux1-dev on linux. + * Bump shlibs version. + * Enable GSSAPI support by build-depending on libkrb5-dev. + * Move the FTP module to libgnomevfs2-extra to avoid making it a hard + dependency. + * Move the HTTP module as well, it is too big. + * Remove libbonobo and ORBit requirements. + * Build-depend on libacl1-dev and libattr1-dev for ACL support. + * The moniker was removed upstream. + + Remove 04_moniker_libexecdir.patch. + * Remove patches integrated upstream: + + 05_mime_handler_%.patch + + 07_fam_remote.patch + + 06_modules_conf.patch + * Update 08_recursive_local_check.patch for 2.16 version. + * Install the DBUS .server file in libgnomevfs2-common. + * Bump dbus build-dependency to 0.70. + * Depend on dbus so that there is a session bus for the VFS daemon. + * Clean the .la file from the dependency_libs field. + + Require gnome-pkg-tools 0.7. + + Use clean-la.mk. + + -- Josselin Mouette Thu, 7 Sep 2006 22:49:31 +0200 + +gnome-vfs2 (1:2.14.2-5) unstable; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * Add an epoch due to an unfortunate upload of the experimental 2.16 branch. + + -- Loic Minier Sun, 21 Jan 2007 16:15:25 +0100 + +gnome-vfs2 (2.14.2-4) unstable; urgency=low + + * New patch, 02_audiocd_readonly.patch: always flag audio CDs as being. + read-only. This avoids bringing up the progress bar that appears. + when ejecting it with the new nautilus patch. + + -- Josselin Mouette Sat, 9 Dec 2006 01:51:58 +0100 + +gnome-vfs2 (2.14.2-3) unstable; urgency=low + + * New patch, 20_dont-always-cancel-if-file-exists.patch, from upstream CVS, + to fix a silent abort when copying file.txt and FILE.TXT to a case + insensitive filesystem such as FAT; GNOME #144726. + + -- Loic Minier Mon, 6 Nov 2006 18:46:59 +0100 + +gnome-vfs2 (2.14.2-2) unstable; urgency=low + + * 05_mime_handler_%.patch: support %% in desktop files + (closes: #369812). + * Require gnome-pkg-tools 0.6. + * Use ${gnome:Version} and ${gnome:NextVersion}. + * Include the gnome-versions.mk snippet. + * 08_recursive_local_check.patch: new patch, makes the is_local + function go up directories, to handle the case of nonexistent files + (closes: #385344). + * 10_configuration_loop.patch: avoid infinite loop when a + configuration file is in fact a directory (closes: #379598). + + -- Josselin Mouette Fri, 1 Sep 2006 23:57:38 +0200 + +gnome-vfs2 (2.14.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * Only recommend fam, not gamin. + + [ Loic Minier ] + * New upstream release. + + -- Loic Minier Thu, 1 Jun 2006 11:57:38 +0200 + +gnome-vfs2 (2.14.1-2) unstable; urgency=low + + [ Sjoerd Simons ] + * 09_gnomevfs_mount_selection.patch: In case there is no hal-udi to use for + mount/unmount properly fallback to using pmount/pumount + * debian/rules: Use pmount-hal as the mount command + + [ Josselin Mouette ] + * Make the package binNMU-safe. + + Build-depend on dpkg-dev 1.13.19. + + Use ${source:Version} and ${binary:Version} + * compat, rules: use debhelper mode 5 to generate the debugging package. + + libgnomevfs2-dev.install: remove the *.sh installation. + * Standards-version is 3.7.2. + + -- Josselin Mouette Sun, 7 May 2006 11:22:25 +0200 + +gnome-vfs2 (2.14.1-1) unstable; urgency=low + + * New upstream release. + + -- Guilherme de S. Pastore Fri, 21 Apr 2006 23:43:32 -0300 + +gnome-vfs2 (2.14.0-3) unstable; urgency=low + + * Use type-handling for the build dependencies (closes: #361460). + * Rebuild against libgnutls13. + + -- Josselin Mouette Mon, 17 Apr 2006 18:49:43 +0200 + +gnome-vfs2 (2.14.0-2) unstable; urgency=high + + * copyright: document which parts are GPL and which ones are LGPL. The + last file of the library that was licensed under the GPL + (gnome-vfs-mime-monitor.c) was just relicensed under the LGPL. + Closes: #354024. + + -- Josselin Mouette Tue, 4 Apr 2006 00:29:53 +0200 + +gnome-vfs2 (2.14.0-1) unstable; urgency=low + + [ Josselin Mouette ] + * 02_get_volume_for_path.patch: removed, it's been fixed upstream a + long time ago. + + [ Sjoerd Simons ] + * New upstream release + * Update debian/watch for the 2.14 version + + -- Sjoerd Simons Tue, 21 Mar 2006 10:29:12 +0100 + +gnome-vfs2 (2.13.92-1) experimental; urgency=low + + * New upstream release. + * Use avahi instead of howl (closes: #354034). + * libgnomevfs2-0.shlibs: update according to ABI additions. + * 07_fam_remote.patch: use FAM to monitor remote files/directories, + and inotify for local ones. + * 05_gnomevfs-ls.patch: integrated upstream. + + -- Josselin Mouette Mon, 6 Mar 2006 00:04:31 +0100 + +gnome-vfs2 (2.12.2-7) unstable; urgency=low + + * 06_modules_conf.patch: disable the cdda method entirely + (closes: #349032). + * libgnomevfs2-extra.install,rules: distribute smb-module.conf in + libgnomevfs2-extra. + + Make libgnomevfs2-extra conflict with earlier libgnomevfs2-common + versions. + + libgnomevfs2-common.preinst: add a snippet to move the file. + + -- Josselin Mouette Sun, 5 Mar 2006 20:17:59 +0100 + +gnome-vfs2 (2.12.2-6) unstable; urgency=low + + [ Josselin Mouette ] + * Remove the spaces in the brackets for build-dependencies, to please + lintian. + * libgnomevfs2-extra.install.hurd-i386: don't install the SMB module + on hurd-i386. + * libgnomevfs2-common.preinst: restore a snippet from 2.12.0-1 to remove + a cdda conffile that was in the 2.10 package. + + [ Loic Minier ] + * Switch to libgnutls-dev instead of libgnutls11-dev in the build-deps and + in the deps. (Closes: #335756) + [debian/control, debian/control.in] + + -- Josselin Mouette Thu, 16 Feb 2006 16:51:57 +0100 + +gnome-vfs2 (2.12.2-5) unstable; urgency=low + + * Remove the libavahi-client-dev dependencies. + * Don't use the avahi howl compatibility layer on hurd-i386. + * Make the -dev package depend on libdbus-1-dev (closes: #348678). + + -- Josselin Mouette Wed, 18 Jan 2006 11:24:57 +0100 + +gnome-vfs2 (2.12.2-4) unstable; urgency=low + + * Set myself as maintainer. + * libgnomevfs2-common.gconf-defaults: make gnome-www-browser the + default for http and https protocols (closes: #345438). + - Build-depend on debhelper 5.0.13. + * rules: build the doc with --enable-gtk-doc. + - Build-depend on gtk-doc-tools. + - Don't compress it. + * Enable howl through libavahi-compat-howl-dev (closes: #346498). + - Build-depend on it. + - Also build-depend on libavahi-client-dev because of bug 347247. + - Add them to the libgnomevfs2-dev dependencies. + * A few cleanups: + - libgnomevfs2-common.dirs: removed, unused. + - Fix section and priority for libgnomevfs2-0-dbg. + - Remove old conflicts and replaces. + - Remove libgnomevfs2-common.{preinst,postrm}, unnecessary when + upgrading from sarge. + - Remove shlibs.local, it generates broken dependencies. + * Break the dependency cycle (closes: #316437). + - rules: change libexecdir, to put the daemon in /usr/lib/gnome-vfs-2.0. + - Put example binaries in libgnomevfs2-bin. + - Install the daemon, the moniker and the default modules in + /usr/lib/gnome-vfs-2.0 in the libgnomevfs2-0 package. + + 04_moniker_libexecdir.patch: use the moniker in this place. + - This makes libgnomevfs2-common architecture-independent. + * Split the bzip2, dns-sd and samba modules in a separate + libgnomevfs2-extra package (closes: #344601). + * 05_gnomevfs-ls.patch: stolen upstream. Reports correct sizes for + files larger than 4 GB (closes: #325383). + * defaults.list: update to MIME types supported by GNOME 2.12 + applications. + * Standards-version is 3.6.2. + * Pass --as-needed to the linker to avoid unnecessary dependencies. + + -- Josselin Mouette Wed, 11 Jan 2006 00:26:15 +0100 + +gnome-vfs2 (2.12.2-3) unstable; urgency=low + + * Make libgnomevfs2-common depend on ${misc:Depends} instead of a too old + gconf version (closes: #346407). + + -- Josselin Mouette Sat, 7 Jan 2006 19:10:00 +0100 + +gnome-vfs2 (2.12.2-2) unstable; urgency=low + + * Upload to unstable + + -- Sjoerd Simons Thu, 5 Jan 2006 22:54:50 +0100 + +gnome-vfs2 (2.12.2-1) experimental; urgency=low + + * New upstream release + * Build against dbus 0.60 + + -- Sjoerd Simons Fri, 16 Dec 2005 15:26:50 +0100 + +gnome-vfs2 (2.12.1.1-1) experimental; urgency=low + + * New upstream version: + - fix the build issue with the current samba version (Closes: #335214). + + -- Sebastien Bacher Mon, 24 Oct 2005 14:11:32 +0200 + +gnome-vfs2 (2.12.0-1) experimental; urgency=low + + * New upstream release + * Disable cdda method. Upstream recommends not shipping it. + * debian/patches/00_gnome-vfs-hal0.5.patch + + Removed. Not needed anymore + * debian/patches/09_pmount.patch + + Removed. Merged upstream + * debian/patches/14_null_volume_crash.patch + + Removed. Fixed upstream + * debian/patches/15_cddb_bufferoverflow.patch + + Removed. Fixed upstream + * debian/patches/16_preserve_timestamps.patch + + Removed. Fixed upstream + * debian/patches/18_cdrom_fallback.patch + + Removed. Fixed upstream + * debian/patches/20_fadvise_linux26.patch + + Removed. Problem has been fixed in libc + * debian/patches/21_kfreebsd_cdrom.patch + + Removed. Fixed upstream + * Sync with ubuntu + + debian/patches/01_fstab_edit_crash.patch + - Updated + + debian/patches/02_get_volume_for_path.patch + - Updated + + -- Sjoerd Simons Tue, 6 Sep 2005 17:19:11 +0200 + +gnome-vfs2 (2.10.1-5hal0) experimental; urgency=low + + * debian/patches/00_gnome-vfs-hal0.5.patch + + Make gnome-vfs work with the hal 0.5 API. (From gnome cvs) + * debian/patches/14_null_volume_crash.patch + + Updated + + -- Sjoerd Simons Tue, 21 Jun 2005 18:57:02 +0000 + +gnome-vfs2 (2.10.1-5) unstable; urgency=medium + + * 20_fadvise_linux26.patch: ugly hack to use fadvise only on Linux 2.6 + (closes: #314484). + * Patch from Robert Millan to build on kFreeBSD + (closes: #266699): + + don't build-depend on HAL and cdparanoia, + + 21_kfreebsd_cdrom.patch: changes for CDROM support. + + -- Josselin Mouette Fri, 17 Jun 2005 22:25:35 +0200 + +gnome-vfs2 (2.10.1-4) unstable; urgency=low + + * Sjoerd Simons: + - Upload to unstable + - debian/patches/16_preserve_timestamps.patch + + Added. Restore preservation of atime, mtime and permissions broken by + the setgid patch. (Patch from gnome CVS) + * Josselin Mouette: + - defaults.list: + + Make evince the default for PDF files. + + Add new mime types supported in GNOME 2.10. + + -- Sjoerd Simons Tue, 7 Jun 2005 01:02:31 +0200 + +gnome-vfs2 (2.10.1-3) experimental; urgency=low + + * debian/patches/15_cddb_bufferoverflow.patch + - check the number of returned matches agains the maximum size to avoid + overflowing the buffer. (CAN-2005-0706, Closes: #305072) + * Allow building on the hurd. Thanks to Michael Banck for providing patches + (Closes: #301258) + - Disable samba and don't enable ipv6 and the hal backend on the hurd. + - debian/patches/18_cdrom_fallback.patch + + Fallback to giving no info about cdrom status if the operating system + doesn't support it. + - debian/patches/19_hurd_path_max.patch + + Handle the missing of PATH_MAX definition on the hurd + + -- Sjoerd Simons Mon, 2 May 2005 18:24:00 +0200 + +gnome-vfs2 (2.10.1-2) experimental; urgency=low + + * [debian/defaults.list] Sort by .desktop file, then by MIME type. + Default to OpenOffice.org itself for application/vnd.sun.xml.calc.template + and application/vnd.sun.xml.calc rather than gnumeric. (See #307090) + * [debian/control.in] Corrected section for libgnomevfs2-common to "libs". + (Closes: #305609) + + -- J.H.M. Dassen (Ray) Sun, 1 May 2005 15:13:52 +0200 + +gnome-vfs2 (2.10.1-1) experimental; urgency=low + + * New upstream release. + + -- Sjoerd Simons Mon, 11 Apr 2005 22:31:39 +0200 + +gnome-vfs2 (2.10.0-1) experimental; urgency=low + + * New upstream release + - Fixes "invalid parameters" error when copying to a floppy + (Closes: #220457) + * debian/paches//03_usr_share_gnome_applications.patch + - Updated for new upstream + * Vfolders aren't used anymore, removed patches related to them: + - debian/patches/01_exclude-sound-properties.patch + - debian/patches/15_no_kde_in_menu.patch + * Removed patches for things fixed upstream: + - debian/patches/04_mime_info_search_parent_types.patch + - debian/patches/10_fix_eject.patch + - debian/patches/14_libhttp_64.patch + - debian/patches/16_honor_dir_setgid.patch + - debian/patches/17_gnome_vfs_daemon_deadlock.patch + * Build the tar and cdda methods + * Enable hal support (Closes: #298923) + * Updated watch file + * debian/patches/01_fstab_edit_crash.patch + - Added, fix crash of gnome-vfs-daemon when editing /etc/fstab (from the + ubuntu package) + * debian/patches/14_null_volume_crash.patch + - Added, gnome_vfs_hal_mounts_modify_drive(): Check that the hal volume is + not NULL before calling hal functions on it. (from the ubuntu package) + * Added a version with debugging symbols (Closes: #264117) + + -- Sjoerd Simons Tue, 22 Mar 2005 21:00:40 +0100 + +gnome-vfs2 (2.8.4-2) unstable; urgency=high + + * Remove howl depends from control.in instead of just control. + All howl depends are now really gone (Closes: #295775) + + -- Sjoerd Simons Mon, 28 Feb 2005 12:53:34 +0100 + +gnome-vfs2 (2.8.4-1) unstable; urgency=medium + + * Sebastien Bacher: + - debian/control.in: + + libgnomevfs2-common Depends on desktop-file-utils. (Closes: #286728) + * Sjoerd Simons: + - New upstream release + - Don't use howl anymore because of license issues (Closes: #295775) + - debian/patches/04_mime_info_search_parent_types.patch + + Updated. + - debian/patches/09_pmount.patch: + + Updated. Mount by mount point again (Closes: #288174) + + -- Sjoerd Simons Wed, 23 Feb 2005 16:49:44 +0100 + +gnome-vfs2 (2.8.3-11) unstable; urgency=low + + * debian/patches/17_gnome_vfs_daemon_deadlock.patch + - Fix possible deadlock when calling gnome_vfs_get_volume_monitor + (patch from gnome cvs) + + -- Sjoerd Simons Mon, 31 Jan 2005 15:23:36 +0100 + +gnome-vfs2 (2.8.3-10) unstable; urgency=low + + * debian/patches/16_honor_dir_setgid.patch + - Honor setgid bit set on directories (Closes: #286346) + + -- Sjoerd Simons Tue, 25 Jan 2005 15:09:11 +0100 + +gnome-vfs2 (2.8.3-9) unstable; urgency=low + + * debian/patches/15_no_kde_in_menu.patch: + - don't show kde items in the gnome menu (Closes: #289650) + + -- Sjoerd Simons Sat, 15 Jan 2005 17:22:40 +0100 + +gnome-vfs2 (2.8.3-8) unstable; urgency=medium + + * debian/patches/14_libhttp_64.patch: + - patch from David Mosberger-Tang to fix a + crasher on 64bits archs (Closes: #285726). + + -- Sebastien Bacher Sat, 8 Jan 2005 13:00:05 +0100 + +gnome-vfs2 (2.8.3-7) unstable; urgency=low + + * debian/control.in: + - re-enable HOWL support, using libhowl-dev (>= 0.9.8). + - make the libsmbclient-dev build-dep unversioned again. + * debian/libgnomevfs2.shlibs: bump to 2.8.3-7 for libhowl. + + -- Jordi Mallach Sun, 26 Dec 2004 02:31:23 +0100 + +gnome-vfs2 (2.8.3-6) unstable; urgency=low + + * debian/patches/03_usr_share_gnome_applications.patch: read defaults.list + from /usr/share/gnome/applications as well, to allow having a + GNOME-specific defaults.list. + * debian/defaults.list: include defaults list. + * debian/libgnomevfs2-common.{links,install}: install it. + * debian/patches/04_mime_info_search_parent_types.patch: search parent types + when looking for the default, not only when getting all types. + + -- Josselin Mouette Thu, 25 Nov 2004 23:14:25 +0100 + +gnome-vfs2 (2.8.3-5) unstable; urgency=low + + * debian/control.in: make libgnomevfs2-common conflict + libgnome (<< 2.8.0-5) due to a gconf schema registration issue + (closes: #282720). + + -- Jordi Mallach Wed, 24 Nov 2004 23:16:47 +0100 + +gnome-vfs2 (2.8.3-4) unstable; urgency=low + + * Apply two patches from Ubuntu on Sjoerd's request: + - debian/patches/10_fix_eject.patch: eject media after unmounting it. + - debian/patches/13_resolve_fstab_symlinks.patch: resolve mount point + symlinks when reading /etc/fstabs. + * debian/control.in: bump libsmbclient build-dep to >= 3.0.8-2 + temporarily, to avoid libgnomevfs2 being built without smb browsing + support in alpha. + + -- Jordi Mallach Wed, 24 Nov 2004 00:55:54 +0100 + +gnome-vfs2 (2.8.3-3) experimental; urgency=low + + * Applied the patches for the pmount interoperability (Closes: #281887) + (patches sent by Sjoerd Simons ) + * debian/patches/09_pmount.patch: + - use pumount for unmounting if available. + * debian/patches/12_user_visible_drives.patch: + - makes everything under /media user-visible. + + -- Sebastien Bacher Sat, 20 Nov 2004 00:14:58 +0100 + +gnome-vfs2 (2.8.3-2) unstable; urgency=low + + * GNOME team upload. + * Upload to unstable. + * debian/control.in: revert all howl related changes for now while some + problems with libhowl0 are resolved. + + -- Jordi Mallach Thu, 18 Nov 2004 16:56:24 +0100 + +gnome-vfs2 (2.8.3-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + - libgnomevfs2-dev depends on libhowl-dev (Closes: #278651). + + -- Sebastien Bacher Thu, 4 Nov 2004 15:04:06 +0100 + +gnome-vfs2 (2.8.2-2) experimental; urgency=low + + * GNOME team upload. + * debian/control.in: add libhowl-dev (>= 0.9.6) to build-depends. + + -- Jordi Mallach Thu, 14 Oct 2004 18:01:12 +0200 + +gnome-vfs2 (2.8.2-1) experimental; urgency=low + + * New upstream release. + * [debian/watch] Updated. + + -- J.H.M. Dassen (Ray) Mon, 11 Oct 2004 18:01:27 +0200 + +gnome-vfs2 (2.8.1-1) experimental; urgency=low + + * New upstream release. + * [debian/control.in] Tightened gconf dependencies (which already were for + an experimental version) to the current version in experimental. + + -- J.H.M. Dassen (Ray) Tue, 21 Sep 2004 18:03:52 +0200 + +gnome-vfs2 (2.8.0-1) experimental; urgency=low + + * GNOME team upload. + * New upstream release. + * debian/control.in: + - remove build-deps on dbus-1-dev, libhal-dev and libexpat1-dev + as we're not enabling hal for now. + - remove bogus gnome-common build-dep as well. + * debian/libgnomevfs2-0.shlibs, debian/shlibs.local: bump to 2.8.0. + * debian/patches/00_enable_gnome-vfs-ssl_with_gnutls.patch: remove broken + patch which should have never been there. + * debian/patches/03_browser_mode_lock.patch: removed, included upstream. + + -- Jordi Mallach Tue, 14 Sep 2004 19:25:55 +0200 + +gnome-vfs2 (2.7.91-3) experimental; urgency=low + + * GNOME team upload. + * debian/control.in: + - tighten things a bit for the shared-mime-info transition: + libgnomevfs2-common depends on shared-mime-info and conflicts + nautilus (<< 2.7.2). + - clean up descriptions. + * debian/libgnomevfs2-0.shlibs, debian/shlibs.local: bump to 2.7.91. + + -- Jordi Mallach Fri, 27 Aug 2004 14:44:26 +0200 + +gnome-vfs2 (2.7.91-2) experimental; urgency=low + + * GNOME team upload. + * debian/patches/03_browser_mode_lock.patch: patch from CVS to fix + nautilus hangs in file browser mode. + * debian/rules: disable hal for now, seems to cause some oddities. + + -- Jordi Mallach Thu, 19 Aug 2004 21:00:11 +0200 + +gnome-vfs2 (2.7.91-1) experimental; urgency=low + + * GNOME team upload. + * New upstream development release. + * debian/control.in: add build-depends on libhal-dev (>= 0.2.92), + dbus-glib-1-dev (>= 0.21) and libexpat1-dev. + * debian/rules: configure with --enable-hal. + + -- Jordi Mallach Tue, 17 Aug 2004 15:29:41 +0200 + +gnome-vfs2 (2.7.90-1) experimental; urgency=low + + * New upstream development release. + * [debian/control.in] Switch to gnutls11. + + -- J.H.M. Dassen (Ray) Wed, 11 Aug 2004 23:31:30 +0200 + +gnome-vfs2 (2.7.2-1) experimental; urgency=low + + * GNOME Team Upload. + * New (development) upstream release. + + -- Marc 'HE' Brockschmidt Sat, 19 Jun 2004 21:46:33 +0200 + +gnome-vfs2 (2.6.1.1-3) unstable; urgency=low + + * Upload to unstable + + -- Takuo KITAME Wed, 26 May 2004 14:20:10 +0900 + +gnome-vfs2 (2.6.1.1-2) experimental; urgency=low + + * debian/patches/get_volume_for_path.patch: + + Check the returned volume actually contains the asked path. This avoids + incorrectly returning bind mounts, like it happens when using udev + (closes: #242728). + * debian/rules: + + Remove support for cdda, extfs, nntp, tar and vfs-pipe methods, + all broken. Accidentally fixes crash when trying tar:// URIs + (closes: #157322). + + Don't run dh_makeshlibs on libgnomevfs2-common. + * debian/control.in: + + Removed unuseful build-dependency on automake1.7, and unuseful + build-conflict with libcdparanoia0-dev (now we remove libcdda at + install time). + * debian/libgnomevfs2-common.install: + + Don't install .a and .la files. + * Renamed postrm to libgnomevfs2-common.postrm. + * libgnomevfs2-common.postinst: removed, dh_gconf handles it now. + + -- Josselin Mouette Fri, 23 Apr 2004 17:57:06 +0200 + +gnome-vfs2 (2.6.1.1-1) experimental; urgency=low + + * New upstream release. + * GNOME Team Upload. + + -- Sebastien Bacher Tue, 20 Apr 2004 21:04:21 +0200 + +gnome-vfs2 (2.6.1-1) experimental; urgency=low + + * New upstream release. + * GNOME Team Upload. + * debian/patches/gnome-vfs-ssl.c.patch + + removed since included in new version. + * debian/patches/ssh-pass-fix.patch: + + same here. + + -- Sebastien Bacher Mon, 19 Apr 2004 19:40:04 +0200 + +gnome-vfs2 (2.6.0-5) experimental; urgency=low + + * debian/patches/ssh-pass-fix.patch: + + patch from CVS to fix ssh:// and sftp:// problems with nautilus. + + -- Sebastien Bacher Thu, 15 Apr 2004 22:00:06 +0200 + +gnome-vfs2 (2.6.0-4) experimental; urgency=low + + * Included again gnomevfs-* utilities. + + -- Sebastien Bacher Sat, 3 Apr 2004 00:06:31 +0200 + +gnome-vfs2 (2.6.0-3) experimental; urgency=low + + * GNOME team upload. + * debian/control.in: + - set the section of libgnomevfs2-common to devel. + - replace libgnome2-common (<< 2.6.0), due to conflicting schema file + (closes: #240258). + * debian/libgnomevfs2-0.shlibs: added. + * debian/shlibs.local: updated for 2.6.0. + + -- Jordi Mallach Sun, 28 Mar 2004 17:13:46 +0200 + +gnome-vfs2 (2.6.0-2) experimental; urgency=low + + * J.H.M. Dassen (Ray): + - [debian/control.in] Set the section of the -dev package to libdevel. + * Jordi Mallach: + - [debian/control.in] + + Add libsmbclient-dev to build-depends to build the smb module. + + Add Conflicts and Replaces on gnome-vfs-extras2 and gnome-vfs-sftp + to libgnomevfs2-common (closes: #240141). + + Drop the gnome-vfs-extras2 suggestion. + + Make libgnomevfs2-common replace the 2.4 version of libgnomevfs2-dev. + - [debian/rules] Configure with --disable-openssl and --enable-ipv6. + + -- Jordi Mallach Fri, 26 Mar 2004 23:11:06 +0100 + +gnome-vfs2 (2.6.0-1) experimental; urgency=low + + * New upstream release. + + -- Ondřej Surý Thu, 25 Mar 2004 16:18:25 +0100 + +gnome-vfs2 (2.4.1-5) unstable; urgency=low + + * debian/patches/panel-crash: + + new patch to fix the gnome-panel's crash with some recently-used files + (Closes: #230903, #231005). + * NMU acknowledge (Closes: #225303). + + -- Sebastien Bacher Mon, 8 Mar 2004 18:57:38 +0100 + +gnome-vfs2 (2.4.1-4.1) unstable; urgency=high + + * Fix FTBFS with newer gnome-common, automake: (Closes: #225303) + * [debian/control.in] Build-Depends: automake1.7 instead of Build-Conflicts. + * [debian/patches/newer-automakes] New. Fix build problems with + automake1.7. + (Upstream gnome-2-4 CVS already has half of this patch; see + http://bugzilla.gnome.org/show_bug.cgi?id=124725) + + -- J.H.M. Dassen (Ray) Sun, 28 Dec 2003 21:50:11 +0100 + +gnome-vfs2 (2.4.1-4) unstable; urgency=low + + * Really fix the Depends this time (Closes: #216720). + * Workaround for the "-pthread" in .la file problem (Closes: #217359). + + -- Sebastien Bacher Fri, 24 Oct 2003 16:14:24 +0200 + +gnome-vfs2 (2.4.1-3) unstable; urgency=low + + * Removed libbonobo-activation-dev from Depends (Closes: #216720). + + -- Sebastien Bacher Wed, 22 Oct 2003 02:17:19 +0200 + +gnome-vfs2 (2.4.1-2) unstable; urgency=low + + * Fix Build-Depends : liborbit2-dev (2.8.0, should be 1:2.8.0). + + -- Sebastien Bacher Sat, 18 Oct 2003 03:00:14 +0200 + +gnome-vfs2 (2.4.1-1) unstable; urgency=low + + * New upstream release + * GNOME Team upload + * Conflicts on automake1.6/1.7 due to a ssl error. + + -- Sebastien Bacher Wed, 15 Oct 2003 21:53:08 +0200 + +gnome-vfs2 (2.2.5-5) unstable; urgency=low + + * Reverted to 'Recommends: fam' from 'Depends' (closes: #214088) + * Fix postinst (closes: #214065, #214127) + + -- Takuo KITAME Mon, 6 Oct 2003 10:44:47 +0900 + +gnome-vfs2 (2.2.5-4) unstable; urgency=low + + * -common: Depends on gconf2 (closes: #212854) + * -common: Fix Duplicate relation to libgnomevfs2-0 (closes: #199271) + * lib: Depends: fam (closes: #208722) + * Applied patch to fix build problem (closes: #204943) + * Build-Conflicts: libcdparanoia0-dev + + -- Takuo KITAME Thu, 2 Oct 2003 12:38:31 +0900 + +gnome-vfs2 (2.2.5-3) unstable; urgency=low + + * Build against libgnutls7 (closes: #201746) + + -- Takuo KITAME Tue, 22 Jul 2003 11:09:40 +0900 + +gnome-vfs2 (2.2.5-2) unstable; urgency=low + + * -dev: versioned conflicts with -common (closes: #197379) + * libgnomevfs2-0: Depends on -common (>= ${Source-Version})(closes: #197327) + + -- Takuo KITAME Mon, 16 Jun 2003 10:46:43 +0900 + +gnome-vfs2 (2.2.5-1) unstable; urgency=low + + * New upstream release + * install all header files which is needed. (closes: #178065, #177612) + * register gconf schema in postinst (closes: #183658) + * fix dangling symlink in /usr/share/gtk-doc/html (closes: #184004) + * This release includes GNU Hurd build-fix patch (closes: #187457) + * change Dependency tree, add -common in .shlibs instead (closes: #182678) + + -- Takuo KITAME Fri, 13 Jun 2003 14:50:50 +0900 + +gnome-vfs2 (2.2.3-2) unstable; urgency=low + + * --enable-gnutls + + -- Takuo KITAME Wed, 19 Mar 2003 17:50:08 +0900 + +gnome-vfs2 (2.2.3-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 18 Mar 2003 14:52:31 +0900 + +gnome-vfs2 (2.2.2-2) unstable; urgency=low + + * --disable-gtk-doc (closes: #180979) + * enable GNUTLS support, again. + + -- Takuo KITAME Fri, 14 Feb 2003 22:10:03 +0900 + +gnome-vfs2 (2.2.2-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 13 Feb 2003 01:24:42 +0900 + +gnome-vfs2 (2.2.0-2) unstable; urgency=low + + * libgnomevfs2-0 Depends on versioned -common (closes: #178340, #176555) + + -- Takuo KITAME Tue, 28 Jan 2003 15:15:39 +0900 + +gnome-vfs2 (2.2.0-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 22 Jan 2003 11:46:20 +0900 + +gnome-vfs2 (2.1.91-2) unstable; urgency=low + + * remove gnutls patch. (close: #177333, #177422) + * Suggests extras2 instead of modules2 (closes: #177384) + + -- Takuo KITAME Mon, 20 Jan 2003 10:51:21 +0900 + +gnome-vfs2 (2.1.91-1) unstable; urgency=low + + * New upstream release (closes: #176871) + * Suggests: gnome-vfs-modules2 (closes: #176361) + * remove unneeded vfolder-info files (closes: #170087, #168613, #175824, #168182) + + -- Takuo KITAME Fri, 17 Jan 2003 12:28:55 +0900 + +gnome-vfs2 (2.0.4.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 14 Jan 2003 13:22:31 +0900 + +gnome-vfs2 (2.0.4-4) unstable; urgency=low + + * preinst remove /etc/gnome-vfs-2.0/vfolders/applications.vfolder-info (closes: #159910, #163591) + + -- Takuo KITAME Fri, 15 Nov 2002 15:40:25 +0900 + +gnome-vfs2 (2.0.4-3) unstable; urgency=low + + * Recommends: fam (closes: #157989) + * Remove /etc/gnome-vfs-2.0/vfolders/applications.vfolder-info (closes: #159910) + * Change Maintainer address to @debian.org + + -- Takuo KITAME Mon, 28 Oct 2002 16:14:08 +0900 + +gnome-vfs2 (2.0.4-2) unstable; urgency=low + + * debian/rules: recompile libvfolder-desktop.so in install rule. + (closes: #160088) + * add sound-properties.desktop in applications.vfolder-info (closes: #158344) + + -- Takuo KITAME Thu, 17 Oct 2002 15:32:01 +0900 + +gnome-vfs2 (2.0.4-1) unstable; urgency=low + + * New upstream release + * Maintainer upload (closes: #158457) + Thanks NMU of Dassen. + + -- Takuo KITAME Thu, 5 Sep 2002 13:49:28 +0900 + +gnome-vfs2 (2.0.2-7.1) unstable; urgency=low + + * Non-maintainer upload. + * Follow GNUTLS packages changes: (Closes: #158457) + * libgnutls-dev -> libgnutls5-dev + * Tightened libgnutls5-dev dependencies to the latest version. + + -- J.H.M. Dassen (Ray) Tue, 27 Aug 2002 13:20:42 +0200 + +gnome-vfs2 (2.0.2-7) unstable; urgency=low + + * realy fix #151524 and #157122 (closes: #151524, #157122) + + -- Takuo KITAME Mon, 19 Aug 2002 08:55:42 +0900 + +gnome-vfs2 (2.0.2-6) unstable; urgency=low + + * Maintainer upload. + Thanks for NMU fixing. (closes: #151524, #157122) + + -- Takuo KITAME Mon, 19 Aug 2002 05:33:36 +0900 + +gnome-vfs2 (2.0.2-5.0.1) unstable; urgency=high + + * Rebuild so as to not lose method modules. + + -- Colin Walters Sun, 18 Aug 2002 00:25:21 -0400 + +gnome-vfs2 (2.0.2-5) unstable; urgency=low + + * patches: modified configure.in, acconfig.h for GNUTLS + Use AM_PATH_LIBGNUTLS. (closes: #156668) + * debian/rules: call autogen.sh + * debian/control: build depends on gnome-common + + -- Takuo KITAME Fri, 16 Aug 2002 15:22:57 +0900 + +gnome-vfs2 (2.0.2-4) unstable; urgency=low + + * Fix dependency with bonobo-activation... + + -- Takuo KITAME Wed, 14 Aug 2002 22:19:03 +0900 + +gnome-vfs2 (2.0.2-3) unstable; urgency=low + + * build against libgnutls5 0.5.1-4 + * libgnomevfs2-dev Depends on versioned libgnutls-dev and libxml2-dev (closes: 156581) + + -- Takuo KITAME Mon, 12 Aug 2002 13:38:11 +0900 + +gnome-vfs2 (2.0.2-2) unstable; urgency=low + + * Build against libgtk2.0-0png3 + + -- Takuo KITAME Thu, 8 Aug 2002 19:33:39 +0900 + +gnome-vfs2 (2.0.2-1) unstable; urgency=low + + * New upstream release + * use GNUTLS instead of openssl (closes: #153642) + + -- Takuo KITAME Fri, 26 Jul 2002 14:01:33 +0900 + +gnome-vfs2 (2.0.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 28 Jun 2002 13:50:55 +0900 + +gnome-vfs2 (2.0.0-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 13 Jun 2002 02:58:21 +0900 + +gnome-vfs2 (1.9.17-2) unstable; urgency=low + + * libgnomevfs2-dev: depends on libssl-dev (closes: #149382) + + -- Takuo KITAME Sun, 9 Jun 2002 01:10:20 +0900 + +gnome-vfs2 (1.9.17-1) unstable; urgency=low + + * New upstream release + * enable ssl support + + -- Takuo KITAME Wed, 5 Jun 2002 17:33:48 +0900 + +gnome-vfs2 (1.9.16-2) unstable; urgency=low + + * debian/rules: fix duplicate build + + -- Takuo KITAME Wed, 5 Jun 2002 11:47:15 +0900 + +gnome-vfs2 (1.9.16-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 28 May 2002 15:30:37 +0900 + +gnome-vfs2 (1.9.15-2) unstable; urgency=low + + * fix build problem on s390 (closes: #144329) + + -- Takuo KITAME Thu, 23 May 2002 21:11:57 +0900 + +gnome-vfs2 (1.9.15-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 9 May 2002 02:08:22 +0900 + +gnome-vfs2 (1.9.14-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 1 May 2002 10:00:11 +0900 + +gnome-vfs2 (1.9.12-2) unstable; urgency=low + + * --without-openssl-includes --without-openssl-libs (closes: #142368) + * Build-Depends: libfam-dev, libcdparanoia0-dev + + -- Takuo KITAME Wed, 24 Apr 2002 13:28:23 +0900 + +gnome-vfs2 (1.9.12-1) unstable; urgency=low + + * New upstream release + * use dbs + * remove /etc/gnome-vfs-2.0 when purge libgnomevfs2-common + + -- Takuo KITAME Tue, 23 Apr 2002 13:35:08 +0900 + +gnome-vfs2 (1.9.11-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 1 Apr 2002 06:25:22 +0900 + +gnome-vfs2 (1.9.10-2) unstable; urgency=low + + * build against glib2.0 + + -- Takuo KITAME Sun, 24 Mar 2002 04:23:02 +0900 + +gnome-vfs2 (1.9.10-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Sun, 10 Mar 2002 17:04:34 +0900 + +gnome-vfs2 (1.9.8-1) unstable; urgency=low + + * New upstream release + * build against libglib1.3-15 + + -- Takuo KITAME Tue, 26 Feb 2002 13:27:57 +0900 + +gnome-vfs2 (1.9.7-4) unstable; urgency=low + + * build against libglib1.3-14 + + -- Takuo KITAME Fri, 22 Feb 2002 20:57:08 +0900 + +gnome-vfs2 (1.9.7-3) unstable; urgency=low + + * fix build-depends (closes: #134983) + + -- Takuo KITAME Thu, 21 Feb 2002 12:59:32 +0900 + +gnome-vfs2 (1.9.7-2) unstable; urgency=low + + * build against libbonobo-activation4 + * update Build-Depends + + -- Takuo KITAME Sun, 17 Feb 2002 14:53:08 +0900 + +gnome-vfs2 (1.9.7-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 14 Feb 2002 11:11:18 +0900 + +gnome-vfs2 (1.9.6-3) unstable; urgency=low + + * Build against new linc and ORBit2 + + -- Takuo KITAME Mon, 11 Feb 2002 22:42:49 +0900 + +gnome-vfs2 (1.9.6-2) unstable; urgency=low + + * Build against libgconf2-4 + * Build-Depends: libgconf2-dev (>= 1.1.7-2) + + -- Takuo KITAME Fri, 8 Feb 2002 05:16:58 +0900 + +gnome-vfs2 (1.9.6-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 6 Feb 2002 01:17:13 +0900 + +gnome-vfs2 (1.9.5-1) unstable; urgency=low + + * New upstream release + * build against libglib1.3-13 + * Update Build-Depens + + -- Takuo KITAME Sun, 3 Feb 2002 23:36:05 +0900 + +gnome-vfs2 (1.9.4-4) unstable; urgency=low + + * libgnomevfs2-dev: Depends on libbonobo-activation-dev (closes: #129780) + + -- Takuo KITAME Fri, 18 Jan 2002 18:22:20 +0000 + +gnome-vfs2 (1.9.4-3) unstable; urgency=low + + * libgnomevfs/gnome-vfs-job.c: + - use gsize instead of size_t (closes: #127781) + + -- Takuo KITAME Wed, 9 Jan 2002 07:31:18 +0000 + +gnome-vfs2 (1.9.4-2) unstable; urgency=low + + * build against latest libraries. + * update Build-Depends + + -- Takuo KITAME Tue, 8 Jan 2002 10:08:54 +0000 + +gnome-vfs2 (1.9.4-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 2 Jan 2002 10:46:40 +0000 + +gnome-vfs2 (1.9.3-3) unstable; urgency=low + + * Build against glib1.3.11 + * fix glib-object.h problem + + -- Takuo KITAME Thu, 6 Dec 2001 19:39:45 +0000 + +gnome-vfs2 (1.9.3-2) unstable; urgency=low + + * Fix build-depends (closes: #121370) + + -- Takuo KITAME Tue, 27 Nov 2001 16:22:01 +0000 + +gnome-vfs2 (1.9.3-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Sat, 10 Nov 2001 17:23:40 +0000 + +gnome-vfs2 (1.9.1-1) unstable; urgency=low + + * New upstream release for GNOME2 + * change package name gnome-vfs2, libgnomevfs2-$(SONAME), libgnomevfs2-dev + + -- Takuo KITAME Tue, 30 Oct 2001 12:43:37 +0000 + +gnome-vfs (1.0.3-2) unstable; urgency=low + + * include libgnome-vfs-pthread.so (closes: #115743) + + -- Takuo KITAME Tue, 16 Oct 2001 18:08:46 +0900 + +gnome-vfs (1.0.3-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 15 Oct 2001 12:55:58 +0900 + +gnome-vfs (1.0.2-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 19 Sep 2001 08:29:08 +0900 + +gnome-vfs (1.0.1-3) unstable; urgency=low + + * update config.{guess.sub} (closes: Bug#103692) + + -- Takuo KITAME Sun, 8 Jul 2001 19:17:22 +0900 + +gnome-vfs (1.0.1-2) unstable; urgency=low + + * Added ttc as TrueTypeFont into mime data. + + -- Takuo KITAME Thu, 17 May 2001 10:15:49 +0900 + +gnome-vfs (1.0.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 9 May 2001 06:36:18 +0900 + +gnome-vfs (1.0-4) unstable; urgency=low + + * closes: Bug#95149: libgnome-vfs0: Build against unknow package + + -- Takuo KITAME Wed, 25 Apr 2001 08:10:54 +0900 + +gnome-vfs (1.0-3) unstable; urgency=low + + * rebuild with libgnome-dev (1.2.13-5) + * Fix #94050: libgnome-vfs0: Unneeded INSTALL file (closes: Bug#94050) + + -- Takuo KITAME Wed, 25 Apr 2001 02:34:47 +0900 + +gnome-vfs (1.0-2) unstable; urgency=low + + * Build-Depends: libgnome-dev (>= 1.2.13-1) (closes: Bug#90538) + + -- Takuo KITAME Thu, 22 Mar 2001 12:52:06 +0900 + +gnome-vfs (1.0-1) unstable; urgency=low + + * New upstream release + * libgdk-pixbuf is not needed now. (closes: #89279) + + -- Takuo KITAME Wed, 14 Mar 2001 12:26:56 +0900 + +gnome-vfs (0.6.2-2) unstable; urgency=low + + * fixed Build-Dpeneds (closes: Bug#89279) + * fix #88290: Please move control-center capplet to Documents sub-dir (closes: Bug#88290) + + -- Takuo KITAME Tue, 13 Mar 2001 20:11:29 +0900 + +gnome-vfs (0.6.2-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 28 Feb 2001 14:55:12 +0900 + +gnome-vfs (0.5-1.1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 1 Feb 2001 13:28:50 +0900 + +gnome-vfs (0.4.2-2) unstable; urgency=low + + * debian/control.in: Build-Depends (cloese: Bug#77626) + + -- Takuo KITAME Wed, 22 Nov 2000 09:05:26 +0900 + +gnome-vfs (0.4.2-1) unstable; urgency=low + + * New upstream release (closes: Bug#76519) + + -- Takuo KITAME Wed, 8 Nov 2000 12:06:54 +0900 + +gnome-vfs (0.4.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Sun, 5 Nov 2000 12:52:02 +0900 + +gnome-vfs (0.3.1-1) unstable; urgency=low + + * Initial Release. + + -- Takuo KITAME Mon, 16 Oct 2000 09:47:42 +0900 + + --- gnome-vfs-2.24.0.orig/debian/libgnomevfs2-0.install +++ gnome-vfs-2.24.0/debian/libgnomevfs2-0.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/libgnomevfs-2.so.* +debian/tmp/usr/lib/gnome-vfs-2.0/gnome-vfs-daemon +debian/tmp/usr/lib/gnome-vfs-2.0/modules/lib{network,file,tar,computer,gzip,vfs-test,sftp,dns-sd}.so --- gnome-vfs-2.24.0.orig/debian/watch +++ gnome-vfs-2.24.0/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/([\d\.]+)[02468]/ \ + gnome-vfs-(.*)\.tar\.gz \ + debian uupdate --- gnome-vfs-2.24.0.orig/debian/defaults.list +++ gnome-vfs-2.24.0/debian/defaults.list @@ -0,0 +1,246 @@ +[Default Applications] +application/rtf=abiword.desktop +application/x-abiword=abiword.desktop +text/abiword=abiword.desktop +text/richtext=abiword.desktop +text/rtf=abiword.desktop +application/x-devhelp=devhelp.desktop +application/x-dia-diagram=dia.desktop +image/bmp=eog.desktop +image/gif=eog.desktop +image/jpeg=eog.desktop +image/jpg=eog.desktop +image/pjpeg=eog.desktop +image/png=eog.desktop +image/svg+xml=eog.desktop +image/tiff=eog.desktop +image/x-bmp=eog.desktop +image/x-gray=eog.desktop +image/x-icb=eog.desktop +image/x-ico=eog.desktop +image/x-pcx=eog.desktop +image/x-png=eog.desktop +image/x-portable-anymap=eog.desktop +image/x-portable-bitmap=eog.desktop +image/x-portable-graymap=eog.desktop +image/x-portable-pixmap=eog.desktop +image/x-xbitmap=eog.desktop +image/x-xpixmap=eog.desktop +image/vnd.wap.wbmp=eog.desktop +image/g3fax=gimp.desktop +image/x-compressed-xcf=gimp.desktop +image/x-fits=gimp.desktop +image/x-psd=gimp.desktop +image/x-sgi=gimp.desktop +image/x-sun-raster=gimp.desktop +image/x-tga=gimp.desktop +image/x-xcf=gimp.desktop +image/x-xwindowdump=gimp.desktop +application/xhtml+xml=epiphany.desktop +text/html=epiphany.desktop +text/xml=epiphany.desktop +application/pdf=evince.desktop +application/x-bzpdf=evince.desktop +application/x-gzpdf=evince.desktop +application/postscript=evince.desktop +application/x-bzpostscript=evince.desktop +application/x-gzpostscript=evince.desktop +image/x-eps=evince.desktop +image/x-bzeps=evince.desktop +image/x-gzeps=evince.desktop +application/x-dvi=evince.desktop +application/x-bzdvi=evince.desktop +application/x-gzdvi=evince.desktop +image/vnd.djvu=evince.desktop +application/x-cbr=evince.desktop +application/x-cbz=evince.desktop +application/x-7z-compressed=file-roller.desktop +application/x-ar=file-roller.desktop +application/x-arj=file-roller.desktop +application/x-bzip=file-roller.desktop +application/x-bzip-compressed-tar=file-roller.desktop +application/x-cd-image=file-roller.desktop +application/x-compress=file-roller.desktop +application/x-compressed-tar=file-roller.desktop +application/x-cpio=file-roller.desktop +application/x-deb=file-roller.desktop +application/x-ear=file-roller.desktop +application/x-gtar=file-roller.desktop +application/x-gzip=file-roller.desktop +application/x-jar=file-roller.desktop +application/x-java-archive=file-roller.desktop +application/x-lha=file-roller.desktop +application/x-lhz=file-roller.desktop +application/x-lzma=file-roller.desktop +application/x-lzma-compressed-tar=file-roller.desktop +application/x-lzop=file-roller.desktop +application/x-rar=file-roller.desktop +application/x-rar-compressed=file-roller.desktop +application/x-rpm=file-roller.desktop +application/x-tar=file-roller.desktop +application/x-war=file-roller.desktop +application/x-zip=file-roller.desktop +application/x-zip-compressed=file-roller.desktop +application/x-zoo=file-roller.desktop +application/zip=file-roller.desktop +multipart/x-zip=file-roller.desktop +text/plain=gedit.desktop +application/x-font-ttf=gnome-font-viewer.desktop +application/x-font-pcf=gnome-font-viewer.desktop +application/x-font-type1=gnome-font-viewer.desktop +application/x-font-otf=gnome-font-viewer.desktop +application/csv=gnumeric.desktop +application/excel=gnumeric.desktop +application/msexcel=gnumeric.desktop +application/tab-separated-values=gnumeric.desktop +application/vnd.lotus-1-2-3=gnumeric.desktop +application/vnd.ms-excel=gnumeric.desktop +application/x-123=gnumeric.desktop +application/x-applix-spreadsheet=gnumeric.desktop +application/x-dos_ms_excel=gnumeric.desktop +application/x-excel=gnumeric.desktop +application/x-gnumeric=gnumeric.desktop +application/x-mps=gnumeric.desktop +application/x-ms-excel=gnumeric.desktop +application/x-msexcel=gnumeric.desktop +application/x-oleo=gnumeric.desktop +application/x-planperfect=gnumeric.desktop +application/x-quattropro=gnumeric.desktop +application/x-sc=gnumeric.desktop +application/x-sylk=gnumeric.desktop +application/x-xbase=gnumeric.desktop +application/x-xls=gnumeric.desktop +application/xls=gnumeric.desktop +text/comma-separated-values=gnumeric.desktop +text/csv=gnumeric.desktop +text/spreadsheet=gnumeric.desktop +text/tab-separated-values=gnumeric.desktop +text/x-comma-separated-values=gnumeric.desktop +zz-application/zz-winassoc-xls=gnumeric.desktop +application/vnd.oasis.opendocument.spreadsheet=ooo-calc.desktop +application/vnd.oasis.opendocument.spreadsheet-template=ooo-calc.desktop +application/vnd.sun.xml.calc=ooo-calc.desktop +application/vnd.sun.xml.calc.template=ooo-calc.desktop +application/vnd.stardivision.calc=ooo-calc.desktop +application/vnd.stardivision.chart=ooo-calc.desktop +application/vnd.oasis.opendocument.graphics=ooo-draw.desktop +application/vnd.oasis.opendocument.graphics-template=ooo-draw.desktop +application/vnd.sun.xml.draw=ooo-draw.desktop +application/vnd.sun.xml.draw.template=ooo-draw.desktop +application/vnd.stardivision.draw=ooo-draw.desktop +application/vnd.oasis.opendocument.presentation=ooo-impress.desktop +application/vnd.oasis.opendocument.presentation-template=ooo-impress.desktop +application/vnd.sun.xml.impress=ooo-impress.desktop +application/vnd.sun.xml.impress.template=ooo-impress.desktop +application/vnd.stardivision.impress=ooo-impress.desktop +application/mspowerpoint=ooo-impress.desktop +application/vnd.ms-powerpoint=ooo-impress.desktop +application/vnd.oasis.opendocument.formula=ooo-math.desktop +application/vnd.sun.xml.math=ooo-math.desktop +application/vnd.stardivision.math=ooo-math.desktop +application/vnd.oasis.opendocument.text=ooo-writer.desktop +application/vnd.oasis.opendocument.text-template=ooo-writer.desktop +application/vnd.oasis.opendocument.text-web=ooo-writer.desktop +application/vnd.oasis.opendocument.text-master=ooo-writer.desktop +application/vnd.sun.xml.writer=ooo-writer.desktop +application/vnd.sun.xml.writer.template=ooo-writer.desktop +application/vnd.sun.xml.writer.global=ooo-writer.desktop +application/vnd.stardivision.writer=ooo-writer.desktop +application/msword=ooo-writer.desktop +application/vnd.ms-word=ooo-writer.desktop +application/x-doc=ooo-writer.desktop +application/vnd.wordperfect=ooo-writer.desktop +application/wordperfect=ooo-writer.desktop +application/x-shockwave-flash=swfdec-player.desktop +application/futuresplash=swfdec-player.desktop +application/ogg=totem.desktop +application/ram=totem.desktop +application/sdp=totem.desktop +application/smil=totem.desktop +application/vnd.rn-realmedia=totem.desktop +application/x-extension-m4a=totem.desktop +application/x-extension-mp4=totem.desktop +application/x-flac=totem.desktop +application/x-flash-video=totem.desktop +application/x-matroska=totem.desktop +application/x-netshow-channel=totem.desktop +application/x-ogg=totem.desktop +application/x-quicktime-media-link=totem.desktop +application/x-quicktimeplayer=totem.desktop +application/x-shorten=totem.desktop +application/x-smil=totem.desktop +application/xspf+xml=totem.desktop +audio/3gpp=totem.desktop +audio/ac3=totem.desktop +audio/AMR=totem.desktop +audio/AMR-WB=totem.desktop +audio/basic=totem.desktop +audio/mp4=totem.desktop +audio/mpeg=totem.desktop +audio/mpegurl=totem.desktop +audio/ogg=totem.desktop +audio/vnd.rn-realaudio=totem.desktop +audio/x-ape=totem.desktop +audio/x-flac=totem.desktop +audio/x-it=totem.desktop +audio/x-m4a=totem.desktop +audio/x-matroska=totem.desktop +audio/x-mod=totem.desktop +audio/x-mp3=totem.desktop +audio/x-mpeg=totem.desktop +audio/x-mpegurl=totem.desktop +audio/x-ms-asf=totem.desktop +audio/x-ms-asx=totem.desktop +audio/x-ms-wax=totem.desktop +audio/x-ms-wma=totem.desktop +audio/x-musepack=totem.desktop +audio/x-pn-aiff=totem.desktop +audio/x-pn-au=totem.desktop +audio/x-pn-realaudio=totem.desktop +audio/x-pn-realaudio-plugin=totem.desktop +audio/x-pn-wav=totem.desktop +audio/x-pn-windows-acm=totem.desktop +audio/x-realaudio=totem.desktop +audio/x-real-audio=totem.desktop +audio/x-sbc=totem.desktop +audio/x-scpls=totem.desktop +audio/x-speex=totem.desktop +audio/x-tta=totem.desktop +audio/x-vorbis=totem.desktop +audio/x-wav=totem.desktop +audio/x-wavpack=totem.desktop +image/vnd.rn-realpix=totem.desktop +image/x-pict=totem.desktop +misc/ultravox=totem.desktop +text/google-video-pointer=totem.desktop +text/x-google-video-pointer=totem.desktop +video/3gpp=totem.desktop +video/dv=totem.desktop +video/fli=totem.desktop +video/flv=totem.desktop +video/mp4=totem.desktop +video/mp4v-es=totem.desktop +video/mpeg=totem.desktop +video/msvideo=totem.desktop +video/quicktime=totem.desktop +video/vivo=totem.desktop +video/vnd.divx=totem.desktop +video/vnd.rn-realvideo=totem.desktop +video/vnd.vivo=totem.desktop +video/x-anim=totem.desktop +video/x-avi=totem.desktop +video/x-flc=totem.desktop +video/x-fli=totem.desktop +video/x-flic=totem.desktop +video/x-m4v=totem.desktop +video/x-matroska=totem.desktop +video/x-mpeg=totem.desktop +video/x-ms-asf=totem.desktop +video/x-msvideo=totem.desktop +video/x-ms-wm=totem.desktop +video/x-ms-wmv=totem.desktop +video/x-ms-wmx=totem.desktop +video/x-ms-wvx=totem.desktop +video/x-nsv=totem.desktop +video/x-ogm+ogg=totem.desktop +video/x-theora+ogg=totem.desktop --- gnome-vfs-2.24.0.orig/debian/extra-modules.conf +++ gnome-vfs-2.24.0/debian/extra-modules.conf @@ -0,0 +1,21 @@ +# +# Module configuration file for the GNOME Virtual File System. +# +# Syntax: +# +# ... : +# + +smb: [daemon] libsmb + +bzip2: bzip2 + +ftp: ftp + +http: http + +dav: http + +davs: http + +https: http --- gnome-vfs-2.24.0.orig/debian/libgnomevfs2-extra.install.hurd-i386 +++ gnome-vfs-2.24.0/debian/libgnomevfs2-extra.install.hurd-i386 @@ -0,0 +1 @@ +debian/tmp/usr/lib/gnome-vfs-2.0/modules/lib{bzip2,http,ftp}.so --- gnome-vfs-2.24.0.orig/debian/libgnomevfs2-common.install +++ gnome-vfs-2.24.0/debian/libgnomevfs2-common.install @@ -0,0 +1,4 @@ +debian/tmp/etc/gconf +debian/tmp/etc/gnome-vfs-2.0/modules/default-modules.conf +debian/tmp/usr/share/dbus-1 +debian/tmp/usr/share/locale --- gnome-vfs-2.24.0.orig/debian/copyright +++ gnome-vfs-2.24.0/debian/copyright @@ -0,0 +1,45 @@ +This package was debianized by Takuo KITAME +Mon, 16 Oct 2000 09:47:42 +0900. + +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/ + +Upstream Authors: see the AUTHORS file. + +Copyright for the cdda, sftp and smb modules: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License for more details. + + You should have received a copy of the GNU 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 General +Public License can be found in `/usr/share/common-licenses/GPL'. + + +Copyright for the gnome-vfs library and the rest of the modules: + + 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'. --- gnome-vfs-2.24.0.orig/debian/libgnomevfs2-common.gconf-defaults +++ gnome-vfs-2.24.0/debian/libgnomevfs2-common.gconf-defaults @@ -0,0 +1,3 @@ +/desktop/gnome/url-handlers/http/command "firefox %s" +/desktop/gnome/url-handlers/https/command "firefox %s" +/desktop/gnome/url-handlers/h323/command "ekiga -c %s" --- gnome-vfs-2.24.0.orig/debian/libgnomevfs2-common.preinst +++ gnome-vfs-2.24.0/debian/libgnomevfs2-common.preinst @@ -0,0 +1,30 @@ +#!/bin/sh + +set -e + +rm_conffile() { + PKGNAME="$1" + CONFFILE="$2" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE's/.* //p\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +case "$1" in + install|upgrade) + # The https method is now described in extra-modules.conf + rm_conffile libgnomevfs2-common /etc/gnome-vfs-2.0/modules/ssl-modules.conf + ;; +esac + +#DEBHELPER# --- gnome-vfs-2.24.0.orig/debian/compat +++ gnome-vfs-2.24.0/debian/compat @@ -0,0 +1 @@ +5 --- gnome-vfs-2.24.0.orig/debian/libgnomevfs2-bin.install +++ gnome-vfs-2.24.0/debian/libgnomevfs2-bin.install @@ -0,0 +1 @@ +debian/tmp/usr/bin --- gnome-vfs-2.24.0.orig/debian/libgnomevfs2-extra.preinst +++ gnome-vfs-2.24.0/debian/libgnomevfs2-extra.preinst @@ -0,0 +1,30 @@ +#!/bin/sh + +set -e + +rm_conffile() { + PKGNAME="$1" + CONFFILE="$2" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE's/.* //p\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +case "$1" in + install|upgrade) + # The smb method is now described in extra-modules.conf + rm_conffile libgnomevfs2-extra /etc/gnome-vfs-2.0/modules/smb-module.conf + ;; +esac + +#DEBHELPER# --- gnome-vfs-2.24.0.orig/debian/libgnomevfs2-dev.links +++ gnome-vfs-2.24.0/debian/libgnomevfs2-dev.links @@ -0,0 +1 @@ +usr/share/doc/libgnomevfs2-common/html/ usr/share/gtk-doc/html/gnome-vfs-2.0 --- gnome-vfs-2.24.0.orig/debian/control.in +++ gnome-vfs-2.24.0/debian/control.in @@ -0,0 +1,144 @@ +Source: gnome-vfs +Section: libs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs, + gtk-doc-tools (>= 1.0), + libglib2.0-dev (>= 2.9.3), + libgconf2-dev (>= 2.8.0-1), + libxml2-dev (>= 2.6.0), + libbz2-dev, + libgamin-dev | libfam-dev (>= 2.6.9-4) [!hurd-i386], + libsmbclient-dev [!hurd-i386], + gettext, + debhelper (>= 5.0.13), + zlib1g-dev, + intltool (>= 0.35.0), + gnome-mime-data, + libgnutls-dev (>= 1.0.4-3), + gnome-pkg-tools (>= 0.11.3), + dpkg-dev (>= 1.13.19), + libdbus-glib-1-dev (>= 0.70), + libhal-dev (>= 0.5.7) | not+linux-gnu, + libhal-storage-dev (>= 0.5.7) | not+linux-gnu, + libavahi-client-dev (>= 0.6) [!hurd-i386], + libavahi-glib-dev (>= 0.6) [!hurd-i386], + libselinux1-dev | not+linux-gnu, + libkrb5-dev, + libacl1-dev, + libattr1-dev +Standards-Version: 3.7.3 + +Package: libgnomevfs2-common +Section: libs +Architecture: all +Depends: ${misc:Depends}, + gnome-mime-data, + shared-mime-info +Conflicts: gnome-panel (<< 2.10.0), + libgnomevfs2-0 (<< 2.12.2-4), + libgnomevfs2-extra (<< 1:2.16.3-6) +Description: GNOME Virtual File System (common files) + GNOME VFS is the GNOME virtual file system. It is the foundation of the + Nautilus file manager. It provides a modular architecture and ships with + several modules that implement support for local files, http, ftp and others. + It provides an URI-based API, a backend supporting asynchronous file + operations, a MIME type manipulation library and other features. + . + This package contains the documentation, data files and locales. + +Package: libgnomevfs2-0 +Architecture: any +Depends: ${shlibs:Depends}, + dbus (>= 0.90), + libgnomevfs2-common (>= ${gnome:Version}), + libgnomevfs2-common (<< ${gnome:NextVersion}) +Recommends: libgnomevfs2-extra, gnome-mount, dbus-x11 +Suggests: libgnomevfs2-bin, gamin | fam +Replaces: libgnomevfs2-common (<< 2.12.2-4) +Conflicts: libbonobo2-0 (<< 2.15.0) +Description: GNOME Virtual File System (runtime libraries) + GNOME VFS is the GNOME virtual file system. It is the foundation of the + Nautilus file manager. It provides a modular architecture and ships with + several modules that implement support for local files, http, ftp and others. + It provides an URI-based API, a backend supporting asynchronous file + operations, a MIME type manipulation library and other features. + . + This package contains the runtime libraries, the daemon, and the + default modules. + +Package: libgnomevfs2-bin +Architecture: any +Depends: ${shlibs:Depends} +Replaces: libgnomevfs2-common (<< 2.12.2-4) +Description: GNOME Virtual File System (support binaries) + GNOME VFS is the GNOME virtual file system. It is the foundation of the + Nautilus file manager. It provides a modular architecture and ships with + several modules that implement support for local files, http, ftp and others. + It provides an URI-based API, a backend supporting asynchronous file + operations, a MIME type manipulation library and other features. + . + This package contains some example binaries using the GNOME VFS + library. + +Package: libgnomevfs2-extra +Architecture: any +Depends: ${shlibs:Depends}, + libgnomevfs2-common (>= ${gnome:Version}), + libgnomevfs2-common (<< ${gnome:NextVersion}) +Conflicts: libgnomevfs2-common (<< 2.12.2-7), + libgnomevfs2-0 (<< 1:2.16.0-1) +Description: GNOME Virtual File System (extra modules) + GNOME VFS is the GNOME virtual file system. It is the foundation of the + Nautilus file manager. It provides a modular architecture and ships with + several modules that implement support for local files, http, ftp and others. + It provides an URI-based API, a backend supporting asynchronous file + operations, a MIME type manipulation library and other features. + . + This package contains extra VFS modules for the GNOME Virtual + File System. It includes: + * the bzip2 module; + * the ftp module; + * the http module (which also includes support for WebDAV); + * the smb module, to browse Windows shares. + +Package: libgnomevfs2-0-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: libgnomevfs2-0 (= ${binary:Version}) +Description: GNOME Virtual File System (debugging libraries) + GNOME VFS is the GNOME virtual file system. It is the foundation of the + Nautilus file manager. It provides a modular architecture and ships with + several modules that implement support for local files, http, ftp and others. + It provides an URI-based API, a backend supporting asynchronous file + operations, a MIME type manipulation library and other features. + . + This package contains unstripped shared libraries. It is provided primarily + to provide a backtrace with names in a debugger, to make it easier to + interpret core dumps. The libraries are installed in /usr/lib/debug and are + automatically used by gdb. + +Package: libgnomevfs2-dev +Architecture: any +Section: libdevel +Depends: libgnomevfs2-0 (= ${binary:Version}), + libgconf2-dev (>= 2.8.0-1), + libgnutls-dev, + libxml2-dev, + libavahi-client-dev (>= 0.6) | hurd, + libavahi-glib-dev (>= 0.6) | hurd, + libdbus-1-dev | hurd, + libselinux1-dev | not+linux-gnu +Replaces: libgnomevfs2-common (<< 1:2.20.0-0ubuntu2) +Description: GNOME Virtual File System library (development files) + GNOME VFS is the GNOME virtual file system. It is the foundation of the + Nautilus file manager. It provides a modular architecture and ships with + several modules that implement support for local files, http, ftp and others. + It provides an URI-based API, a backend supporting asynchronous file + operations, a MIME type manipulation library and other features. + . + This package provides the necessary development libraries for writing + GNOME VFS modules and applications that use the GNOME VFS APIs. --- gnome-vfs-2.24.0.orig/debian/libgnomevfs2-extra.install +++ gnome-vfs-2.24.0/debian/libgnomevfs2-extra.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/gnome-vfs-2.0/modules/lib{bzip2,smb,http,ftp}.so +debian/extra-modules.conf /etc/gnome-vfs-2.0/modules/ --- gnome-vfs-2.24.0.orig/debian/libgnomevfs2-dev.install +++ gnome-vfs-2.24.0/debian/libgnomevfs2-dev.install @@ -0,0 +1,7 @@ +debian/tmp/usr/include +debian/tmp/usr/lib/libgnomevfs-2.so +debian/tmp/usr/lib/libgnomevfs-2.la +debian/tmp/usr/lib/libgnomevfs-2.a +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/lib/gnome-vfs-2.0/include +debian/tmp/usr/share/gtk-doc/html/gnome-vfs-2.0/* usr/share/doc/libgnomevfs2-common/html/ --- gnome-vfs-2.24.0.orig/debian/control +++ gnome-vfs-2.24.0/debian/control @@ -0,0 +1,144 @@ +Source: gnome-vfs +Section: libs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Sebastian Dröge +Build-Depends: cdbs, + gtk-doc-tools (>= 1.0), + libglib2.0-dev (>= 2.9.3), + libgconf2-dev (>= 2.8.0-1), + libxml2-dev (>= 2.6.0), + libbz2-dev, + libgamin-dev | libfam-dev (>= 2.6.9-4) [!hurd-i386], + libsmbclient-dev [!hurd-i386], + gettext, + debhelper (>= 5.0.13), + zlib1g-dev, + intltool (>= 0.35.0), + gnome-mime-data, + libgnutls-dev (>= 1.0.4-3), + gnome-pkg-tools (>= 0.11.3), + dpkg-dev (>= 1.13.19), + libdbus-glib-1-dev (>= 0.70), + libhal-dev (>= 0.5.7) | not+linux-gnu, + libhal-storage-dev (>= 0.5.7) | not+linux-gnu, + libavahi-client-dev (>= 0.6) [!hurd-i386], + libavahi-glib-dev (>= 0.6) [!hurd-i386], + libselinux1-dev | not+linux-gnu, + libkrb5-dev, + libacl1-dev, + libattr1-dev +Standards-Version: 3.7.3 + +Package: libgnomevfs2-common +Section: libs +Architecture: all +Depends: ${misc:Depends}, + gnome-mime-data, + shared-mime-info +Conflicts: gnome-panel (<< 2.10.0), + libgnomevfs2-0 (<< 2.12.2-4), + libgnomevfs2-extra (<< 1:2.16.3-6) +Description: GNOME Virtual File System (common files) + GNOME VFS is the GNOME virtual file system. It is the foundation of the + Nautilus file manager. It provides a modular architecture and ships with + several modules that implement support for local files, http, ftp and others. + It provides an URI-based API, a backend supporting asynchronous file + operations, a MIME type manipulation library and other features. + . + This package contains the documentation, data files and locales. + +Package: libgnomevfs2-0 +Architecture: any +Depends: ${shlibs:Depends}, + dbus (>= 0.90), + libgnomevfs2-common (>= ${gnome:Version}), + libgnomevfs2-common (<< ${gnome:NextVersion}) +Recommends: libgnomevfs2-extra, gnome-mount, dbus-x11 +Suggests: libgnomevfs2-bin, gamin | fam +Replaces: libgnomevfs2-common (<< 2.12.2-4) +Conflicts: libbonobo2-0 (<< 2.15.0) +Description: GNOME Virtual File System (runtime libraries) + GNOME VFS is the GNOME virtual file system. It is the foundation of the + Nautilus file manager. It provides a modular architecture and ships with + several modules that implement support for local files, http, ftp and others. + It provides an URI-based API, a backend supporting asynchronous file + operations, a MIME type manipulation library and other features. + . + This package contains the runtime libraries, the daemon, and the + default modules. + +Package: libgnomevfs2-bin +Architecture: any +Depends: ${shlibs:Depends} +Replaces: libgnomevfs2-common (<< 2.12.2-4) +Description: GNOME Virtual File System (support binaries) + GNOME VFS is the GNOME virtual file system. It is the foundation of the + Nautilus file manager. It provides a modular architecture and ships with + several modules that implement support for local files, http, ftp and others. + It provides an URI-based API, a backend supporting asynchronous file + operations, a MIME type manipulation library and other features. + . + This package contains some example binaries using the GNOME VFS + library. + +Package: libgnomevfs2-extra +Architecture: any +Depends: ${shlibs:Depends}, + libgnomevfs2-common (>= ${gnome:Version}), + libgnomevfs2-common (<< ${gnome:NextVersion}) +Conflicts: libgnomevfs2-common (<< 2.12.2-7), + libgnomevfs2-0 (<< 1:2.16.0-1) +Description: GNOME Virtual File System (extra modules) + GNOME VFS is the GNOME virtual file system. It is the foundation of the + Nautilus file manager. It provides a modular architecture and ships with + several modules that implement support for local files, http, ftp and others. + It provides an URI-based API, a backend supporting asynchronous file + operations, a MIME type manipulation library and other features. + . + This package contains extra VFS modules for the GNOME Virtual + File System. It includes: + * the bzip2 module; + * the ftp module; + * the http module (which also includes support for WebDAV); + * the smb module, to browse Windows shares. + +Package: libgnomevfs2-0-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: libgnomevfs2-0 (= ${binary:Version}) +Description: GNOME Virtual File System (debugging libraries) + GNOME VFS is the GNOME virtual file system. It is the foundation of the + Nautilus file manager. It provides a modular architecture and ships with + several modules that implement support for local files, http, ftp and others. + It provides an URI-based API, a backend supporting asynchronous file + operations, a MIME type manipulation library and other features. + . + This package contains unstripped shared libraries. It is provided primarily + to provide a backtrace with names in a debugger, to make it easier to + interpret core dumps. The libraries are installed in /usr/lib/debug and are + automatically used by gdb. + +Package: libgnomevfs2-dev +Architecture: any +Section: libdevel +Depends: libgnomevfs2-0 (= ${binary:Version}), + libgconf2-dev (>= 2.8.0-1), + libgnutls-dev, + libxml2-dev, + libavahi-client-dev (>= 0.6) | hurd, + libavahi-glib-dev (>= 0.6) | hurd, + libdbus-1-dev | hurd, + libselinux1-dev | not+linux-gnu +Replaces: libgnomevfs2-common (<< 1:2.20.0-0ubuntu2) +Description: GNOME Virtual File System library (development files) + GNOME VFS is the GNOME virtual file system. It is the foundation of the + Nautilus file manager. It provides a modular architecture and ships with + several modules that implement support for local files, http, ftp and others. + It provides an URI-based API, a backend supporting asynchronous file + operations, a MIME type manipulation library and other features. + . + This package provides the necessary development libraries for writing + GNOME VFS modules and applications that use the GNOME VFS APIs. --- gnome-vfs-2.24.0.orig/debian/libgnomevfs2-0.shlibs +++ gnome-vfs-2.24.0/debian/libgnomevfs2-0.shlibs @@ -0,0 +1 @@ +libgnomevfs-2 0 libgnomevfs2-0 (>= 1:2.17.90) --- gnome-vfs-2.24.0.orig/debian/patches/21_proxy_ignore_local.patch +++ gnome-vfs-2.24.0/debian/patches/21_proxy_ignore_local.patch @@ -0,0 +1,22 @@ +--- schemas/system_http_proxy.schemas.in.old 2006-05-19 07:59:12.616000000 +0200 ++++ schemas/system_http_proxy.schemas.in 2006-05-19 07:59:38.792000000 +0200 +@@ -78,7 +78,7 @@ + gnome-vfs + list + string +- [localhost,127.0.0.0/8] ++ [localhost,127.0.0.0/8,*.local] + + Non-proxy hosts + This key contains a list of hosts which are connected to +--- schemas/system_http_proxy.schemas.old 2006-05-19 07:59:06.396000000 +0200 ++++ schemas/system_http_proxy.schemas 2006-05-19 07:59:28.812000000 +0200 +@@ -2000,7 +2000,7 @@ + gnome-vfs + list + string +- [localhost,127.0.0.0/8] ++ [localhost,127.0.0.0/8,*.local] + + Non-proxy hosts + This key contains a list of hosts which are connected to --- gnome-vfs-2.24.0.orig/debian/patches/02_audiocd_readonly.patch +++ gnome-vfs-2.24.0/debian/patches/02_audiocd_readonly.patch @@ -0,0 +1,27 @@ +Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c +=================================================================== +--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-hal-mounts.c 2007-04-10 14:03:59.000000000 +0200 ++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c 2007-05-03 22:59:58.054110500 +0200 +@@ -1038,17 +1038,19 @@ + vol->priv->volume_type = GNOME_VFS_VOLUME_TYPE_VFS_MOUNT; + vol->priv->activation_uri = g_strdup_printf ("cdda://%s", + libhal_volume_get_device_file (hal_volume)); ++ vol->priv->is_read_only = TRUE; + } else if (libhal_volume_disc_is_blank (hal_volume)) { + vol->priv->volume_type = GNOME_VFS_VOLUME_TYPE_VFS_MOUNT; + vol->priv->activation_uri = g_strdup ("burn:///"); ++ vol->priv->is_read_only = FALSE; + } else { + vol->priv->activation_uri = gnome_vfs_get_uri_from_local_path ( + libhal_volume_get_mount_point (hal_volume)); ++ vol->priv->is_read_only = libhal_device_get_property_bool (volume_monitor_daemon->hal_ctx, ++ libhal_volume_get_udi (hal_volume), ++ "volume.is_mounted_read_only", NULL); + } + vol->priv->filesystem_type = g_strdup (libhal_volume_get_fstype (hal_volume)); +- vol->priv->is_read_only = libhal_device_get_property_bool (volume_monitor_daemon->hal_ctx, +- libhal_volume_get_udi (hal_volume), +- "volume.is_mounted_read_only", NULL); + vol->priv->is_mounted = TRUE; + + vol->priv->device_type = _hal_get_gnome_vfs_device_type (hal_drive); --- gnome-vfs-2.24.0.orig/debian/patches/23_improve_volume_labels.patch +++ gnome-vfs-2.24.0/debian/patches/23_improve_volume_labels.patch @@ -0,0 +1,105 @@ +Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c +=================================================================== +--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-hal-mounts.c 2007-06-27 21:57:27.566795749 +0200 ++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c 2007-06-27 22:48:46.818272291 +0200 +@@ -328,6 +328,7 @@ + LibHalDriveType drive_type; + char *name; + char *vm_name; ++ char *size_str = NULL; + gboolean may_prepend_external; + + +@@ -341,7 +342,7 @@ + !libhal_drive_uses_removable_media (hal_drive) && + hal_volume != NULL) { + const char *label; +- const char *size_str; ++ const char *mountpoint; + + /* use label if available */ + label = libhal_volume_get_label (hal_volume); +@@ -350,9 +351,23 @@ + goto out; + } + +- /* Otherwise, just use volume size */ +- + size_str = gnome_vfs_format_file_size_for_display (libhal_volume_get_size (hal_volume)); ++ ++ /* use mount point if available */ ++ mountpoint = libhal_volume_get_mount_point (hal_volume); ++ if (mountpoint != NULL && strlen (mountpoint) > 0) { ++ /* chop off /media prefix */ ++ if (!strncmp (mountpoint, "/media/", 7) && strlen (mountpoint) > 7) ++ mountpoint += 7; ++ if (size_str != NULL) { ++ name = g_strdup_printf ("%s (%s)", mountpoint, size_str); ++ } else { ++ name = g_strdup (mountpoint); ++ } ++ goto out; ++ } ++ ++ /* Otherwise, just use volume size */ + if (size_str != NULL) { + name = g_strdup_printf (_("%s Volume"), size_str); + } +@@ -463,6 +478,7 @@ + } + + out: ++ g_free (size_str); + /* lame fallback */ + if (name == NULL) + name = g_strdup (_("Drive")); +@@ -485,7 +501,8 @@ + LibHalDriveType drive_type; + const char *volume_label; + char *name; +- char *size_str; ++ char *size_str = NULL; ++ const char *mountpoint; + + name = NULL; + +@@ -573,20 +590,36 @@ + goto out; + } + +- /* Fallback: size of media */ +- + size_str = gnome_vfs_format_file_size_for_display (libhal_volume_get_size (hal_volume)); ++ ++ /* mount point, when it's not removable */ ++ if (!libhal_drive_uses_removable_media (hal_drive)) { ++ mountpoint = libhal_volume_get_mount_point (hal_volume); ++ if (mountpoint != NULL && strlen (mountpoint) > 0) { ++ /* chop off /media prefix */ ++ if (!strncmp (mountpoint, "/media/", 7) && strlen (mountpoint) > 7) ++ mountpoint += 7; ++ if (size_str != NULL) { ++ name = g_strdup_printf ("%s (%s)", mountpoint, size_str); ++ } else { ++ name = g_strdup (mountpoint); ++ } ++ goto out; ++ } ++ } ++ ++ /* Fallback: size of media */ + if (size_str != NULL) { + if (libhal_drive_uses_removable_media (hal_drive)) { + name = g_strdup_printf (_("%s Removable Volume"), size_str); + } else { + name = g_strdup_printf (_("%s Volume"), size_str); + } +- g_free (size_str); + } + + + out: ++ g_free (size_str); + /* lame fallback */ + if (name == NULL) + name = g_strdup (_("Volume")); --- gnome-vfs-2.24.0.orig/debian/patches/22_ignore_inaccessible_volumes.patch +++ gnome-vfs-2.24.0/debian/patches/22_ignore_inaccessible_volumes.patch @@ -0,0 +1,47 @@ +Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c +=================================================================== +--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-hal-mounts.c 2007-05-03 22:59:58.054110500 +0200 ++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c 2007-05-03 23:02:29.895600000 +0200 +@@ -41,6 +41,7 @@ + + #include + #include ++#include + #include + + #include +@@ -690,6 +691,10 @@ + mount_point = libhal_volume_get_mount_point (hal_volume); + /* blacklist fhs2.3 top level mount points */ + if (mount_point != NULL) { ++ /* also ignore mounts which are inaccessible for the user */ ++ if (g_access (mount_point, R_OK) != 0) ++ goto out; ++ + for (i = 0; fhs23_toplevel_mount_points[i] != NULL; i++) { + if (strcmp (mount_point, fhs23_toplevel_mount_points[i]) == 0) + goto out; +Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c +=================================================================== +--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 23:01:46.536890250 +0200 ++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 23:02:29.895600000 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include "gnome-vfs-volume-monitor-daemon.h" + #include "gnome-vfs-volume-monitor-private.h" +@@ -1058,6 +1059,11 @@ + l != NULL; + l = l->next, ld = ld->next) { + GnomeVFSUnixMount *mount = l->data; ++ ++ /* ignore inaccessible mounts */ ++ if (mount->mount_path && g_access (mount->mount_path, R_OK) != 0) ++ continue; ++ + dev_t unix_device = GPOINTER_TO_UINT (ld->data); + + vol = create_vol_from_mount (volume_monitor, mount); --- gnome-vfs-2.24.0.orig/debian/patches/10_configuration_loop.patch +++ gnome-vfs-2.24.0/debian/patches/10_configuration_loop.patch @@ -0,0 +1,13 @@ +Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-configuration.c +=================================================================== +--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-configuration.c 2007-04-10 14:03:59.000000000 +0200 ++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-configuration.c 2007-05-03 23:01:34.044109500 +0200 +@@ -358,6 +358,8 @@ + guint line_buffer_size; + guint line_number; + ++ if (!g_file_test (file_name, G_FILE_TEST_IS_REGULAR)) ++ return; + f = g_fopen (file_name, "r"); + if (f == NULL) { + g_warning (_("Configuration file `%s' was not found: %s"), --- gnome-vfs-2.24.0.orig/debian/patches/11_network-volumes-in-network.patch +++ gnome-vfs-2.24.0/debian/patches/11_network-volumes-in-network.patch @@ -0,0 +1,240 @@ +diff -Nur modules.orig/computer-method.c modules/computer-method.c +--- modules.orig/computer-method.c 2004-08-12 11:08:56.000000000 +0200 ++++ modules/computer-method.c 2005-02-09 23:46:57.697485936 +0100 +@@ -260,12 +260,14 @@ + if (gnome_vfs_volume_is_user_visible (volume)) { + drive = gnome_vfs_volume_get_drive (volume); + if (drive == NULL) { ++ if (gnome_vfs_volume_get_volume_type (volume) != GNOME_VFS_VOLUME_TYPE_CONNECTED_SERVER) { + file = computer_file_new (COMPUTER_VOLUME); + name = gnome_vfs_volume_get_display_name (volume); + file->file_name = build_file_name (name, ".volume"); + g_free (name); + file->volume = gnome_vfs_volume_ref (volume); + computer_file_add (dir, file); ++ } + } else { + file = get_drive_file (dir, drive); + if (file != NULL) { +@@ -360,10 +362,11 @@ + file->file_name = g_strdup ("Filesystem.desktop"); + computer_file_add (dir, file); + ++ /* + file = computer_file_new (COMPUTER_NETWORK_LINK); + file->file_name = g_strdup ("Network.desktop"); + computer_file_add (dir, file); +- ++ */ + volumes = gnome_vfs_volume_monitor_get_mounted_volumes (monitor); + drives = gnome_vfs_volume_monitor_get_connected_drives (monitor); + +@@ -384,12 +387,14 @@ + if (gnome_vfs_volume_is_user_visible (volume)) { + drive = gnome_vfs_volume_get_drive (volume); + if (drive == NULL) { ++ if (gnome_vfs_volume_get_volume_type (volume) != GNOME_VFS_VOLUME_TYPE_CONNECTED_SERVER) { + file = computer_file_new (COMPUTER_VOLUME); + name = gnome_vfs_volume_get_display_name (volume); + file->file_name = build_file_name (name, ".volume"); + g_free (name); + file->volume = gnome_vfs_volume_ref (volume); + computer_file_add (dir, file); ++ } + } + gnome_vfs_drive_unref (drive); + } +diff -Nur modules.orig/network-method.c modules/network-method.c +--- modules.orig/network-method.c 2004-10-07 17:08:38.000000000 +0200 ++++ modules/network-method.c 2005-02-09 23:46:37.620538096 +0100 +@@ -51,6 +51,7 @@ + char *icon; + char *target_uri; + char *filename; ++ gint vol_id; + } NetworkLink; + + typedef struct { +@@ -154,7 +155,8 @@ + static char * + get_data_for_link (const char *uri, + const char *display_name, +- const char *icon) ++ const char *icon, ++ gint vol_id) + { + char *data; + +@@ -163,10 +165,13 @@ + "Name=%s\n" + "Type=FSDevice\n" + "Icon=%s\n" +- "URL=%s\n", ++ "URL=%s\n" ++ "%sX-Gnome-Volume=%d\n", + display_name, + icon, +- uri); ++ uri, ++ vol_id >= 0 ? "" : "#", ++ vol_id); + return data; + } + +@@ -235,7 +240,8 @@ + add_link (const char *filename, + const char *target_uri, + const char *display_name, +- const char *icon) ++ const char *icon, ++ gint vol_id) + { + NetworkLink *link; + +@@ -244,6 +250,7 @@ + link->target_uri = g_strdup (target_uri); + link->display_name = g_strdup (display_name); + link->icon = g_strdup (icon); ++ link->vol_id = vol_id; + + active_links = g_list_prepend (active_links, link); + do_link_event (filename, +@@ -264,7 +271,8 @@ + add_link (filename, + link_uri, + domain, +- "gnome-fs-network"); ++ "gnome-fs-network", ++ -1); + g_free (filename); + g_free (link_uri); + } +@@ -356,7 +364,8 @@ + { + return get_data_for_link (link->target_uri, + link->display_name, +- link->icon); ++ link->icon, ++ link->vol_id); + } + + /* Call with lock held */ +@@ -477,6 +486,63 @@ + + } + ++/* functions to handle volumes */ ++static char * ++build_volume_filename (GnomeVFSVolume *volume) ++{ ++ char *name, *escaped, *ret; ++ ++ name = gnome_vfs_volume_get_display_name (volume); ++ escaped = gnome_vfs_escape_string (name); ++ ret = g_strconcat ("volume-", escaped, NULL); ++ g_free(escaped); ++ g_free(name); ++ ++ return ret; ++} ++ ++static void ++volume_mounted (GnomeVFSVolumeMonitor *monitor, ++ GnomeVFSVolume *volume, ++ gpointer user_data) ++{ ++ char *volume_file, *volume_uri; ++ char *volume_name, *volume_icon; ++ ++ G_LOCK (network); ++ if (gnome_vfs_volume_is_user_visible (volume) && ++ gnome_vfs_volume_get_volume_type (volume) == GNOME_VFS_VOLUME_TYPE_CONNECTED_SERVER) { ++ volume_file = build_volume_filename (volume); ++ volume_uri = gnome_vfs_volume_get_activation_uri (volume); ++ volume_name = gnome_vfs_volume_get_display_name (volume); ++ volume_icon = gnome_vfs_volume_get_icon (volume); ++ ++ add_link (volume_file, volume_uri, ++ volume_name, volume_icon, ++ gnome_vfs_volume_get_id (volume)); ++ g_free (volume_icon); ++ g_free (volume_name); ++ g_free (volume_uri); ++ g_free (volume_file); ++ } ++ G_UNLOCK (network); ++} ++ ++static void ++volume_unmounted (GnomeVFSVolumeMonitor *volume_monitor, ++ GnomeVFSVolume *volume, ++ gpointer user_data) ++{ ++ char *volume_file; ++ ++ G_LOCK (network); ++ ++ volume_file = build_volume_filename (volume); ++ remove_link (volume_file); ++ g_free (volume_file); ++ ++ G_UNLOCK (network); ++} + + static GnomeVFSResult + do_open (GnomeVFSMethod *method, +@@ -1338,6 +1404,8 @@ + GConfClient *gconf_client; + GnomeVFSURI *uri; + char *workgroup_uri, *workgroup_escaped, *setting; ++ GnomeVFSVolumeMonitor *monitor; ++ GList *volumes, *l; + + gconf_client = gconf_client_get_default (); + +@@ -1394,10 +1462,43 @@ + add_link ("smblink-root", + "smb://", + _("Windows Network"), +- "gnome-fs-network"); ++ "gnome-fs-network", ++ -1); + } + +- ++ /* add non-drive volumes to network:/// folder */ ++ monitor = gnome_vfs_get_volume_monitor (); ++ volumes = gnome_vfs_volume_monitor_get_mounted_volumes (monitor); ++ for (l = volumes; l != NULL; l = l->next) { ++ GnomeVFSVolume *volume = l->data; ++ ++ if (gnome_vfs_volume_is_user_visible (volume) && ++ gnome_vfs_volume_get_volume_type (volume) == GNOME_VFS_VOLUME_TYPE_CONNECTED_SERVER) { ++ gchar *volume_file, *volume_uri; ++ gchar *volume_name, *volume_icon; ++ ++ volume_file = build_volume_filename (volume); ++ volume_uri = gnome_vfs_volume_get_activation_uri (volume); ++ volume_name = gnome_vfs_volume_get_display_name (volume); ++ volume_icon = gnome_vfs_volume_get_icon (volume); ++ ++ add_link (volume_file, volume_uri, ++ volume_name, volume_icon, ++ gnome_vfs_volume_get_id (volume)); ++ g_free (volume_icon); ++ g_free (volume_name); ++ g_free (volume_uri); ++ g_free (volume_file); ++ } ++ } ++ g_list_foreach (volumes, (GFunc) gnome_vfs_volume_unref, NULL); ++ g_list_free (volumes); ++ ++ g_signal_connect (monitor, "volume_mounted", ++ G_CALLBACK (volume_mounted), NULL); ++ g_signal_connect (monitor, "volume_unmounted", ++ G_CALLBACK (volume_unmounted), NULL); ++ + return &method; + } + --- gnome-vfs-2.24.0.orig/debian/patches/series +++ gnome-vfs-2.24.0/debian/patches/series @@ -0,0 +1,26 @@ +01_fstab_edit_crash.patch +02_audiocd_readonly.patch +04_sftp_pam_krb5.patch +05_default_modules.patch +06_blacklist-directories.patch +07_trash_location.patch +08_recursive_local_check.patch +09_gnomevfs_mount_selection.patch +10_configuration_loop.patch +11_mime_text_parent.patch +11_network-volumes-in-network.patch +12_user_visible_drives.patch +13_resolve_fstab_symlinks.patch +14_app_cdda.patch +15_uuid_mount.patch +17_improve_volume_labels.patch +19_hurd_path_max.patch +20_dont_register_keys_for_gaim.patch +21_proxy_ignore_local.patch +22_ignore_inaccessible_volumes.patch +23_ignore_ltspfs_volumes.patch +23_improve_volume_labels.patch +24_home_dir_fakeroot.patch +30_nfs4.patch +90_from_svn_no_range_for_youtube.patch +99_ltmain_as-needed.patch --- gnome-vfs-2.24.0.orig/debian/patches/08_recursive_local_check.patch +++ gnome-vfs-2.24.0/debian/patches/08_recursive_local_check.patch @@ -0,0 +1,49 @@ +Index: gnome-vfs-2.18.1/modules/file-method.c +=================================================================== +--- gnome-vfs-2.18.1.orig/modules/file-method.c 2007-04-10 14:03:56.000000000 +0200 ++++ gnome-vfs-2.18.1/modules/file-method.c 2007-05-03 23:01:11.558704250 +0200 +@@ -1257,6 +1257,7 @@ + struct stat statbuf; + gboolean is_local; + gchar *path; ++ char *type; + + g_return_val_if_fail (uri != NULL, FALSE); + +@@ -1264,21 +1265,22 @@ + if (path == NULL) + return TRUE; /* GNOME_VFS_ERROR_INVALID_URI */ + +- if (g_stat (path, &statbuf) == 0) { +- char *type; +- +- G_LOCK (fstype); +- type = filesystem_type (path, path, &statbuf); +- is_local = ((strcmp (type, "nfs") != 0) && +- (strcmp (type, "afs") != 0) && +- (strcmp (type, "autofs") != 0) && +- (strcmp (type, "unknown") != 0) && +- (strcmp (type, "ncpfs") != 0)); +- G_UNLOCK (fstype); +- } else { +- /* Assume non-existent files are local */ +- is_local = TRUE; ++ /* Recurse through directories until one of them exists */ ++ while (g_stat (path, &statbuf) != 0) { ++ gchar *tmp_path = g_path_get_dirname (path); ++ g_free (path); ++ path = tmp_path; + } ++ ++ G_LOCK (fstype); ++ type = filesystem_type (path, path, &statbuf); ++ is_local = ((strcmp (type, "nfs") != 0) && ++ (strcmp (type, "afs") != 0) && ++ (strcmp (type, "autofs") != 0) && ++ (strcmp (type, "unknown") != 0) && ++ (strcmp (type, "ncpfs") != 0)); ++ G_UNLOCK (fstype); ++ + g_free (path); + return is_local; + } --- gnome-vfs-2.24.0.orig/debian/patches/13_resolve_fstab_symlinks.patch +++ gnome-vfs-2.24.0/debian/patches/13_resolve_fstab_symlinks.patch @@ -0,0 +1,26 @@ +Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-unix-mounts.c +=================================================================== +--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-unix-mounts.c 2007-04-10 14:03:59.000000000 +0200 ++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-unix-mounts.c 2007-05-03 23:01:50.353128750 +0200 +@@ -541,6 +541,7 @@ + char *opt, *opt_end; + struct stat sb; + GnomeVFSUnixMountPoint *mount_entry; ++ char rpath[PATH_MAX]; + + stat_file = read_file = get_fstab_file (); + +@@ -572,7 +573,12 @@ + + mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1); + +- mount_entry->mount_path = g_strdup (mntent->mnt_dir); ++ /* resolve symlinks */ ++ if (realpath (mntent->mnt_dir, rpath)) ++ mount_entry->mount_path = g_strdup (rpath); ++ else ++ mount_entry->mount_path = g_strdup (mntent->mnt_dir); ++ + mount_entry->device_path = g_strdup (mntent->mnt_fsname); + mount_entry->filesystem_type = g_strdup (mntent->mnt_type); + --- gnome-vfs-2.24.0.orig/debian/patches/99_ltmain_as-needed.patch +++ gnome-vfs-2.24.0/debian/patches/99_ltmain_as-needed.patch @@ -0,0 +1,32 @@ +Index: nautilus-2.18.1/ltmain.sh +=================================================================== +--- nautilus-2.18.1.orig/ltmain.sh 2006-07-13 09:12:13.000000000 +0200 ++++ nautilus-2.18.1/ltmain.sh 2007-06-06 23:36:38.899175453 +0200 +@@ -1794,6 +1794,11 @@ + arg=`$echo "X$arg" | $Xsed -e "s/^ //"` + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` + arg= +@@ -2134,6 +2139,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" --- gnome-vfs-2.24.0.orig/debian/patches/19_hurd_path_max.patch +++ gnome-vfs-2.24.0/debian/patches/19_hurd_path_max.patch @@ -0,0 +1,39 @@ +Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-unix-mounts.c +=================================================================== +--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-unix-mounts.c 2007-05-03 23:01:50.353128750 +0200 ++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-unix-mounts.c 2007-05-03 23:02:19.782968000 +0200 +@@ -85,6 +85,9 @@ + + #define STAT_TIMEOUT_SECONDS 3 + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif + + /* Ideally this should not nonblocking stat, since that can block on + * downed NFS mounts forever, however there seems to be no good way +Index: gnome-vfs-2.18.1/modules/file-method.c +=================================================================== +--- gnome-vfs-2.18.1.orig/modules/file-method.c 2007-05-03 23:01:11.558704250 +0200 ++++ gnome-vfs-2.18.1/modules/file-method.c 2007-05-03 23:02:19.782968000 +0200 +@@ -127,7 +127,11 @@ + if (x > 0) + value = x; + else ++#ifdef MAXPATHLEN + return MAXPATHLEN; ++#else ++ return 4096; ++#endif + } + + return value; +@@ -1659,7 +1663,7 @@ + char *cache_file_path; + FILE *cache_file; + char buffer[2048]; +- char escaped_mount_point[PATH_MAX], escaped_trash_path[PATH_MAX]; ++ char escaped_mount_point[GET_PATH_MAX()], escaped_trash_path[GET_PATH_MAX()]; + char *mount_point, *trash_path; + struct stat stat_buffer; + gboolean removed_item; --- gnome-vfs-2.24.0.orig/debian/patches/04_sftp_pam_krb5.patch +++ gnome-vfs-2.24.0/debian/patches/04_sftp_pam_krb5.patch @@ -0,0 +1,13 @@ +Index: gnome-vfs-2.18.1/modules/sftp-method.c +=================================================================== +--- gnome-vfs-2.18.1.orig/modules/sftp-method.c 2007-04-10 14:03:56.000000000 +0200 ++++ gnome-vfs-2.18.1/modules/sftp-method.c 2007-05-03 23:01:02.282124500 +0200 +@@ -1315,6 +1315,8 @@ + if (g_str_has_suffix (buffer, "password: ") || + g_str_has_suffix (buffer, "Password: ") || + g_str_has_suffix (buffer, "Password:") || ++ g_str_has_prefix (buffer, "Password for ") || ++ g_str_has_prefix (buffer, "Enter Kerberos password") || + g_str_has_prefix (buffer, "Enter passphrase for key")) { + if (!done_auth && password != NULL) { + g_io_channel_write_chars (tty_channel, password, -1, &len, NULL); --- gnome-vfs-2.24.0.orig/debian/patches/14_app_cdda.patch +++ gnome-vfs-2.24.0/debian/patches/14_app_cdda.patch @@ -0,0 +1,44 @@ +diff -Nur gnome-vfs2-2.12.0.orig/schemas/desktop_gnome_url_handlers.schemas.in gnome-vfs2-2.12.0/schemas/desktop_gnome_url_handlers.schemas.in +--- gnome-vfs2-2.12.0.orig/schemas/desktop_gnome_url_handlers.schemas.in 2004-08-14 16:08:28.000000000 +0200 ++++ gnome-vfs2-2.12.0/schemas/desktop_gnome_url_handlers.schemas.in 2005-09-29 15:16:04.000000000 +0200 +@@ -172,6 +172,40 @@ + + + ++ /schemas/desktop/gnome/url-handlers/cdda/enabled ++ /desktop/gnome/url-handlers/cdda/enabled ++ gnome ++ bool ++ true ++ ++ Whether the specified command should handle "cdda" URLs ++ True if the command specified in the "command" key should handle "cdda" URLs. ++ ++ ++ ++ /schemas/desktop/gnome/url-handlers/cdda/command ++ /desktop/gnome/url-handlers/cdda/command ++ gnome ++ string ++ sound-juicer %s ++ ++ The handler for "cdda" URLs ++ The command used to handle "cdda" URLs, if enabled. ++ ++ ++ ++ /schemas/desktop/gnome/url-handlers/cdda/needs_terminal ++ /desktop/gnome/url-handlers/cdda/needs_terminal ++ gnome ++ bool ++ false ++ ++ Run the command in a terminal ++ True if the command used to handle this type of URL should be run in a terminal. ++ ++ ++ ++ + /schemas/desktop/gnome/url-handlers/https/enabled + /desktop/gnome/url-handlers/https/enabled + gnome --- gnome-vfs-2.24.0.orig/debian/patches/05_default_modules.patch +++ gnome-vfs-2.24.0/debian/patches/05_default_modules.patch @@ -0,0 +1,35 @@ +Index: gnome-vfs-2.18.1/modules/default-modules.conf +=================================================================== +--- gnome-vfs-2.18.1.orig/modules/default-modules.conf 2007-04-10 14:03:56.000000000 +0200 ++++ gnome-vfs-2.18.1/modules/default-modules.conf 2007-05-03 23:01:06.138365500 +0200 +@@ -6,8 +6,6 @@ + # ... : + # + +-bzip2: bzip2 +- + computer: computer + + dns-sd: dns-sd +@@ -16,20 +14,12 @@ + + test: vfs-test + +-ftp: ftp +- + network: network + +-nntp: nntp ++#nntp: nntp + + gzip ugzip: gzip + +-http: http +- +-dav: http +- +-davs: http +- + #efs: vefs + + #nfs: nfs --- gnome-vfs-2.24.0.orig/debian/patches/11_mime_text_parent.patch +++ gnome-vfs-2.24.0/debian/patches/11_mime_text_parent.patch @@ -0,0 +1,19 @@ +Index: gnome-vfs-2.22.0/libgnomevfs/gnome-vfs-mime-info-cache.c +=================================================================== +--- gnome-vfs-2.22.0.orig/libgnomevfs/gnome-vfs-mime-info-cache.c 2008-06-14 12:48:22.265972281 +0200 ++++ gnome-vfs-2.22.0/libgnomevfs/gnome-vfs-mime-info-cache.c 2008-06-14 12:52:05.342678608 +0200 +@@ -703,7 +703,13 @@ get_all_parent_types (const char *mime_t + for (i = 0; parents && parents[i] != NULL; i++) { + l = g_list_prepend (l, g_strdup (parents[i])); + } +- ++ ++ /* Special case for text/something */ ++ if (g_str_has_prefix (mime_type, "text/") && ++ strcmp (mime_type, "text/plain")) { ++ l = g_list_prepend (l, g_strdup ("text/plain")); ++ } ++ + G_UNLOCK (gnome_vfs_mime_mutex); + + return g_list_reverse (l); --- gnome-vfs-2.24.0.orig/debian/patches/12_user_visible_drives.patch +++ gnome-vfs-2.24.0/debian/patches/12_user_visible_drives.patch @@ -0,0 +1,16 @@ +Nur in gnome-vfs2-2.8.1.old/debian/patches: 12_user_visible_drives.patch. +Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c +=================================================================== +--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 22:59:25.352066750 +0200 ++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 23:01:46.536890250 +0200 +@@ -985,6 +985,10 @@ + vol->priv->is_user_visible = 1; + break; + default: ++ /* additionally mark devices below /media/ as user visible, in ++ * case they are not recognized as devices above */ ++ if (!strncmp (mount->mount_path, "/media/", 7)) ++ vol->priv->is_user_visible = 1; + break; + } + --- gnome-vfs-2.24.0.orig/debian/patches/07_trash_location.patch +++ gnome-vfs-2.24.0/debian/patches/07_trash_location.patch @@ -0,0 +1,29 @@ +Index: gnome-vfs-2.22.0/modules/file-method.c +=================================================================== +--- gnome-vfs-2.22.0.orig/modules/file-method.c 2008-05-28 00:18:51.337149833 +0200 ++++ gnome-vfs-2.22.0/modules/file-method.c 2008-05-28 00:30:05.717653291 +0200 +@@ -1390,11 +1390,11 @@ append_trash_path (const char *path) + char *per_user_part; + char *retval; + +- per_user_part = g_strconcat (TRASH_DIRECTORY_NAME_BASE "-", +- g_get_user_name (), +- NULL); ++ per_user_part = g_strdup_printf ("%s-%lu", ++ TRASH_DIRECTORY_NAME_BASE, ++ (unsigned long) geteuid()); + +- retval = g_build_filename (path, per_user_part, NULL); ++ retval = g_build_filename (path, per_user_part, "files", NULL); + + g_free (per_user_part); + +@@ -1993,7 +1993,7 @@ do_find_directory (GnomeVFSMethod *metho + } + } else { + /* volume with a home directory, just create a trash in home */ +- target_directory_path = append_to_path (home_directory, TRASH_DIRECTORY_NAME_BASE); ++ target_directory_path = g_build_filename (g_get_user_data_dir (), "Trash", "files", NULL); + } + break; + --- gnome-vfs-2.24.0.orig/debian/patches/30_nfs4.patch +++ gnome-vfs-2.24.0/debian/patches/30_nfs4.patch @@ -0,0 +1,38 @@ +Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-filesystem-type.c +=================================================================== +--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-filesystem-type.c 2007-04-10 14:03:59.000000000 +0200 ++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-filesystem-type.c 2007-05-03 23:02:33.475823750 +0200 +@@ -63,6 +63,7 @@ + { "msdos" , N_("MSDOS Volume"), 0 }, + { "msdosfs" , N_("MSDOS Volume"), 0 }, + { "nfs" , N_("NFS Network Volume"), 1 }, ++ { "nfs4" , N_("NFS Network Volume"), 1 }, + { "ntfs" , N_("Windows NT Volume"), 0 }, + { "nwfs" , N_("Netware Volume"), 0 }, + { "proc" , N_("System Volume"), 0 }, +Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c +=================================================================== +--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 23:02:29.895600000 +0200 ++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 23:02:33.475823750 +0200 +@@ -892,7 +892,8 @@ + if (vol->priv->device_type == GNOME_VFS_DEVICE_TYPE_UNKNOWN) { + vol->priv->device_type = GNOME_VFS_DEVICE_TYPE_CDROM; + } +- } else if (strcmp (mount->filesystem_type, "nfs") == 0) { ++ } else if ((strcmp (mount->filesystem_type, "nfs") == 0) || ++ (strcmp (mount->filesystem_type, "nfs4") == 0)) { + if (strstr (vol->priv->device_path, "(pid") != NULL) { + vol->priv->device_type = GNOME_VFS_DEVICE_TYPE_AUTOFS; + } else { +Index: gnome-vfs-2.18.1/modules/file-method.c +=================================================================== +--- gnome-vfs-2.18.1.orig/modules/file-method.c 2007-05-03 23:02:19.782968000 +0200 ++++ gnome-vfs-2.18.1/modules/file-method.c 2007-05-03 23:02:33.475823750 +0200 +@@ -1279,6 +1279,7 @@ + G_LOCK (fstype); + type = filesystem_type (path, path, &statbuf); + is_local = ((strcmp (type, "nfs") != 0) && ++ (strcmp (type, "nfs4") != 0) && + (strcmp (type, "afs") != 0) && + (strcmp (type, "autofs") != 0) && + (strcmp (type, "unknown") != 0) && --- gnome-vfs-2.24.0.orig/debian/patches/01_fstab_edit_crash.patch +++ gnome-vfs-2.24.0/debian/patches/01_fstab_edit_crash.patch @@ -0,0 +1,16 @@ +# upstream http://bugzilla.gnome.org/show_bug.cgi?id=300547 + +Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c +=================================================================== +--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-04-10 14:03:59.000000000 +0200 ++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 22:59:25.352066750 +0200 +@@ -740,6 +740,9 @@ + mount = l->data; + uri = gnome_vfs_get_uri_from_local_path (mount->mount_path); + ++ if (uri == NULL) ++ continue; ++ + drive = _gnome_vfs_volume_monitor_find_fstab_drive_by_activation_uri (volume_monitor, uri); + + if (drive != NULL) { --- gnome-vfs-2.24.0.orig/debian/patches/15_uuid_mount.patch +++ gnome-vfs-2.24.0/debian/patches/15_uuid_mount.patch @@ -0,0 +1,50 @@ +diff -Nur gnome-vfs2-2.16.0/libgnomevfs/gnome-vfs-unix-mounts.c gnome-vfs2-2.16.0.new/libgnomevfs/gnome-vfs-unix-mounts.c +--- gnome-vfs2-2.16.0/libgnomevfs/gnome-vfs-unix-mounts.c 2006-03-27 11:05:42.000000000 +0200 ++++ gnome-vfs2-2.16.0.new/libgnomevfs/gnome-vfs-unix-mounts.c 2006-09-25 14:23:15.000000000 +0200 +@@ -290,6 +290,15 @@ + + mount_entry->mount_path = g_strdup (mntent->mnt_dir); + mount_entry->device_path = g_strdup (mntent->mnt_fsname); ++ ++ if (g_file_test (mntent->mnt_fsname, G_FILE_TEST_IS_SYMLINK)) { ++ char rpath[PATH_MAX]; ++ if (realpath (mntent->mnt_fsname, rpath)) { ++ g_free (mount_entry->device_path); ++ mount_entry->device_path = g_strdup (rpath); ++ } ++ } ++ + mount_entry->filesystem_type = g_strdup (mntent->mnt_type); + + g_hash_table_insert (mounts_hash, +@@ -574,6 +583,30 @@ + + mount_entry->mount_path = g_strdup (mntent->mnt_dir); + mount_entry->device_path = g_strdup (mntent->mnt_fsname); ++ ++ if(strlen(mount_entry->device_path) >= 5 && !strncmp (mount_entry->device_path, "UUID=", 5)) { ++ gchar *device_path; ++ ++ device_path = g_strdup_printf ("/dev/disk/by-uuid/%s", mount_entry->device_path+5); ++ ++ if (g_file_test (device_path, G_FILE_TEST_IS_SYMLINK)) { ++ char rpath[PATH_MAX]; ++ if (realpath (device_path, rpath)) { ++ g_free (mount_entry->device_path); ++ mount_entry->device_path = g_strdup (rpath); ++ } ++ else { ++ g_free (device_path); ++ continue; ++ } ++ } ++ else { ++ g_free (device_path); ++ continue; ++ } ++ g_free (device_path); ++ } ++ + mount_entry->filesystem_type = g_strdup (mntent->mnt_type); + + #ifdef HAVE_HASMNTOPT --- gnome-vfs-2.24.0.orig/debian/patches/23_ignore_ltspfs_volumes.patch +++ gnome-vfs-2.24.0/debian/patches/23_ignore_ltspfs_volumes.patch @@ -0,0 +1,17 @@ +diff -Nur gnome-vfs2-2.15.92/libgnomevfs/gnome-vfs-volume-monitor-daemon.c gnome-vfs2-2.15.92.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c +--- gnome-vfs2-2.15.92/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2006-08-22 14:36:33.000000000 +0200 ++++ gnome-vfs2-2.15.92.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2006-08-22 14:38:20.000000000 +0200 +@@ -1064,6 +1064,13 @@ + if (mount->mount_path && g_access (mount->mount_path, R_OK) != 0) + continue; + ++ /* Ubuntu LTSP special case: Ignore ltspfs devices ++ * since every ltspfs mount has an associated bind ++ * mount in /media. */ ++ if (mount->device_path && !strcmp (mount->device_path, "ltspfs") && ++ mount->mount_path && strncmp(mount->mount_path, "/media/", 7)) ++ continue; ++ + dev_t unix_device = GPOINTER_TO_UINT (ld->data); + + vol = create_vol_from_mount (volume_monitor, mount); --- gnome-vfs-2.24.0.orig/debian/patches/06_blacklist-directories.patch +++ gnome-vfs-2.24.0/debian/patches/06_blacklist-directories.patch @@ -0,0 +1,19 @@ +Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c +=================================================================== +--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-hal-mounts.c 2007-05-03 23:07:30.686398250 +0200 ++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c 2007-05-03 23:12:04.779528000 +0200 +@@ -645,6 +645,14 @@ + "/var", + "/proc", + "/sbin", ++ "/usr/local", ++ "/var/local", ++ "/var/crash", ++ "/var/mail", ++ "/var/run", ++ "/var/tmp", ++ "/live/cow", ++ "/live/image", + NULL + }; + --- gnome-vfs-2.24.0.orig/debian/patches/09_gnomevfs_mount_selection.patch +++ gnome-vfs-2.24.0/debian/patches/09_gnomevfs_mount_selection.patch @@ -0,0 +1,23 @@ +? libgnomevfs/.gnome-vfs-volume-ops.c.swp +Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-ops.c +=================================================================== +--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-ops.c 2007-04-10 14:03:59.000000000 +0200 ++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-ops.c 2007-05-03 23:01:18.811157500 +0200 +@@ -823,8 +823,6 @@ + # if defined(HAL_MOUNT) + if (hal_udi != NULL && g_file_test (HAL_MOUNT, G_FILE_TEST_IS_EXECUTABLE)) + command = HAL_MOUNT; +- else +- command = find_command (MOUNT_COMMAND); + # else + ; + # endif +@@ -847,8 +845,6 @@ + # if defined(HAL_UMOUNT) + if (hal_udi != NULL && g_file_test (HAL_UMOUNT, G_FILE_TEST_IS_EXECUTABLE)) + command = HAL_UMOUNT; +- else +- command = find_command (UMOUNT_COMMAND); + # else + ; + #endif --- gnome-vfs-2.24.0.orig/debian/patches/24_home_dir_fakeroot.patch +++ gnome-vfs-2.24.0/debian/patches/24_home_dir_fakeroot.patch @@ -0,0 +1,160 @@ +Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c +=================================================================== +--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-application-registry.c 2007-01-03 07:50:44.000000000 +0100 ++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c 2007-10-11 10:13:16.429551115 +0200 +@@ -965,7 +965,7 @@ + NULL); + gnome_registry_dir.system_dir = TRUE; + +- user_registry_dir.dirname = g_build_filename (g_get_home_dir(), ++ user_registry_dir.dirname = g_build_filename (gnome_vfs_get_home_dir(), + ".gnome", + "application-info", + NULL); +Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c +=================================================================== +--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-init.c 2007-03-05 10:05:05.000000000 +0100 ++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c 2007-10-11 10:13:16.429551115 +0200 +@@ -59,29 +59,6 @@ + + static GPrivate * private_is_primary_thread; + +-static gboolean +-ensure_dot_gnome_exists (void) +-{ +- gboolean retval = TRUE; +- gchar *dirname; +- +- dirname = g_build_filename (g_get_home_dir (), ".gnome2", NULL); +- +- if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) { +- if (g_mkdir (dirname, S_IRWXU) != 0) { +- g_warning ("Unable to create ~/.gnome2 directory: %s", +- g_strerror (errno)); +- retval = FALSE; +- } +- } else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) { +- g_warning ("Error: ~/.gnome2 must be a directory."); +- retval = FALSE; +- } +- +- g_free (dirname); +- return retval; +-} +- + static void + gnome_vfs_thread_init (void) + { +@@ -112,7 +89,8 @@ + char *bogus_argv[2] = { "dummy", NULL }; + */ + +- if (!ensure_dot_gnome_exists ()) { ++ /* The first call also checks that ~/.gnome2 is writable. */ ++ if (!gnome_vfs_get_home_dir ()) { + return FALSE; + } + +Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c +=================================================================== +--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.c 2007-01-03 07:50:44.000000000 +0100 ++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c 2007-10-11 10:14:48.814815851 +0200 +@@ -1086,3 +1086,54 @@ + } + #endif + ++static gboolean ++ensure_dot_gnome_exists (gchar *home_dir) ++{ ++ gboolean retval = TRUE; ++ gchar *dirname; ++ ++ dirname = g_build_filename (home_dir, ".gnome2", NULL); ++ ++ if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) { ++ if (g_mkdir (dirname, S_IRWXU) != 0) { ++ g_warning ("Unable to create ~/.gnome2 directory: %s", ++ g_strerror (errno)); ++ retval = FALSE; ++ } ++ } else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) { ++ g_warning ("Error: ~/.gnome2 must be a directory."); ++ retval = FALSE; ++ } ++ ++ g_free (dirname); ++ return retval; ++} ++ ++/** ++ * gnome_vfs_get_home_dir: ++ * ++ * If ~/.gnome2 is writable, return the home directory ++ * Otherwise, return the contents of the HOME environment variable ++ * ++ * Return value: home directory if successful, NULL otherwise. ++ * Do not free the value returned. ++ */ ++const gchar * ++gnome_vfs_get_home_dir (void) ++{ ++ static gchar *home = NULL; ++ ++ if (home == NULL) { ++ gchar *tmp = g_get_home_dir (); ++ if (ensure_dot_gnome_exists (tmp)) { ++ home = g_strdup (tmp); ++ } else { ++ gchar *tmp2 = g_getenv ("HOME"); ++ if (!g_str_equal (tmp, tmp2) && ensure_dot_gnome_exists (tmp2)) { ++ home = g_strdup (tmp2); ++ } ++ } ++ } ++ ++ return home; ++} +Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h +=================================================================== +--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.h 2007-01-03 07:50:44.000000000 +0100 ++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h 2007-10-11 10:13:16.433551342 +0200 +@@ -124,6 +124,8 @@ + + #endif + ++const gchar *gnome_vfs_get_home_dir (void); ++ + G_END_DECLS + + #endif /* _GNOME_VFS_PRIVATE_UTILS_H */ +Index: gnome-vfs-2.20.0/modules/file-method.c +=================================================================== +--- gnome-vfs-2.20.0.orig/modules/file-method.c 2007-10-11 10:13:16.345546327 +0200 ++++ gnome-vfs-2.20.0/modules/file-method.c 2007-10-11 10:13:16.433551342 +0200 +@@ -1536,7 +1536,7 @@ + GList *p; + char *buffer, *escaped_path, *escaped_mount_point; + +- cache_file_parent = append_to_path (g_get_home_dir (), TRASH_ENTRY_CACHE_PARENT); ++ cache_file_parent = append_to_path (gnome_vfs_get_home_dir (), TRASH_ENTRY_CACHE_PARENT); + cache_file_path = append_to_path (cache_file_parent, TRASH_ENTRY_CACHE_NAME); + + if (mkdir_recursive (cache_file_parent, 0777) != 0) { +@@ -1675,7 +1675,7 @@ + cached_trash_directories = NULL; + + /* read in the entries from disk */ +- cache_file_path = g_build_filename (g_get_home_dir (), ++ cache_file_path = g_build_filename (gnome_vfs_get_home_dir (), + TRASH_ENTRY_CACHE_PARENT, + TRASH_ENTRY_CACHE_NAME, + NULL); +@@ -1947,7 +1947,7 @@ + return GNOME_VFS_ERROR_INVALID_URI; + + /* We will need the URI and the stat structure for the home directory. */ +- home_directory = g_get_home_dir (); ++ home_directory = gnome_vfs_get_home_dir (); + + if (gnome_vfs_context_check_cancellation (context)) { + g_free (full_name_near); --- gnome-vfs-2.24.0.orig/debian/patches/17_improve_volume_labels.patch +++ gnome-vfs-2.24.0/debian/patches/17_improve_volume_labels.patch @@ -0,0 +1,23 @@ +diff -Nur -x '*.orig' -x '*~' gnome-vfs-2.20.1/libgnomevfs/gnome-vfs-hal-mounts.c gnome-vfs-2.20.1.new/libgnomevfs/gnome-vfs-hal-mounts.c +--- gnome-vfs-2.20.1/libgnomevfs/gnome-vfs-hal-mounts.c 2007-11-15 18:55:58.000000000 +0100 ++++ gnome-vfs-2.20.1.new/libgnomevfs/gnome-vfs-hal-mounts.c 2007-11-15 18:56:07.000000000 +0100 +@@ -344,7 +344,7 @@ + + /* use label if available */ + label = libhal_volume_get_label (hal_volume); +- if (label != NULL && strlen (label) > 0) { ++ if (label != NULL && strlen (label) > 0 && strcmp(label, "/")) { + name = g_strdup (label); + goto out; + } +@@ -491,8 +491,8 @@ + drive_type = libhal_drive_get_type (hal_drive); + volume_label = libhal_volume_get_label (hal_volume); + +- /* Use volume label if available */ +- if (volume_label != NULL) { ++ /* Use volume label if available, but ignore '/' */ ++ if (volume_label != NULL && strlen (volume_label) && strcmp (volume_label, "/")) { + name = g_strdup (volume_label); + goto out; + } --- gnome-vfs-2.24.0.orig/debian/patches/20_dont_register_keys_for_gaim.patch +++ gnome-vfs-2.24.0/debian/patches/20_dont_register_keys_for_gaim.patch @@ -0,0 +1,45 @@ +Index: gnome-vfs-2.18.1/schemas/desktop_gnome_url_handlers.schemas.in +=================================================================== +--- gnome-vfs-2.18.1.orig/schemas/desktop_gnome_url_handlers.schemas.in 2007-04-10 14:03:54.000000000 +0200 ++++ gnome-vfs-2.18.1/schemas/desktop_gnome_url_handlers.schemas.in 2007-05-03 23:02:25.371317250 +0200 +@@ -240,40 +240,6 @@ + + + +- /schemas/desktop/gnome/url-handlers/aim/enabled +- /desktop/gnome/url-handlers/aim/enabled +- gnome +- bool +- true +- +- Whether the specified command should handle "aim" URLs +- True if the command specified in the "command" key should handle "aim" URLs. +- +- +- +- /schemas/desktop/gnome/url-handlers/aim/command +- /desktop/gnome/url-handlers/aim/command +- gnome +- string +- gaim-remote uri "%s" +- +- The handler for "aim" URLs +- The command used to handle "aim" URLs, if enabled. +- +- +- +- /schemas/desktop/gnome/url-handlers/aim/needs_terminal +- /desktop/gnome/url-handlers/aim/needs_terminal +- gnome +- bool +- false +- +- Run the command in a terminal +- True if the command used to handle this type of URL should be run in a terminal. +- +- +- +- + /schemas/desktop/gnome/url-handlers/callto/enabled + /desktop/gnome/url-handlers/callto/enabled + gnome