* Merge from Debian unstable, remaining Ubuntu changes: * debian/control: - Don't build-depend on intltool - Bump build-dependency on libdbus-glib-1-dev - Add build-depend on libxtst-dev - Add Vcs-Bzr tag - Don't depend on gnome-session; it doesn't appear to actually be required, xubuntu is doing fine without it - Let xfce4-power-manager be an alternative to gnome-power-manager - Move rss-glx from recommends to suggests - Recommend xscreensaver-data and screensaver-gl - Suggest xscreensaver-data-extra and screensaver-gl-extra * debian/rules: - Don't use debian/po-up, translation updates will be provided via langpacks. - don't ship the popsquares screensaver, this is already in xscreensaver-data * debian/gconf-defaults: - Dropped * debian/gnome-screensaver-command.1: * debian/gnome-screensaver-preferences.1: * debian/gnome-screensaver.1: * debian/gnome-screensaver.manpages: - Add man pages * debian/gnome-screensaver.docs: - Don't install docs * debian/gnome-screensaver.install - Install apport hook - Install D-Bus service - Don't install Debian specific screensaver * debian/org.gnome.ScreenSaver.service: - Provide a D-Bus service file so gnome-screensaver gets respawned if it dies. This ensures screen locking will work more reliably. * debian/source_gnome-screensaver.py - Apport hook * debian/patches/02_keep_unlock_raised.patch: - ? * debian/patches/03_fix_ltsp-fading.patch: - Don't fade on LTSP * debian/patches/04_force_blank_only_on_ltsp.patch: - Disable graphics intensive modes for LTSP * debian/patches/05_locking_for_compiz.patch: - Stop Compiz keyboard shortcuts working when screen is locked * debian/patches/10_legacy_scrsvr_inhibit.patch: - Re-write to not use XTest to simulate fake key-presses in order to reset the IDLETIME counter, as this appears to be problematic. Use XResetScreenSaver() to do this instead. Thanks to Reinhard Tartler for the hint * debian/patches/11_autostart_delay.patch: - Delay autostarting the screensaver for 5 seconds after the start of the session * debian/patches/12_use_dbus_service.patch: - gnome-screensaver-command should use D-Bus to start gnome-screensaver if it is not running. * debian/patches/13_nvidia_gamma_fade_fallback.patch: - Fall back to XF86VM gamma fade if XRANDR gamma fade is not supported * debian/patches/14_no_fade_on_user_switch.patch: - Disable fade on locking to work around LP: #546578 and prevent the screen remaining blank after user switching. The screensaver will still fade-in on idle though calling the fade_setup and fade_finish virtual functions to be set * debian/watch: - Watch for unstable versions to get unstable version