diff -Nru gnome-vfs-2.24.4/debian/changelog gnome-vfs-2.24.4/debian/changelog --- gnome-vfs-2.24.4/debian/changelog 2016-07-15 02:13:34.000000000 +0000 +++ gnome-vfs-2.24.4/debian/changelog 2020-07-24 21:06:59.000000000 +0000 @@ -1,29 +1,9 @@ -gnome-vfs (1:2.24.4-6.1ubuntu2) yakkety; urgency=medium +gnome-vfs (1:2.24.4-6.2) focal; urgency=medium - * Build-depend on libgnutls28-dev, since Debian never renamed to - libgnutls-dev. - - -- Steve Langasek Thu, 14 Jul 2016 19:12:45 -0700 - -gnome-vfs (1:2.24.4-6.1ubuntu1) xenial; urgency=medium - - * Merge with Debian; remaining changes: - - debian/patches/bugzilla_automake_build.patch: - - gentoo patch to fix automake1.13 build issue - - Add breaks for libgnomevfs2-common << 2.24.4 - - In addition to breaking on earlier versions we - force libgnomevfs2-common to be reinstalled - this ensures all library locations are properly created and files - exist in their architecture specific installation. - - Update build deps version to receive the full support of multi-arch - processing. - - Rebuilt with multi-arch support - - debian/control.in: don't Depends on gnome-mime-data so it's not installed - on the CD, nothing is using gnome-vfs for mimetypes it's mainly there - because other deprecated libs still used by some softwares depends on it - - Depend on libgnutls-dev instead of obsolete libgnutls28-dev + * Non-maintainer upload. + * Add sensible-utils dependency to common - -- Matthias Klose Thu, 18 Feb 2016 09:53:03 +0100 + -- Christopher Hoskin Fri, 24 Jul 2020 22:06:59 +0100 gnome-vfs (1:2.24.4-6.1) unstable; urgency=low @@ -34,36 +14,6 @@ -- Andreas Metzler Sat, 25 Jul 2015 11:55:05 +0200 -gnome-vfs (1:2.24.4-6ubuntu2) wily; urgency=medium - - * debian/control: - - Depend on libgnutls-dev instead of obsolete libgnutls28-dev - - -- Robert Ancell Fri, 31 Jul 2015 12:58:32 +1200 - -gnome-vfs (1:2.24.4-6ubuntu1) utopic; urgency=medium - - * Merge from Debian, remaining changes: - * debian/patches/bugzilla_automake_build.patch: - - gentoo patch to fix automake1.13 build issue - * Add breaks for libgnomevfs2-common << 2.24.4 - * In addition to breaking on earlier versions we - force libgnomevfs2-common to be reinstalled - this ensures all library locations are properly created and files - exist in their architecture specific installation. - * Update build deps version to receive the full support of multi-arch - processing. - * Rebuilt with multi-arch support - * debian/control.in: don't Depends on gnome-mime-data so it's not installed - on the CD, nothing is using gnome-vfs for mimetypes it's mainly there - because other deprecated libs still used by some softwares depends on it - - * Dropped changes, applied in Debian: - * 25_disable_glib_deprecations.patch: disable extra deprecations, build is - working but builders don't like "implicitly converted to pointer" - - -- Dimitri John Ledkov Fri, 08 Aug 2014 09:16:23 +0100 - gnome-vfs (1:2.24.4-6) unstable; urgency=medium * Team upload @@ -127,55 +77,6 @@ -- Michael Biebl Sun, 28 Apr 2013 20:11:10 +0200 -gnome-vfs (1:2.24.4-1ubuntu6) saucy; urgency=low - - * debian/patches/bugzilla_automake_build.patch: - - gentoo patch to fix automake1.13 build issue - - -- Sebastien Bacher Fri, 14 Jun 2013 11:01:49 +0200 - -gnome-vfs (1:2.24.4-1ubuntu5) raring; urgency=low - - * 25_disable_glib_deprecations.patch: disable extra deprecations, build is - working but builders don't like "implicitly converted to pointer" - - -- Sebastien Bacher Tue, 02 Apr 2013 15:17:57 +0200 - -gnome-vfs (1:2.24.4-1ubuntu4) raring; urgency=low - - * 25_disable_glib_deprecations.patch: disable -DG_DISABLE_DEPRECATED - to fix build with the current glib - - -- Sebastien Bacher Tue, 02 Apr 2013 13:43:03 +0200 - -gnome-vfs (1:2.24.4-1ubuntu3) quantal; urgency=low - - * Add breaks for libgnomevfs2-common << 2.24.4 - * In addition to breaking on earlier versions we - force libgnomevfs2-common to be reinstalled - this ensures all library locations are properly created and files - exist in their architecture specific installation. - * Update build deps version to receive the full support of multi-arch - processing. - * Rebuilt with multi-arch support (LP: #977940) - - -- Adam Stokes Tue, 10 Jul 2012 14:19:59 -0400 - -gnome-vfs (1:2.24.4-1ubuntu2) precise; urgency=low - - * debian/control.in: Drop libgamin-dev build dependency and FAM support. - - -- Martin Pitt Tue, 18 Oct 2011 16:34:00 +0200 - -gnome-vfs (1:2.24.4-1ubuntu1) oneiric; urgency=low - - * Resynchronize on Debian - * debian/control.in: don't Depends on gnome-mime-data so it's not installed - on the CD, nothing is using gnome-vfs for mimetypes it's mainly there - because other deprecated libs still used by some softwares depends on it - - -- Sebastien Bacher Fri, 10 Jun 2011 17:38:40 +0200 - gnome-vfs (1:2.24.4-1) unstable; urgency=low * New upstream release. @@ -198,54 +99,25 @@ -- Michael Biebl Wed, 16 Mar 2011 17:07:58 +0100 -gnome-vfs (1:2.24.4-0ubuntu1) natty; urgency=low +gnome-vfs (1:2.24.3-2) unstable; urgency=low - * New upstream release - * debian/control: - - Drop build-depends on quit - - Build-depend on dh-autoreconf, gnome-common - - Use standards-version 3.9.1 - * debian/rules: - - Drop patchsys-quilt.mk - - Use autoreconf.mk - * debian/source: - - Use source format 3.0 - * debian/patches/90_relibtoolize.patch: - - Dropped, now use dh-autoreconf - - -- Robert Ancell Thu, 25 Nov 2010 15:30:01 +1100 - -gnome-vfs (1:2.24.3-1ubuntu3) natty; urgency=low - - * debian/patches/92_build_fix.patch: correct build issue - * debian/patches/99_ltmain_as-needed.patch: not required in natty - - -- Sebastien Bacher Tue, 09 Nov 2010 23:20:25 +0100 - -gnome-vfs (1:2.24.3-1ubuntu2) natty; urgency=low - - * debian/control.in: don't recommends libgnomevfs2-extra, the library is - still a depends of libgnomeui but protocols are not useful nowadays. - - -- Sebastien Bacher Fri, 15 Oct 2010 15:26:28 +0200 - -gnome-vfs (1:2.24.3-1ubuntu1) maverick; urgency=low - - * Merge from Debian unstable. Drop most Ubuntu changes since they are - irrelevant now (since GNOME uses gvfs now). Remaining changes: - * debian/control: Build-Depends and Recommends gamin before fam - * debian/libgnomevfs2-common.install, debian/libgnomevfs2-dev.install, - debian/libgnomevfs2-common.links debian/libgnomevfs2-dev.links: Install - the API documentation in the dev package instead of -common. - * 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. - * debian/control.in: Drop libhal build dependencies. This will make - gnome-vfs fall back to good old /etc/mtab, which is good enough for old - applications which still actually use the deprecated gnome-vfs. + [ Emilio Pozuelo Monfort ] + * debian/control: Move the library to section oldlibs. + + [ Josselin Mouette ] + * Smbclient, HAL and Avahi are available on all architectures, require + them unconditionally. + * Drop type-handling usage. Closes: #587877. + * Bump standards version accordingly. + + [ Michael Biebl ] + * Disable HAL support. Closes: #599020 + This will make gnome-vfs fall back to good old /etc/mtab, which is good + enough for legacy applications which still actually use the deprecated + gnome-vfs. + * Make samba and avahi configure flags not arch specific. - -- Martin Pitt Tue, 04 May 2010 16:05:37 +0200 + -- Michael Biebl Mon, 07 Feb 2011 23:44:16 +0100 gnome-vfs (1:2.24.3-1) unstable; urgency=low @@ -273,40 +145,6 @@ -- Emilio Pozuelo Monfort Sun, 07 Feb 2010 02:20:24 +0100 -gnome-vfs (1:2.24.2-1ubuntu2) lucid; urgency=low - - * debian/patches/25_ftp_directory_read.patch: Added check that - the symlink_name is not NULL before calling functions on it. - (LP: #395835) - - -- Marcin Wider Thu, 12 Nov 2009 10:02:48 +0100 - -gnome-vfs (1:2.24.2-1ubuntu1) karmic; urgency=low - - * Merge from Debian unstable, remaining changes: (LP: #455076) - * debian/control: - - don't Build-Depends on type-handling - - Build-Depends and Recommends gamin before fam - - libgnomevfs2-dev Replaces libgnomevfs2-common (<< 1:2.20.0-0ubuntu2) - * 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/11_network-volumes-in-network.patch: - - ubuntu changes - * debian/patches/16_improve_volume_labels.patch: - - Ignore '/' volume labels, they lead to much confusion. - * 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. - - -- Robert Ancell Mon, 19 Oct 2009 11:39:45 +1100 - gnome-vfs (1:2.24.2-1) unstable; urgency=low * New upstream bugfix release: diff -Nru gnome-vfs-2.24.4/debian/control gnome-vfs-2.24.4/debian/control --- gnome-vfs-2.24.4/debian/control 2016-07-15 02:12:38.000000000 +0000 +++ gnome-vfs-2.24.4/debian/control 2020-07-24 21:06:59.000000000 +0000 @@ -1,24 +1,21 @@ # This file is autogenerated. DO NOT EDIT! -# +# # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: gnome-vfs Section: oldlibs Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Josselin Mouette -Uploaders: Debian GNOME Maintainers +Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Michael Biebl Build-Depends: cdbs, dh-autoreconf, - gnome-common, gtk-doc-tools (>= 1.0), libglib2.0-dev (>= 2.9.3), libgconf2-dev (>= 2.8.0), libxml2-dev (>= 2.6.0), libbz2-dev, - libsmbclient-dev, gettext, - debhelper (>= 8.1.3~), + debhelper (>= 8), zlib1g-dev, intltool (>= 0.35.0), gnome-mime-data, @@ -34,17 +31,19 @@ libattr1-dev Build-Depends-Indep: libglib2.0-doc Standards-Version: 3.9.1 -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-vfs/ubuntu +Vcs-Svn: svn://svn.debian.org/pkg-gnome/attic/gnome-vfs/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/ Package: libgnomevfs2-common -Architecture: any +Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, - shared-mime-info + gnome-mime-data, + shared-mime-info, + sensible-utils Conflicts: gnome-panel (<< 2.10.0), libgnomevfs2-0 (<< 2.12.2-4), libgnomevfs2-extra (<< 1:2.16.3-6) -Suggests: gnome-mime-data 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 @@ -60,12 +59,10 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - dbus (>= 0.90), libgnomevfs2-common (= ${source:Version}) -Recommends: dbus-x11 -Suggests: libgnomevfs2-bin, libgnomevfs2-extra, gamin | fam -Replaces: libgnomevfs2-common (<< 1:2.24.4-1) -Breaks: libgnomevfs2-common (<< 1:2.24.4-1) +Recommends: libgnomevfs2-extra +Suggests: libgnomevfs2-bin +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 @@ -95,7 +92,6 @@ Package: libgnomevfs2-extra Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libgnomevfs2-common (= ${source:Version}) @@ -112,8 +108,7 @@ 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. + * the http module (which also includes support for WebDAV). Package: libgnomevfs2-0-dbg Architecture: any @@ -137,7 +132,6 @@ Architecture: any Multi-Arch: same Section: libdevel -Pre-Depends: ${misc:Pre-Depends} Depends: libgnomevfs2-0 (= ${binary:Version}), ${misc:Depends}, libgconf2-dev (>= 2.8.0-1), diff -Nru gnome-vfs-2.24.4/debian/control.in gnome-vfs-2.24.4/debian/control.in --- gnome-vfs-2.24.4/debian/control.in 2016-07-15 02:12:30.000000000 +0000 +++ gnome-vfs-2.24.4/debian/control.in 2020-07-24 21:06:59.000000000 +0000 @@ -1,20 +1,17 @@ Source: gnome-vfs Section: oldlibs Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Josselin Mouette +Maintainer: Josselin Mouette Uploaders: @GNOME_TEAM@ Build-Depends: cdbs, dh-autoreconf, - gnome-common, gtk-doc-tools (>= 1.0), libglib2.0-dev (>= 2.9.3), libgconf2-dev (>= 2.8.0), libxml2-dev (>= 2.6.0), libbz2-dev, - libsmbclient-dev, gettext, - debhelper (>= 8.1.3~), + debhelper (>= 8), zlib1g-dev, intltool (>= 0.35.0), gnome-mime-data, @@ -30,17 +27,19 @@ libattr1-dev Build-Depends-Indep: libglib2.0-doc Standards-Version: 3.9.1 -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-vfs/ubuntu +Vcs-Svn: svn://svn.debian.org/pkg-gnome/attic/gnome-vfs/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/ Package: libgnomevfs2-common -Architecture: any +Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, - shared-mime-info + gnome-mime-data, + shared-mime-info, + sensible-utils Conflicts: gnome-panel (<< 2.10.0), libgnomevfs2-0 (<< 2.12.2-4), libgnomevfs2-extra (<< 1:2.16.3-6) -Suggests: gnome-mime-data 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 @@ -56,12 +55,10 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - dbus (>= 0.90), libgnomevfs2-common (= ${source:Version}) -Recommends: dbus-x11 -Suggests: libgnomevfs2-bin, libgnomevfs2-extra, gamin | fam -Replaces: libgnomevfs2-common (<< 1:2.24.4-1) -Breaks: libgnomevfs2-common (<< 1:2.24.4-1) +Recommends: libgnomevfs2-extra +Suggests: libgnomevfs2-bin +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 @@ -91,7 +88,6 @@ Package: libgnomevfs2-extra Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libgnomevfs2-common (= ${source:Version}) @@ -108,8 +104,7 @@ 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. + * the http module (which also includes support for WebDAV). Package: libgnomevfs2-0-dbg Architecture: any @@ -133,7 +128,6 @@ Architecture: any Multi-Arch: same Section: libdevel -Pre-Depends: ${misc:Pre-Depends} Depends: libgnomevfs2-0 (= ${binary:Version}), ${misc:Depends}, libgconf2-dev (>= 2.8.0-1), diff -Nru gnome-vfs-2.24.4/debian/libgnomevfs2-0.install gnome-vfs-2.24.4/debian/libgnomevfs2-0.install --- gnome-vfs-2.24.4/debian/libgnomevfs2-0.install 2015-07-31 00:59:52.000000000 +0000 +++ gnome-vfs-2.24.4/debian/libgnomevfs2-0.install 2013-11-06 12:55:24.000000000 +0000 @@ -1,3 +1,2 @@ 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 diff -Nru gnome-vfs-2.24.4/debian/libgnomevfs2-common.install gnome-vfs-2.24.4/debian/libgnomevfs2-common.install --- gnome-vfs-2.24.4/debian/libgnomevfs2-common.install 2015-07-31 00:59:52.000000000 +0000 +++ gnome-vfs-2.24.4/debian/libgnomevfs2-common.install 2013-11-06 12:55:24.000000000 +0000 @@ -1,3 +1,4 @@ debian/tmp/etc/gconf debian/tmp/etc/gnome-vfs-2.0/modules/default-modules.conf debian/tmp/usr/share/locale +debian/tmp/usr/share/gtk-doc/html/gnome-vfs-2.0/* usr/share/doc/libgnomevfs2-common/html/ diff -Nru gnome-vfs-2.24.4/debian/libgnomevfs2-common.links gnome-vfs-2.24.4/debian/libgnomevfs2-common.links --- gnome-vfs-2.24.4/debian/libgnomevfs2-common.links 1970-01-01 00:00:00.000000000 +0000 +++ gnome-vfs-2.24.4/debian/libgnomevfs2-common.links 2009-03-19 21:27:41.000000000 +0000 @@ -0,0 +1 @@ +usr/share/doc/libgnomevfs2-common/html/ usr/share/gtk-doc/html/gnome-vfs-2.0 diff -Nru gnome-vfs-2.24.4/debian/libgnomevfs2-dev.install gnome-vfs-2.24.4/debian/libgnomevfs2-dev.install --- gnome-vfs-2.24.4/debian/libgnomevfs2-dev.install 2015-07-31 00:59:52.000000000 +0000 +++ gnome-vfs-2.24.4/debian/libgnomevfs2-dev.install 2013-11-06 12:55:24.000000000 +0000 @@ -4,4 +4,3 @@ 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/ diff -Nru gnome-vfs-2.24.4/debian/libgnomevfs2-dev.links gnome-vfs-2.24.4/debian/libgnomevfs2-dev.links --- gnome-vfs-2.24.4/debian/libgnomevfs2-dev.links 2015-07-31 00:59:52.000000000 +0000 +++ gnome-vfs-2.24.4/debian/libgnomevfs2-dev.links 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/doc/libgnomevfs2-common/html/ usr/share/gtk-doc/html/gnome-vfs-2.0 diff -Nru gnome-vfs-2.24.4/debian/libgnomevfs2-extra.install gnome-vfs-2.24.4/debian/libgnomevfs2-extra.install --- gnome-vfs-2.24.4/debian/libgnomevfs2-extra.install 2015-07-31 00:59:52.000000000 +0000 +++ gnome-vfs-2.24.4/debian/libgnomevfs2-extra.install 2013-11-06 21:45:01.000000000 +0000 @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/*/gnome-vfs-2.0/modules/lib{bzip2,smb,http,ftp}.so +debian/tmp/usr/lib/*/gnome-vfs-2.0/modules/lib{bzip2,http,ftp}.so debian/extra-modules.conf /etc/gnome-vfs-2.0/modules/ diff -Nru gnome-vfs-2.24.4/debian/patches/21_proxy_ignore_local.patch gnome-vfs-2.24.4/debian/patches/21_proxy_ignore_local.patch --- gnome-vfs-2.24.4/debian/patches/21_proxy_ignore_local.patch 2015-07-31 00:59:52.000000000 +0000 +++ gnome-vfs-2.24.4/debian/patches/21_proxy_ignore_local.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Index: gnome-vfs-2.24.4/schemas/system_http_proxy.schemas.in -=================================================================== ---- gnome-vfs-2.24.4.orig/schemas/system_http_proxy.schemas.in 2010-02-09 23:16:14.000000000 +1100 -+++ gnome-vfs-2.24.4/schemas/system_http_proxy.schemas.in 2010-11-25 15:35:16.983441002 +1100 -@@ -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 -Index: gnome-vfs-2.24.4/schemas/system_http_proxy.schemas -=================================================================== ---- gnome-vfs-2.24.4.orig/schemas/system_http_proxy.schemas 2010-09-28 19:36:12.000000000 +1000 -+++ gnome-vfs-2.24.4/schemas/system_http_proxy.schemas 2010-11-25 15:35:16.983441002 +1100 -@@ -2430,7 +2430,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 diff -Nru gnome-vfs-2.24.4/debian/patches/23_ignore_ltspfs_volumes.patch gnome-vfs-2.24.4/debian/patches/23_ignore_ltspfs_volumes.patch --- gnome-vfs-2.24.4/debian/patches/23_ignore_ltspfs_volumes.patch 2015-07-31 00:59:52.000000000 +0000 +++ gnome-vfs-2.24.4/debian/patches/23_ignore_ltspfs_volumes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Index: gnome-vfs-2.24.1-ubuntu/libgnomevfs/gnome-vfs-volume-monitor-daemon.c -=================================================================== ---- gnome-vfs-2.24.1-ubuntu.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2009-09-11 11:40:32.000000000 +1000 -+++ gnome-vfs-2.24.1-ubuntu/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2009-09-11 11:40:35.000000000 +1000 -@@ -1067,6 +1067,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); diff -Nru gnome-vfs-2.24.4/debian/patches/bugzilla_automake_build.patch gnome-vfs-2.24.4/debian/patches/bugzilla_automake_build.patch --- gnome-vfs-2.24.4/debian/patches/bugzilla_automake_build.patch 2015-07-31 00:59:52.000000000 +0000 +++ gnome-vfs-2.24.4/debian/patches/bugzilla_automake_build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -From 03f0cc3be02d1a99cab32d6e094f02e66aee7323 Mon Sep 17 00:00:00 2001 -Message-Id: <03f0cc3be02d1a99cab32d6e094f02e66aee7323.1367754199.git.jlec@gentoo.org> -From: Justin Lecher -Date: Sun, 5 May 2013 13:43:09 +0200 -Subject: [PATCH] Compatibility fix for automake-1.13 - -The macro AM_CONFIG_HEADER is deprecated and should be replaced by -AC_CONFIGE_HEADERS - -Usage of '$(srcdir)' in TESTS is currently broken - -https://bugzilla.gnome.org/show_bug.cgi?id=699705 -https://bugs.gentoo.org/show_bug.cgi?id=466944 - -Signed-off-by: Justin Lecher ---- - configure.in | 2 +- - test/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index c997af8..891ddc2 100644 ---- a/configure.in -+++ b/configure.in -@@ -33,7 +33,7 @@ AC_SUBST(LIBGNOMEVFS_REVISION) - AC_SUBST(LIBGNOMEVFS_AGE) - AC_SUBST(LIBGNOMEVFS_VERSION) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE(gnome-vfs, $LIBGNOMEVFS_VERSION) - - dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work diff -Nru gnome-vfs-2.24.4/debian/patches/series gnome-vfs-2.24.4/debian/patches/series --- gnome-vfs-2.24.4/debian/patches/series 2016-02-18 08:56:12.000000000 +0000 +++ gnome-vfs-2.24.4/debian/patches/series 2015-07-25 09:54:57.000000000 +0000 @@ -16,9 +16,7 @@ 16_no_extra_dbus_messages.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 @@ -27,4 +25,3 @@ 41_test_srcdir.patch gnutls3.patch gnutls_deprecated.diff -bugzilla_automake_build.patch diff -Nru gnome-vfs-2.24.4/debian/rules gnome-vfs-2.24.4/debian/rules --- gnome-vfs-2.24.4/debian/rules 2015-07-31 00:59:52.000000000 +0000 +++ gnome-vfs-2.24.4/debian/rules 2020-07-24 20:51:29.000000000 +0000 @@ -18,14 +18,12 @@ #debug lib DEB_DH_STRIP_ARGS := --dbg-package=libgnomevfs2-0-dbg -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - -DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc \ - --enable-gnutls \ +DEB_CONFIGURE_EXTRA_FLAGS := --enable-gnutls \ --enable-avahi \ --disable-openssl \ --disable-hal \ - --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-vfs-2.0 \ + --disable-fam \ + --disable-samba \ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --libexecdir=\$${libdir}/gnome-vfs-2.0 \ $(HOST_ARCH_CONFIGURE_FLAGS)