-
Committer:
Bazaar Package Importer
-
Author(s):
Lionel Le Folgoc
-
Date:
2008-11-15 23:48:58 UTC
-
mfrom:
(1.1.16 upstream)
-
Revision ID:
james.westby@ubuntu.com-20081115234858-snwnb3fndb89hcgt
Tags: 4.4.3-0ubuntu1
* 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