Branches for Maverick

Author: Martin Pitt
Revision Date: 2010-05-04 16:05:37 UTC

* 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.