Branches for Maverick

Author: Lionel Le Folgoc
Revision Date: 2010-05-24 00:14:14 UTC

* Merge from Debian unstable, remaining Ubuntu changes:
  - debian/control:
    + use our Vcs-* fields
    + build-depends on libgamin-dev instead of libfam-dev and remove the
      Build-Conflicts field (this should fix the alternate cd, LP: #323665)
  - debian/patches:
    + 09_fix-menu-icons.patch: correctly displays themed icons even if there's
      a dot in the middle of the filename (see Xfce #3614)
    + xubuntu-fix-desktop-files.patch: various fixes to desktop files:
      . make thunar and thunar-bulk-rename appear under Accessories not System
      . make destop-file-validate happy (remove 'Encoding' and 'Application;')
      . add 'OnlyShowIn="XFCE;"' to Thunar-folder-handler.desktop so that
        GNOME defaults to Nautilus and not Thunar
      . hide Bulk Rename from the menu LP: #441278.