-
Committer:
Lionel Le Folgoc
-
Date:
2010-05-08 10:14:04 UTC
-
Revision ID:
mrpouit@ubuntu.com-20100508101404-76zck9lmmd8mhns0
* Merge from Debian unstable, 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:
+ 09_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/patches/{10,11,12,13}_*: dropped, included in Debian with other
names.
* debian/patches/05_fix-crash-drag-gdk-none.patch: backport patch from
upstream git to fix crash when dragging non-file data over a window
(thanks Daniel Gibson for the hint). closes: #575665
* debian/patches: import some patches from lucid to fix several minor
issues (also fixed in upstream git master):
- 06_fix-sidepane-width.patch: use g_utf8_strlen to calculate the
sidepane width, prevents it from being too large with chinese or
cyrillic locales. lp: #501211
- 07_update-cursor-on-delete.patch: properly update the cursor when
a row is deleted in, fixes weird cursor behaviors (Xfce #5361).
- 08_refilter-tree-hidden-dir.patch: refilter tree model view when
entering/leaving an hidden directory, prevents hidden dir/files
from being wrongly displayed. lp: #484220
* debian/control: add myself to uploaders.