r10064 - in /desktop/unstable/gnome-vfs2/debian: ./ patches/
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Mon Apr 16 15:37:59 UTC 2007
Author: slomo
Date: Mon Apr 16 15:37:58 2007
New Revision: 10064
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10064
Log:
* update gnome-vfs2 to 2.18.1-1 and prepare for unstable
Added:
desktop/unstable/gnome-vfs2/debian/extra-modules.conf
desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.preinst
desktop/unstable/gnome-vfs2/debian/patches/04_sftp_pam_krb5.patch
desktop/unstable/gnome-vfs2/debian/patches/05_default_modules.patch
desktop/unstable/gnome-vfs2/debian/patches/20_dont_register_keys_for_gaim.patch
desktop/unstable/gnome-vfs2/debian/patches/22_ignore_inaccessible_volumes.patch
Removed:
desktop/unstable/gnome-vfs2/debian/patches/04_moniker_libexecdir.patch
desktop/unstable/gnome-vfs2/debian/patches/05_mime_handler_%.patch
desktop/unstable/gnome-vfs2/debian/patches/06_modules_conf.patch
desktop/unstable/gnome-vfs2/debian/patches/07_fam_remote.patch
desktop/unstable/gnome-vfs2/debian/patches/20_dont-always-cancel-if-file-exists.patch
Modified:
desktop/unstable/gnome-vfs2/debian/changelog
desktop/unstable/gnome-vfs2/debian/control
desktop/unstable/gnome-vfs2/debian/control.in
desktop/unstable/gnome-vfs2/debian/defaults.list
desktop/unstable/gnome-vfs2/debian/libgnomevfs2-0.install
desktop/unstable/gnome-vfs2/debian/libgnomevfs2-0.shlibs
desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.install
desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.preinst
desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.install
desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.install.hurd-i386
desktop/unstable/gnome-vfs2/debian/patches/08_recursive_local_check.patch
desktop/unstable/gnome-vfs2/debian/patches/30_nfs4.patch
desktop/unstable/gnome-vfs2/debian/rules
desktop/unstable/gnome-vfs2/debian/watch
Modified: desktop/unstable/gnome-vfs2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/changelog?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/changelog (original)
+++ desktop/unstable/gnome-vfs2/debian/changelog Mon Apr 16 15:37:58 2007
@@ -1,16 +1,154 @@
-gnome-vfs2 (1:2.14.2-7) unstable; urgency=high
-
+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.
-
- -- Loic Minier <lool at dooz.org> Mon, 12 Mar 2007 17:30:45 +0100
-
-gnome-vfs2 (1:2.14.2-6) unstable; urgency=medium
-
+ * 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 <slomo at debian.org> 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.
- -- Loic Minier <lool at dooz.org> Fri, 9 Feb 2007 21:22:02 +0100
+ -- Josselin Mouette <joss at debian.org> 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 <joss at debian.org> 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 <joss at debian.org> 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 <joss at debian.org> 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 <lool at dooz.org> 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 <lool at dooz.org> 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 <joss at debian.org> 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 <joss at debian.org> 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 <joss at debian.org> 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 <lool at dooz.org> 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 <joss at debian.org> Thu, 7 Sep 2006 22:49:31 +0200
gnome-vfs2 (1:2.14.2-5) unstable; urgency=low
@@ -21,8 +159,8 @@
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
+ * 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 <joss at debian.org> Sat, 9 Dec 2006 01:51:58 +0100
Modified: desktop/unstable/gnome-vfs2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/control?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/control (original)
+++ desktop/unstable/gnome-vfs2/debian/control Mon Apr 16 15:37:58 2007
@@ -2,35 +2,36 @@
Section: libs
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: cdbs, type-handling, gtk-doc-tools, libbonobo2-dev (>= 2.6.0), libglib2.0-dev (>= 2.9.3), libgconf2-dev (>= 2.8.0-1), libxml2-dev (>= 2.6.0), libbz2-dev, libfam-dev (>= 2.6.9-4) [!hurd-i386], libsmbclient-dev [!hurd-i386], gettext, debhelper (>= 5.0.13), zlib1g-dev, intltool, gnome-mime-data, libgnutls-dev (>= 1.0.4-3), liborbit2-dev (>= 1:2.10.0), gnome-pkg-tools (>= 0.6), dpkg-dev (>= 1.13.19), libdbus-glib-1-dev (>= 0.60) [!hurd-i386], libhal-dev | not+linux-gnu, libhal-storage-dev | not+linux-gnu, libavahi-client-dev [!hurd-i386], libavahi-glib-dev [!hurd-i386]
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Build-Depends: cdbs, type-handling, gtk-doc-tools (>= 1.0), libglib2.0-dev (>= 2.9.3), libgconf2-dev (>= 2.8.0-1), libxml2-dev (>= 2.6.0), libbz2-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) [!hurd-i386], 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, linux-kernel-headers (>= 2.6.13) | not+linux-gnu
Standards-Version: 3.7.2
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)
-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 file systems, http, ftp and others.
- It provides a URI-based API, a backend supporting asynchronous file
+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}, libgnomevfs2-common (>= ${gnome:Version}), libgnomevfs2-common (<< ${gnome:NextVersion})
-Recommends: libgnomevfs2-extra, fam
+Depends: ${shlibs:Depends}, dbus (>= 0.90), libgnomevfs2-common (>= ${gnome:Version}), libgnomevfs2-common (<< ${gnome:NextVersion})
+Recommends: libgnomevfs2-extra, fam, gnome-mount
Suggests: libgnomevfs2-bin
Replaces: libgnomevfs2-common (<< 2.12.2-4)
-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 file systems, http, ftp and others.
- It provides a URI-based API, a backend supporting asynchronous file
+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
@@ -40,11 +41,11 @@
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 file systems, http, ftp and others.
- It provides a URI-based API, a backend supporting asynchronous file
+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
@@ -53,11 +54,19 @@
Package: libgnomevfs2-extra
Architecture: any
Depends: ${shlibs:Depends}, libgnomevfs2-common (>= ${gnome:Version}), libgnomevfs2-common (<< ${gnome:NextVersion})
-Conflicts: libgnomevfs2-common (<< 2.12.2-7)
-Description: GNOME virtual file-system (extra modules)
- This package contains extra VFS modules for the GNOME virtual
- file-system. Currently, it includes:
+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
@@ -65,22 +74,28 @@
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 file systems, http, ftp and others.
- It provides a URI-based API, a backend supporting asynchronous file
+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, this makes it somewhat
- easier to interpret core dumps. The libraries are installed in
- /usr/lib/debug and are automatically used by gdb.
+ 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}), libc6-dev, libgconf2-dev (>= 2.8.0-1), libbonobo2-dev (>= 2.6.0), libgnutls-dev, libxml2-dev, libavahi-client-dev | hurd, libavahi-glib-dev | hurd, libdbus-1-dev | hurd
-Description: GNOME virtual file-system library (development files)
+Depends: libgnomevfs2-0 (= ${binary:Version}), libc6-dev, 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
+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.
Modified: desktop/unstable/gnome-vfs2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/control.in?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/control.in (original)
+++ desktop/unstable/gnome-vfs2/debian/control.in Mon Apr 16 15:37:58 2007
@@ -3,34 +3,35 @@
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs, type-handling, gtk-doc-tools, libbonobo2-dev (>= 2.6.0), libglib2.0-dev (>= 2.9.3), libgconf2-dev (>= 2.8.0-1), libxml2-dev (>= 2.6.0), libbz2-dev, libfam-dev (>= 2.6.9-4) [!hurd-i386], libsmbclient-dev [!hurd-i386], gettext, debhelper (>= 5.0.13), zlib1g-dev, intltool, gnome-mime-data, libgnutls-dev (>= 1.0.4-3), liborbit2-dev (>= 1:2.10.0), gnome-pkg-tools (>= 0.6), dpkg-dev (>= 1.13.19), libdbus-glib-1-dev (>= 0.60) [!hurd-i386], libhal-dev | not+linux-gnu, libhal-storage-dev | not+linux-gnu, libavahi-client-dev [!hurd-i386], libavahi-glib-dev [!hurd-i386]
+Build-Depends: cdbs, type-handling, gtk-doc-tools (>= 1.0), libglib2.0-dev (>= 2.9.3), libgconf2-dev (>= 2.8.0-1), libxml2-dev (>= 2.6.0), libbz2-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) [!hurd-i386], 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, linux-kernel-headers (>= 2.6.13) | not+linux-gnu
Standards-Version: 3.7.2
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)
-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 file systems, http, ftp and others.
- It provides a URI-based API, a backend supporting asynchronous file
+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}, libgnomevfs2-common (>= ${gnome:Version}), libgnomevfs2-common (<< ${gnome:NextVersion})
-Recommends: libgnomevfs2-extra, fam
+Depends: ${shlibs:Depends}, dbus (>= 0.90), libgnomevfs2-common (>= ${gnome:Version}), libgnomevfs2-common (<< ${gnome:NextVersion})
+Recommends: libgnomevfs2-extra, fam, gnome-mount
Suggests: libgnomevfs2-bin
Replaces: libgnomevfs2-common (<< 2.12.2-4)
-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 file systems, http, ftp and others.
- It provides a URI-based API, a backend supporting asynchronous file
+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
@@ -40,11 +41,11 @@
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 file systems, http, ftp and others.
- It provides a URI-based API, a backend supporting asynchronous file
+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
@@ -53,11 +54,19 @@
Package: libgnomevfs2-extra
Architecture: any
Depends: ${shlibs:Depends}, libgnomevfs2-common (>= ${gnome:Version}), libgnomevfs2-common (<< ${gnome:NextVersion})
-Conflicts: libgnomevfs2-common (<< 2.12.2-7)
-Description: GNOME virtual file-system (extra modules)
- This package contains extra VFS modules for the GNOME virtual
- file-system. Currently, it includes:
+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
@@ -65,22 +74,28 @@
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 file systems, http, ftp and others.
- It provides a URI-based API, a backend supporting asynchronous file
+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, this makes it somewhat
- easier to interpret core dumps. The libraries are installed in
- /usr/lib/debug and are automatically used by gdb.
+ 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}), libc6-dev, libgconf2-dev (>= 2.8.0-1), libbonobo2-dev (>= 2.6.0), libgnutls-dev, libxml2-dev, libavahi-client-dev | hurd, libavahi-glib-dev | hurd, libdbus-1-dev | hurd
-Description: GNOME virtual file-system library (development files)
+Depends: libgnomevfs2-0 (= ${binary:Version}), libc6-dev, 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
+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.
Modified: desktop/unstable/gnome-vfs2/debian/defaults.list
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/defaults.list?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/defaults.list (original)
+++ desktop/unstable/gnome-vfs2/debian/defaults.list Mon Apr 16 15:37:58 2007
@@ -2,14 +2,12 @@
application/msword=abiword.desktop
application/rtf=abiword.desktop
application/vnd.ms-word=abiword.desktop
-application/vnd.palm=abiword.desktop
-application/wordperfect5.1=abiword.desktop
application/x-abiword=abiword.desktop
-application/x-applix-word=abiword.desktop
-application/x-palm-database=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
@@ -28,19 +26,34 @@
image/x-portable-bitmap=eog.desktop
image/x-portable-graymap=eog.desktop
image/x-portable-pixmap=eog.desktop
-image/x-psd=eog.desktop
image/x-xbitmap=eog.desktop
image/x-xpixmap=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-gzpostscript=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-7zip=file-roller.desktop
application/x-ar=file-roller.desktop
application/x-arj=file-roller.desktop
application/x-bzip=file-roller.desktop
@@ -100,61 +113,120 @@
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/vnd.wordperfect=ooo-writer.desktop
+application/wordperfect=ooo-writer.desktop
application/ogg=totem.desktop
+application/ram=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-ogg=totem.desktop
+application/x-quicktime-media-link=totem.desktop
+application/x-quicktimeplayer=totem.desktop
application/x-shockwave-flash=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/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-scpls=totem.desktop
+audio/x-tta=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-msvideo=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
Added: desktop/unstable/gnome-vfs2/debian/extra-modules.conf
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/extra-modules.conf?rev=10064&op=file
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/extra-modules.conf (added)
+++ desktop/unstable/gnome-vfs2/debian/extra-modules.conf Mon Apr 16 15:37:58 2007
@@ -1,0 +1,21 @@
+#
+# Module configuration file for the GNOME Virtual File System.
+#
+# Syntax:
+#
+# <method 1> <method 2> ... <method N> : <module>
+#
+
+smb: [daemon] libsmb
+
+bzip2: bzip2
+
+ftp: ftp
+
+http: http
+
+dav: http
+
+davs: http
+
+https: http
Modified: desktop/unstable/gnome-vfs2/debian/libgnomevfs2-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/libgnomevfs2-0.install?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/libgnomevfs2-0.install (original)
+++ desktop/unstable/gnome-vfs2/debian/libgnomevfs2-0.install Mon Apr 16 15:37:58 2007
@@ -1,4 +1,3 @@
debian/tmp/usr/lib/libgnomevfs-2.so.*
-debian/tmp/usr/lib/bonobo/monikers/libmoniker_gnome_vfs_std.so /usr/lib/gnome-vfs-2.0/
debian/tmp/usr/lib/gnome-vfs-2.0/gnome-vfs-daemon
-debian/tmp/usr/lib/gnome-vfs-2.0/modules/lib{ftp,network,file,tar,computer,gzip,http,vfs-test,sftp,dns-sd}.so
+debian/tmp/usr/lib/gnome-vfs-2.0/modules/lib{network,file,tar,computer,gzip,vfs-test,sftp,dns-sd}.so
Modified: desktop/unstable/gnome-vfs2/debian/libgnomevfs2-0.shlibs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/libgnomevfs2-0.shlibs?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/libgnomevfs2-0.shlibs (original)
+++ desktop/unstable/gnome-vfs2/debian/libgnomevfs2-0.shlibs Mon Apr 16 15:37:58 2007
@@ -1,1 +1,1 @@
-libgnomevfs-2 0 libgnomevfs2-0 (>= 2.13.92)
+libgnomevfs-2 0 libgnomevfs2-0 (>= 1:2.17.90)
Modified: desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.install?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.install (original)
+++ desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.install Mon Apr 16 15:37:58 2007
@@ -1,6 +1,6 @@
debian/tmp/etc/gconf
-debian/tmp/etc/gnome-vfs-2.0
-debian/tmp/usr/lib/bonobo/servers
+debian/tmp/etc/gnome-vfs-2.0/modules/default-modules.conf
+debian/tmp/usr/share/dbus-1
debian/tmp/usr/share/locale
debian/tmp/usr/share/gtk-doc/html/gnome-vfs-2.0/* usr/share/doc/libgnomevfs2-common/html/
debian/defaults.list etc/gnome-vfs-2.0/
Modified: desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.preinst?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.preinst (original)
+++ desktop/unstable/gnome-vfs2/debian/libgnomevfs2-common.preinst Mon Apr 16 15:37:58 2007
@@ -1,18 +1,6 @@
#!/bin/sh
set -e
-
-prep_mv_conffile() {
- CONFFILE="$1"
-
- if [ -e "$CONFFILE" ]; then
- md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
- old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
- if [ "$md5sum" = "$old_md5sum" ]; then
- rm -f "$CONFFILE"
- fi
- fi
-}
rm_conffile() {
CONFFILE="$1"
@@ -31,16 +19,10 @@
fi
}
-NEWVERSION=2.12.2-7
-
case "$1" in
install|upgrade)
- # CDDA method is not shipped anymore, so remove it's conffile
- rm_conffile /etc/gnome-vfs-2.0/modules/cdda-module.conf
- # The SMB method is now distributed in a separate package.
- if [ -n "$2" ] && dpkg --compare-versions "$2" lt "$NEWVERSION"; then
- prep_mv_conffile /etc/gnome-vfs-2.0/modules/smb-module.conf
- fi
+ # The https method is now described in extra-modules.conf
+ rm_conffile /etc/gnome-vfs-2.0/modules/ssl-modules.conf
;;
esac
Modified: desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.install?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.install (original)
+++ desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.install Mon Apr 16 15:37:58 2007
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/gnome-vfs-2.0/modules/lib{bzip2,smb}.so
-debian/tmp/etc/gnome-vfs-2.0/modules/smb-module.conf
+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/
Modified: desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.install.hurd-i386
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.install.hurd-i386?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.install.hurd-i386 (original)
+++ desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.install.hurd-i386 Mon Apr 16 15:37:58 2007
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/gnome-vfs-2.0/modules/libbzip2.so
+debian/tmp/usr/lib/gnome-vfs-2.0/modules/lib{bzip2,http,ftp}.so
Added: desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.preinst?rev=10064&op=file
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.preinst (added)
+++ desktop/unstable/gnome-vfs2/debian/libgnomevfs2-extra.preinst Mon Apr 16 15:37:58 2007
@@ -1,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+rm_conffile() {
+ CONFFILE="$1"
+
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
+ 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 /etc/gnome-vfs-2.0/modules/smb-module.conf
+ ;;
+esac
+
+#DEBHELPER#
Added: desktop/unstable/gnome-vfs2/debian/patches/04_sftp_pam_krb5.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/04_sftp_pam_krb5.patch?rev=10064&op=file
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/04_sftp_pam_krb5.patch (added)
+++ desktop/unstable/gnome-vfs2/debian/patches/04_sftp_pam_krb5.patch Mon Apr 16 15:37:58 2007
@@ -1,0 +1,11 @@
+--- modules/sftp-method.c.orig 2006-07-21 19:13:29.000000000 +0200
++++ modules/sftp-method.c 2007-02-28 18:27:29.000000000 +0100
+@@ -1273,6 +1273,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 && gnome_vfs_uri_get_password (uri) != NULL) {
+ password = g_strdup (gnome_vfs_uri_get_password (uri));
Added: desktop/unstable/gnome-vfs2/debian/patches/05_default_modules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/05_default_modules.patch?rev=10064&op=file
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/05_default_modules.patch (added)
+++ desktop/unstable/gnome-vfs2/debian/patches/05_default_modules.patch Mon Apr 16 15:37:58 2007
@@ -1,0 +1,33 @@
+--- modules/default-modules.conf.orig 2006-09-06 22:27:34.000000000 +0200
++++ modules/default-modules.conf 2007-02-24 10:45:30.000000000 +0100
+@@ -6,8 +6,6 @@
+ # <method 1> <method 2> ... <method N> : <module>
+ #
+
+-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
Modified: desktop/unstable/gnome-vfs2/debian/patches/08_recursive_local_check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/08_recursive_local_check.patch?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/08_recursive_local_check.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/08_recursive_local_check.patch Mon Apr 16 15:37:58 2007
@@ -1,30 +1,47 @@
---- modules/file-method.c.orig 2006-09-01 22:59:02.000000000 +0200
-+++ modules/file-method.c 2006-09-01 23:12:24.000000000 +0200
-@@ -1145,7 +1145,7 @@
- else
- local = g_hash_table_lookup (fstype_hash, path);
+--- modules/file-method.c.orig 2006-08-23 13:19:26.000000000 +0200
++++ modules/file-method.c 2006-09-06 22:19:02.000000000 +0200
+@@ -1258,6 +1258,7 @@
+ struct stat statbuf;
+ gboolean is_local;
+ gchar *path;
++ char *type;
-- if (local == NULL) {
-+ while (local == NULL) {
- struct stat statbuf;
- if (g_stat (path, &statbuf) == 0) {
- char *type = filesystem_type (path, path, &statbuf);
-@@ -1155,10 +1155,15 @@
- (strcmp (type, "unknown") != 0) &&
- (strcmp (type, "ncpfs") != 0));
- local = GINT_TO_POINTER (is_local ? 1 : -1);
-- g_hash_table_insert (fstype_hash, path, local);
-+ g_hash_table_insert (fstype_hash, g_strdup (path), local);
-+ } else {
-+ char *tmp_path = g_path_get_dirname (path);
-+ g_free (path);
-+ path = tmp_path;
-+ local = g_hash_table_lookup (fstype_hash, path);
- }
-- } else
-- g_free (path);
-+ }
-+ g_free (path);
+ g_return_val_if_fail (uri != NULL, FALSE);
- G_UNLOCK (fstype_hash);
- return GPOINTER_TO_INT (local) > 0;
+@@ -1265,21 +1266,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;
+ }
Added: desktop/unstable/gnome-vfs2/debian/patches/20_dont_register_keys_for_gaim.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/20_dont_register_keys_for_gaim.patch?rev=10064&op=file
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/20_dont_register_keys_for_gaim.patch (added)
+++ desktop/unstable/gnome-vfs2/debian/patches/20_dont_register_keys_for_gaim.patch Mon Apr 16 15:37:58 2007
@@ -1,0 +1,44 @@
+diff -Nur gnome-vfs2-2.16.3/schemas/desktop_gnome_url_handlers.schemas.in gnome-vfs2-2.16.3.new/schemas/desktop_gnome_url_handlers.schemas.in
+--- gnome-vfs2-2.16.3/schemas/desktop_gnome_url_handlers.schemas.in 2006-12-07 12:01:26.000000000 +0100
++++ gnome-vfs2-2.16.3.new/schemas/desktop_gnome_url_handlers.schemas.in 2006-12-07 12:02:01.000000000 +0100
+@@ -274,40 +274,6 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/gnome/url-handlers/aim/enabled</key>
+- <applyto>/desktop/gnome/url-handlers/aim/enabled</applyto>
+- <owner>gnome</owner>
+- <type>bool</type>
+- <default>true</default>
+- <locale name="C">
+- <short>Whether the specified command should handle "aim" URLs</short>
+- <long>True if the command specified in the "command" key should handle "aim" URLs.</long>
+- </locale>
+- </schema>
+- <schema>
+- <key>/schemas/desktop/gnome/url-handlers/aim/command</key>
+- <applyto>/desktop/gnome/url-handlers/aim/command</applyto>
+- <owner>gnome</owner>
+- <type>string</type>
+- <default>gaim-remote uri "%s"</default>
+- <locale name="C">
+- <short>The handler for "aim" URLs</short>
+- <long>The command used to handle "aim" URLs, if enabled.</long>
+- </locale>
+- </schema>
+- <schema>
+- <key>/schemas/desktop/gnome/url-handlers/aim/needs_terminal</key>
+- <applyto>/desktop/gnome/url-handlers/aim/needs_terminal</applyto>
+- <owner>gnome</owner>
+- <type>bool</type>
+- <default>false</default>
+- <locale name="C">
+- <short>Run the command in a terminal</short>
+- <long>True if the command used to handle this type of URL should be run in a terminal.</long>
+- </locale>
+- </schema>
+-
+- <schema>
+ <key>/schemas/desktop/gnome/url-handlers/callto/enabled</key>
+ <applyto>/desktop/gnome/url-handlers/callto/enabled</applyto>
+ <owner>gnome</owner>
Added: desktop/unstable/gnome-vfs2/debian/patches/22_ignore_inaccessible_volumes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/22_ignore_inaccessible_volumes.patch?rev=10064&op=file
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/22_ignore_inaccessible_volumes.patch (added)
+++ desktop/unstable/gnome-vfs2/debian/patches/22_ignore_inaccessible_volumes.patch Mon Apr 16 15:37:58 2007
@@ -1,0 +1,45 @@
+diff -Nur gnome-vfs2-2.15.92/libgnomevfs/gnome-vfs-hal-mounts.c gnome-vfs2-2.15.92.new/libgnomevfs/gnome-vfs-hal-mounts.c
+--- gnome-vfs2-2.15.92/libgnomevfs/gnome-vfs-hal-mounts.c 2006-08-22 10:40:05.000000000 +0200
++++ gnome-vfs2-2.15.92.new/libgnomevfs/gnome-vfs-hal-mounts.c 2006-08-22 10:42:53.000000000 +0200
+@@ -39,6 +39,7 @@
+
+ #include <glib.h>
+ #include <glib/gi18n-lib.h>
++#include <glib/gstdio.h>
+ #include <libgnomevfs/gnome-vfs-utils.h>
+
+ #include <libhal.h>
+@@ -699,6 +700,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;
+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 10:40:04.000000000 +0200
++++ gnome-vfs2-2.15.92.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2006-08-22 10:48:11.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <libgnomevfs/gnome-vfs-utils.h>
+ #include <glib/gi18n-lib.h>
++#include <glib/gstdio.h>
+
+ #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);
Modified: desktop/unstable/gnome-vfs2/debian/patches/30_nfs4.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/30_nfs4.patch?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/30_nfs4.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/30_nfs4.patch Mon Apr 16 15:37:58 2007
@@ -25,11 +25,11 @@
diff -Nur gnome-vfs2-2.14.2/modules/file-method.c gnome-vfs2-2.14.2.new/modules/file-method.c
--- gnome-vfs2-2.14.2/modules/file-method.c 2007-03-12 17:23:33.000000000 +0100
+++ gnome-vfs2-2.14.2.new/modules/file-method.c 2007-03-12 17:24:44.000000000 +0100
-@@ -1154,6 +1154,7 @@
- if (g_stat (path, &statbuf) == 0) {
- char *type = filesystem_type (path, path, &statbuf);
- gboolean is_local = ((strcmp (type, "nfs") != 0) &&
-+ (strcmp (type, "nfs4") != 0) &&
- (strcmp (type, "afs") != 0) &&
- (strcmp (type, "autofs") != 0) &&
- (strcmp (type, "unknown") != 0) &&
+@@ -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) &&
Modified: desktop/unstable/gnome-vfs2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/rules?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/rules (original)
+++ desktop/unstable/gnome-vfs2/debian/rules Mon Apr 16 15:37:58 2007
@@ -6,6 +6,7 @@
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
@@ -13,9 +14,6 @@
# Hack to force regeneration of the orbit files
common-configure-impl::
touch libgnomevfs/GNOME_VFS_Daemon.idl
-
-binary-post-install/libgnomevfs2-common::
- rm -f debian/libgnomevfs2-common/etc/gnome-vfs-2.0/modules/smb-module.conf
ifeq ($(DEB_HOST_ARCH),hurd-i386)
HOST_ARCH_CONFIGURE_FLAGS=--disable-samba
Modified: desktop/unstable/gnome-vfs2/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/watch?rev=10064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/watch (original)
+++ desktop/unstable/gnome-vfs2/debian/watch Mon Apr 16 15:37:58 2007
@@ -1,4 +1,4 @@
version=2
-http://download.gnome.org/sources/gnome-vfs/2.14/ \
+http://download.gnome.org/sources/gnome-vfs/2.18/ \
gnome-vfs-(.*)\.tar\.gz \
debian uupdate
More information about the pkg-gnome-commits
mailing list