lp:ubuntu/jaunty/xfce4-utils

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

Related bugs

Related blueprints

Branch information

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

Recent revisions

44. By Mario Limonciello

Update xubuntu_update-xdg-config-and-data-dirs.patch to also include
/etc/xdg so that any settings that are not defined in the XDG_CONFIG_DIRS
directory can be defined by /etc/xdg. (LP: #350962)

43. By Lionel Le Folgoc

* Merge Xfce 4.6.0 final with Debian experimental, remaining Ubuntu changes:
  - debian/control:
    + use our Vcs-* fields
    + build-depends on libdbus-glib-1-dev (>= 0.33)
    + allow gnome-screensaver to satisfy the screensaver Recommends. Prevents
      derivatives from pulling in xscreensaver. (LP: #264594)
  - debian/rules:
    + pass --with-vendor-info=Xubuntu to ./configure
    + do not replace firefox calls with iceweasel
  - debian/Xubuntu: added
  - debian/patches:
    + xubuntu_update-xdg-config-and-data-dirs.patch: prepend
      "/etc/xdg/xubuntu" to XDG_{CONFIG,DATA}_DIRS to allow
      xubuntu-default-settings config files to override upstream ones
    + debian/patches/04_avoid-xcblib-hang.patch: avoid race condition and
      deadlock in libxcb by launching dbus-launch before gnome-screensaver
      (which should occur anyhow) (LP: #232364)
    + series: refreshed.

42. By Lionel Le Folgoc

* debian/patches:
  - xubuntu_update-xdg-config-and-data-dirs.patch: prepend "/etc/xdg/xubuntu"
    to XDG_{CONFIG,DATA}_DIRS to allow xubuntu-default-settings config files
    to override upstream ones
  - 00_xdg_data_dirs.patch: dropped, included in the above one
  - series: refreshed.

41. By Lionel Le Folgoc

* Merge with Debian pkg-xfce UNRELEASED, remaining Ubuntu changes:
  - debian/control:
    + use our Vcs-* fields
    + build-depends on libdbus-glib-1-dev (>= 0.33)
    + allow gnome-screensaver to satisfy the screensaver Recommends. Prevents
      derivatives from pulling in xscreensaver. (LP: #264594)
  - debian/patches/00_xdg_data_dirs.patch: make sure to add /etc/xdg/xubuntu
    even if XDG_DATA_DIRS is already set
  - debian/patches/04_avoid-xcblib-hang.patch: avoid race condition and
    deadlock in libxcb by launching dbus-launch before gnome-screensaver
    (which should occur anyhow). (LP: #232364)
  - debian/patches/series: refreshed
  - debian/rules:
    + pass --with-vendor-info=Xubuntu to ./configure
    + do not replace firefox calls with iceweasel
  - debian/Xubuntu: added
* debian/patches/02_xfce4-about_return_version.patch: dropped, merged
  upstream.

40. By Lionel Le Folgoc

* Merge from Debian Xfce SVN Unreleased, remaining Ubuntu changes:
  - debian/control: allow gnome-screensaver to satisfy the screensaver
    Recommends. Prevents derivatives from pulling in xscreensaver.
    (LP: #264594)
  - debian/patches/00_xdg_data_dirs.patch: make sure to add /etc/xdg/xubuntu
    even if XDG_DATA_DIRS is already set
  - debian/patches/02_xfce4-about_return_version.patch: patch to print Xfce4
    version when passed arg "--xfce-version" as part of the
    about-this-computer spec
  - debian/patches/04_avoid-xcblib-hang.patch: avoid race condition and
    deadlock in libxcb by launching dbus-launch before gnome-screensaver
    (which should occur anyhow). (LP: #232364)
  - debian/patches/series: refreshed
  - debian/rules:
    + pass --enable-dbus --with-vendor-info=Ubuntu to ./configure
    + do not replace firefox calls with iceweasel
  - debian/Ubuntu: added

39. By Lionel Le Folgoc

* Translations: cherry-pick from upstream 4.4 svn branch:
  - Urdu, Kurdish, Indonesian translations added
  - Spanish, Albanian, Latvian translations updated.
* New patch debian/patches/99_update_translations.patch created and enabled
  for this.

38. By Mario Limonciello

* debian/control:
  - Allow gnome-screensaver to satisfy the screensaver Recommends.
    Prevents derivatives from pulling in xscreensaver. (LP: #264594)

37. By Cody A.W. Somerville

* debian/patches/04_avoid-xcblib-hang.patch: UPDATED
  - Drop sleep 1 after dbus-launch, not needed.

36. By Cody A.W. Somerville

* debian/patches/04_avoid-xcblib-hang.patch: NEW
  - Avoid race condition and deadlock in libxcb by launching
     dbus-launch before gnome-screensaver (which should occur anyhow).
  - Added sleep 1 after dbus-launch to help avoid race condition.
  - Fixes lp: #232364
* debian/control:
  - Updated maintainer field to Xubuntu Developers.
  - Bumped standards version to 3.8.0

35. By Lionel Le Folgoc

debian/control: re-adhere to DebianMaintainerField.

Branch metadata

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

Subscribers