-
Committer:
Bazaar Package Importer
-
Author(s):
Lionel Le Folgoc
-
Date:
2009-06-01 11:06:09 UTC
-
mfrom:
(1.1.25 upstream)
(2.2.2 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090601110609-4f2tlnnfpl6ute1e
Tags: 1.0.1-1ubuntu1
* Merge from Debian unstable, 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/03_thunar-vfs-apply-umask-properly.patch: dropped, included
upstream.