~ubuntu-branches/ubuntu/karmic/thunar/karmic

Viewing all changes in revision 57.

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2009-03-01 20:33:49 UTC
  • mfrom: (1.1.24 upstream) (2.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20090301203349-ig89rg2xdz8vqoyg
Tags: 1.0.0-1ubuntu1
* Merge Xfce 4.6.0 final with Debian experimental, remaining Ubuntu changes:
  - debian/control:
    + use our Vcs-* fields
    + build depends on gtk-doc-tools
    + build-depends on libgamin-dev instead of libfam-dev and remove the
      Build-Conflicts field (this should fix the alternate cd, LP: #323665)
    + thunar-data: conflicts/replaces thunar-doc, libthunar-vfs-1-dev
      (<= 0.9.0-3ubuntu1)
  - debian/patches:
    + 06_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
* debian/patches/02_fix-font-thumbnailer-desktop-file.patch: dropped, included
  upstream.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: