-
Committer:
Bazaar Package Importer
-
Author(s):
Lionel Le Folgoc
-
Date:
2008-02-28 00:05:25 UTC
-
Revision ID:
james.westby@ubuntu.com-20080228000525-m34idzd60aeeclij
Tags: 4.4.2-4ubuntu1
* Merge with Debian unstable, remaining Ubuntu changes:
- debian/patches:
+ keep 02_show_context_menu.patch, 03_special_icons_config.patch,
10_backdrop_zoom.patch
+ 00_activate_menu_item.patch: upstream patch to fix an issue
with submenus not reacting on click. (LP #121032)
+ 01_show-backdrop-by-default.patch: dropped
- debian/rules:
+ drop the 14 first lines of upstream menu.xml*
+ make the 'help' menu item open the xubuntu documentation (LP #86244)
+ don't use debian defaults for exo-open
+ don't fix the italian menu (already fixed in xfce 4.4.2)
- debian/control:
+ adhere to DebianMaintainerField
+ xfdesktop-data: bump the replaces to the ubuntu version
+ xfdesktop4 recommends: add xubuntu-default-settings (>= 0.10).
* debian/rules:
- fix the last (\o/) missing menu icon (replace 'gnome-info'
with 'info')
- do not install the lintian override, not needed..
* debian/xfdesktop4.install: do not ship mcs .desktop files which only
create dups of the settings manager items.
* debian/patches:
- 04_fix-criticals-on-startup.patch: fix failed assertions on startup
(Xfce #3863)
- 05_fix-build-with-Bsymbolic-functions.patch: fix the build when
-Bsymbolic-functions is passed to ld
- series: updated.
* debian/control: don't introduce the new exo-utils package for hardy.
* debian/xfdesktop4.preinst: correctly handle the replacement of the old
doc dir by a symlink.