-
Committer:
Bazaar Package Importer
-
Author(s):
Lionel Le Folgoc
-
Date:
2009-11-10 23:04:51 UTC
-
mfrom:
(2.2.3 sid)
-
Revision ID:
james.westby@ubuntu.com-20091110230451-iawbtyyowf0xddbm
Tags: 1.0.1-2ubuntu1
* Merge from Debian testing, 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:
+ 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
. hide Bulk Rename from the menu LP: #441278.
* debian/control: drop thunar-data conflicts/replaces thunar-doc and
libthunar-vfs-1-dev, unneeded (since intrepid).