Branches for Hardy

Author: Lionel Le Folgoc
Revision Date: 2008-03-05 15:22:45 UTC

* Merge with Debian unstable, remaining Ubuntu changes:
  - debian/patches/*.patch: keep 00_activate_menu_item.patch,
    02_show_context_menu.patch, 03_special_icons_config.patch,
    05_fix-build-with-Bsymbolic-functions.patch, 10_backdrop_zoom.patch
  - debian/patches/series: refreshed (add the above patches, drop
    01_show-backdrop-by-default.patch)
  - 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)
    + do not install the lintian override, not needed
    + fix the last missing menu icon (replace 'gnome-info' with 'info')
  - debian/control:
    + adhere to DebianMaintainerField
    + don't introduce the new exo-utils package for hardy
    + xfdesktop-data: bump the replaces to the ubuntu version
    + xfdesktop4 recommends: add xubuntu-default-settings (>= 0.10)
  - debian/xfdesktop4.install: do not ship mcs .desktop files which only
    create dups of the settings manager items
  - debian/xfdesktop4.preinst: correctly handle the replacement of the old
    doc dir by a symlink.
* debian/patches/04_fix-criticals-on-startup.patch renamed to
  04_fix-CRITICAL-register-message-startup.patch to reduce uneeded delta with
  Debian.

Author: Andrew Pollock
Revision Date: 2008-04-17 16:57:27 UTC

debian/control: suggest xubuntu-default-settings, rather than recommending
it (LP: #218964)

Author: Andrew Pollock
Revision Date: 2008-04-17 16:57:27 UTC

debian/control: suggest xubuntu-default-settings, rather than recommending
it (LP: #218964)