-
Committer:
Bazaar Package Importer
-
Author(s):
Lionel Le Folgoc
-
Date:
2009-05-29 23:49:07 UTC
-
mfrom:
(1.1.19 upstream)
(3.2.2 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090529234907-1sf9u0hop3aiac8p
Tags: 4.6.1-1ubuntu1
* Merge from Debian unstable, 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; 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)
+ 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.