lp:ubuntu/hardy/xfdesktop4

Created by James Westby and last modified
Get this branch:
bzr branch lp:ubuntu/hardy/xfdesktop4
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Review team:
Ubuntu Development Team
Status:
Mature

Recent revisions

45. By Lionel Le Folgoc

* 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.

44. By Gauvain Pocentek

* 03_special_icons_config.patch: make the changes apply without restarting
  xfdesktop. LP: #113933
* 10_backdrop_zoom.patch: updated for above change

43. By Lionel Le Folgoc

* 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.

42. By Lionel Le Folgoc

* debian/patches/00_activate_menu_item.patch: upstream patch to fix an issue
  with submenus not reacting on click. (LP: #121032)
* debian/control: bump Standards-Version to 3.7.3.

41. By Lionel Le Folgoc

* Merge with Debian Unstable, remaining Ubuntu changes:
  - use our xfce.mk cdbs class
  - keep 02_show_context_menu.patch, 03_special_icons_config.patch,
    10_backdrop_zoom.patch
  - drop debian/patches/01_show-backdrop-by-default.patch
  - Make the 'help' menu item open the xubuntu documentation (LP: #86244)
  - debian/patches/series: dropped, we don't use quilt
  - debian/control:
    + adhere to DebianMaintainerField
    + bump debhelper b-d to (>= 5), add cdbs & autotools-dev and drop
      chrpath and quilt
    + xfdesktop-data: bump the replaces to the ubuntu version
    + xfdesktop4 recommends: add xubuntu-default-settings (>= 0.10), drop dbus
      since thunar already depends on dbus-x11 for its trash applet.
  - debian/xfdesktop4-data.install: do not install xfdesktop.1 in both packages,
    only ship it into xfdesktop4.
  - debian/rules: add DEB_CONFIGURE_EXTRA_FLAGS := --enable-final.

40. By Lionel Le Folgoc

* Merge with Debian Unstable, remaining Ubuntu changes:
  - use our xfce.mk cdbs class
  - keep 02_show_context_menu.patch, 03_special_icons_config.patch,
    10_backdrop_zoom.patch
  - drop debian/patches/01_show-backdrop-by-default.patch
  - Make the 'help' menu item open the xubuntu documentation (LP: #86244)
  - debian/patches/series: dropped, we don't use quilt
  - debian/control:
    + adhere to DebianMaintainerField
    + bump debhelper b-d to (>= 5), add cdbs & autotools-dev and drop
      chrpath and quilt
    + xfdesktop-data: bump the replaces to the ubuntu version
    + xfdesktop4 recommends: add xubuntu-default-settings (>= 0.10), drop dbus
      since thunar already depends on dbus-x11 for its trash applet.
  - debian/xfdesktop4-data.install: do not install xfdesktop.1 in both packages,
    only ship it into xfdesktop4.
* debian/patches/00_use-button-zero-for-menu.patch,
  debian/patches/11_fix-catalan-menu-translation.patch,
  debian/patches/12_fix-italian-applications-menu.patch: dropped, included
  upstream.
* debian/rules:
  - add DEB_CONFIGURE_EXTRA_FLAGS := --enable-final
  - do not delete manually the docs for xfdesktop4, cdbs takes
    care of this now.

39. By Lionel Le Folgoc

debian/rules: fix the link to the documentation. (LP: #157845)

38. By Lionel Le Folgoc

debian/patches/12_fix-italian-applications-menu.patch: remove duplicate
entries in italian menu files. (LP: #133960)

37. By Lionel Le Folgoc

Rebuild against latest libthunar-vfs (should fix FTBFS).

36. By Lionel Le Folgoc

* Fake-merge with Debian Unstable (the manpage fix was already applied in
  the previous revision).
* debian/patches/00_use-button-zero-for-menu.patch: fixes a bug with desktop
  menu when linked with gtk2 2.11.x (see Xfce #3359).
* debian/patches/11_fix-catalan-menu-translation.patch: fixes an error that
  breaks up the catalan menu translation. (LP: #105315)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/lucid/xfdesktop4
This branch contains Public information 
Everyone can see this information.

Subscribers