-
Committer:
Bazaar Package Importer
-
Author(s):
Lionel Le Folgoc
-
Date:
2008-03-01 16:17:46 UTC
-
Revision ID:
james.westby@ubuntu.com-20080301161746-ub0os06rkinh4il6
Tags: 0.9.0-4ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
- debian/control:
+ build depends on libgamin-dev instead of libfam-dev and remove the
build-conflicts field
+ adhere to DebianMaintainerField spec
+ Homepage field added
+ libthunar-vfs-1-dev: add missing deps on libgamin-dev,
libhal-storage-dev, libdbus-glib-1-dev, libjpeg62-dev and drop
exo-utils
+ libthunar-vfs-1-2: bump conflict to thunar (<< 0.3.2)
+ thunar: drop exo-utils dep, drop hal, dbus and gamin recommends, drop
conflicts/replaces on libthunar-vfs-1 and libthunar-vfs-1-dev and bump
thunar-data conflicts to (<= 0.9.0-3ubuntu1)
+ thunar-data: conflicts/replaces thunar-doc and libthunar-vfs-1-dev
- debian/libthunar-vfs-1-dev.install: ship gtk-doc
* debian/patches:
- rename 04_thunar-vfs-nozombies to 05_thunar-vfs-nozombies, so we don't
carry unecessary delta with Debian
- xubuntu-fix-desktop-files.patch: various fixes to desktop files:
+ merge 03_desktop_categories.patch into and drop it
+ 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 (LP: #191817).