Merge with Debian 1:2.24.1-4

[Robert Ancell]

...

[Sebastien Bacher (seb128)]

thanks robert, note that we usually merge early in the cycle and don't bother rebasing later if there is no compelling reason to do the update, ie interesting changes we want to bring

[Launchpad Janitor (janitor)]

This bug was fixed in the package gnome-vfs - 1:2.24.1-4ubuntu1

---------------
gnome-vfs (1:2.24.1-4ubuntu1) karmic; urgency=low

  * Merge from Debian unstable, remaining changes: (LP: #427654)
    * 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 <email address hidden> Fri, 11 Sep 2009 11:35:43 +1000