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