-
Committer:
Bazaar Package Importer
-
Author(s):
Lionel Le Folgoc
-
Date:
2008-05-30 22:11:35 UTC
-
Revision ID:
james.westby@ubuntu.com-20080530221135-f7mdy6a72rw09hu7
Tags: 0.9.0-9ubuntu1
* Merge from Debian unstable, remaining Ubuntu changes:
- debian/control:
+ build depends on gtk-doc-tools, libgamin-dev instead of libfam-dev
(deprecated) and remove the Build-Conflicts field
+ adhere to DebianMaintainerField spec
+ libthunar-vfs-1-dev: add missing deps on libgamin-dev,
libhal-storage-dev, libdbus-glib-1-dev and libjpeg62-dev
+ thunar-data: conflicts/replaces thunar-doc and libthunar-vfs-1-dev
- debian/patches/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.