--- gnome-screensaver-2.30.0.orig/debian/gnome-screensaver.manpages
+++ gnome-screensaver-2.30.0/debian/gnome-screensaver.manpages
@@ -0,0 +1,3 @@
+debian/gnome-screensaver.1
+debian/gnome-screensaver-command.1
+debian/gnome-screensaver-preferences.1
--- gnome-screensaver-2.30.0.orig/debian/gnome-screensaver.1
+++ gnome-screensaver-2.30.0/debian/gnome-screensaver.1
@@ -0,0 +1,45 @@
+.\" Copyright (C) 2007 Sven Arvidsson <sa@whiz.se>
+.\"
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2,
+.\" or (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful, but
+.\" WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\"You should have received a copy of the GNU General Public License along
+.\"with this program; if not, write to the Free Software Foundation, Inc.,
+.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.TH gnome-screensaver 1 "2007\-09\-27" "GNOME"
+.SH NAME
+GNOME Screensaver \- screen saver and locker
+.SH SYNOPSIS
+.B gnome-screensaver
+.RI [ OPTIONS... ]
+.SH DESCRIPTION
+GNOME Screensaver is the default screen saver and locker in a GNOME
+desktop. It is designed with simplicity and security in mind.
+.SH OPTIONS
+.TP
+.B \-\-no\-daemon
+Don't become a daemon
+.TP
+.B \-\-debug
+Enable debugging code
+.P
+This program also accepts the standard GTK options.
+.SH AUTHORS
+.B gnome-screensaver
+is written by William Jon McCann <mccann@jhu.edu>.
+.P
+This manual page was written by Sven Arvidsson <sa@whiz.se>,
+for the Debian project (but may be used by others).
+.SH SEE ALSO
+.BR "gtk-options" (7),
+.P
+The online documentation available through the program's
+.I Help
+menu.
--- gnome-screensaver-2.30.0.orig/debian/control.in
+++ gnome-screensaver-2.30.0/debian/control.in
@@ -0,0 +1,59 @@
+Source: gnome-screensaver
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Guilherme de S. Pastore <gpastore@debian.org>
+Uploaders: @GNOME_TEAM@
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-screensaver/ubuntu
+Build-Depends: cdbs,
+               debhelper (>= 5.0.13),
+               gnome-pkg-tools (>= 0.10),
+               libdbus-glib-1-dev (>= 0.60),
+               libxml2-dev (>= 2.6.0),
+               libglib2.0-dev (>= 2.15.0),
+               libgconf2-dev (>= 2.6.1),
+               libgtk2.0-dev (>= 2.14.0),
+               libgnomeui-dev (>= 2.6),
+               libgnome-menu-dev (>= 2.11.1),
+               libgnome-desktop-dev (>= 2.29.0),
+               libgnomekbd-dev (>= 2.24),
+               libxt-dev,
+               libxext-dev,
+               libx11-dev,
+               libpam0g-dev,
+               xmlto,
+               x11proto-xext-dev,
+               x11proto-scrnsaver-dev,
+               libxss-dev,
+               x11proto-xf86vidmode-dev,
+               libxxf86vm-dev,
+               libxml-parser-perl,
+               libxxf86misc-dev,
+               libgl1-mesa-dev | libgl1-mesa-swx11-dev,
+               libnotify-dev,
+               libxtst-dev
+Standards-Version: 3.8.4
+Homepage: http://live.gnome.org/GnomeScreensaver
+
+Package: gnome-screensaver
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         dbus-x11,
+         gnome-icon-theme (>= 2.15.90)
+Recommends: gnome-power-manager | xfce4-power-manager,
+            xscreensaver-data,
+            xscreensaver-gl,
+            libpam-gnome-keyring
+Suggests: xscreensaver-data-extra,
+          xscreensaver-gl-extra,
+	  rss-glx
+Description: GNOME screen saver and locker
+ gnome-screensaver is a screen saver and locker that aims to have simple,
+ sane and secure defaults, and be well integrated with the GNOME desktop.
+ .
+ It is designed to support, among other things:
+ .
+  * the ability to lock down configuration settings
+  * translation into other languages
+  * user switching
--- gnome-screensaver-2.30.0.orig/debian/rules
+++ gnome-screensaver-2.30.0/debian/rules
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS += \
+			--with-xscreensaverdir=/usr/share/xscreensaver/config \
+			--with-xscreensaverhackdir=/usr/lib/xscreensaver \
+			--enable-locking \
+			--with-libgl
+
+install/gnome-screensaver::
+	rm debian/gnome-screensaver/usr/lib/gnome-screensaver/gnome-screensaver/popsquares
+	rm debian/gnome-screensaver/usr/share/applications/screensavers/popsquares.desktop
+
+binary-fixup/gnome-screensaver::
+	dh_gconf --priority=15
--- gnome-screensaver-2.30.0.orig/debian/copyright
+++ gnome-screensaver-2.30.0/debian/copyright
@@ -0,0 +1,91 @@
+This package was debianized by Guilherme de S. Pastore <guilherme.pastore@terra.com.br> on
+Sat,  9 Jul 2005 18:16:18 -0300.
+
+It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-screensaver
+
+Upstream Author: William Jon McCann <mccann@jhu.edu>
+
+xscreensaver
+      Copyright (C) 1991-2004 Jamie Zawinski <jwz@jwz.org>
+
+      Permission to use, copy, modify, distribute, and sell this software and its
+      documentation for any purpose is hereby granted without fee, provided that
+      the above copyright notice appear in all copies and that both that
+      copyright notice and this permission notice appear in supporting
+      documentation.  No representations are made about the suitability of this
+      software for any purpose.  It is provided "as is" without express or
+      implied warranty.
+
+
+GNOME Screensaver
+      Copyright (C) 2004-2008 William Jon McCann <mccann@jhu.edu>
+
+      This program is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published by
+      the Free Software Foundation; either version 2 of the License, or
+      (at your option) any later version.
+
+File transfer dialog
+      Copyright (C) 2002 Ximian, Inc.
+
+      This program is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published by
+      the Free Software Foundation; either version 2 of the License, or
+      (at your option) any later version.
+
+
+Fast User Switch Applet
+      Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>
+
+      This program is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published by
+      the Free Software Foundation; either version 2 of the License, or
+      (at your option) any later version.
+
+GDM Communication
+      Copyright (C) 2001 Queen of England
+      Copyright (C) 2002-2003 George Lebl
+      Copyright (C) 2005 James M. Cape
+
+      This program is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published by
+      the Free Software Foundation; either version 2 of the License, or
+      (at your option) any later version.
+
+Floater saver
+      Copyright (C) 2005 Ray Strode <rstrode@redhat.com>,
+      		    	 Matthias Clasen <mclasen@redhat.com>,
+			 Søren Sandmann <sandmann@redhat.com>
+
+      This program is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published by
+      the Free Software Foundation; either version 2 of the License, or
+      (at your option) any later version.
+
+GNOME Screensaver Theme Window
+      Copyright (C) 2005 Ray Strode <rstrode@redhat.com>
+
+      This program is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published by
+      the Free Software Foundation; either version 2 of the License, or
+      (at your option) any later version.
+
+The translations into Dutch, Finnish, French, Japanese, Lithuanian, Brazilian
+Portuguese, Slovak, Swedish, Thai, Ukrainian and traditional Chinese are
+copyrighted by the Free Software Foundation, Inc.
+
+The Vietnamese translation is copyrighted by the GNOME i18n Project for
+Vietnamese.
+
+The Hungarian translation is copyrighted by Canonical Ltd. and Rosetta
+Contributors 2005.
+
+They are all licensed under the GNU General Public License as published by the
+Free Software Foundation, either version 2 or any later version.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
+On Debian Systems, the full text of the license can be found on
+/usr/share/common-licenses/GPL-2
--- gnome-screensaver-2.30.0.orig/debian/changelog
+++ gnome-screensaver-2.30.0/debian/changelog
@@ -0,0 +1,897 @@
+gnome-screensaver (2.30.0-0ubuntu2) lucid-proposed; urgency=low
+
+  * debian/patches/15_dont_crash_on_no_fade.patch:
+    - Don't crash on systems that don't support XF86VM or XRANDR gamma fade,
+      by testing if fade is supported on a particular screen before
+      calling the fade_setup and fade_finish virtual functions (LP: #558721)
+  * debian/patches/16_dont_crash_in_kvm.patch:
+    - Don't crash when the XF86VM extension doesn't allow the gamma 
+      to be set (LP: #581864)
+  * 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
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Wed, 19 May 2010 11:51:40 +0100
+
+gnome-screensaver (2.30.0-0ubuntu1) lucid; urgency=low
+
+  * New upstream release:
+    - Updated translations 
+
+ -- Didier Roche <didrocks@ubuntu.com>  Tue, 30 Mar 2010 18:15:51 +0200
+
+gnome-screensaver (2.29.92-0ubuntu1) lucid; urgency=low
+
+  * New upstream release:
+    - Build fix for systems with x11 < 1.3
+  * debian/control.in:
+    - udpate Standards-Version to latest
+
+ -- Didier Roche <didrocks@ubuntu.com>  Wed, 10 Mar 2010 10:36:36 +0100
+
+gnome-screensaver (2.29.91-0ubuntu3) lucid; urgency=low
+
+  * debian/source_gnome-screensaver.py: 
+    - Fetch inhibitors from gnome-session and add them to the submitted bug
+      report (under the 'GnomeSessionInhibitors' key). Also provide an overall
+      summary indicating if the session has been inhibited from going idle 
+      (under them 'GnomeSessionIdleInhibited' key). The information is useful 
+      for debugging screensaver activation issues
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Sun, 07 Mar 2010 00:01:22 +0000
+
+gnome-screensaver (2.29.91-0ubuntu2) lucid; urgency=low
+
+  * debian/source_gnome-screensaver.py: also add g-p-m gconf keys to help
+    debug screen-locking issues.
+  * debian/patches/12_use_dbus_service.patch: add tags with bug numbers
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Sun, 21 Feb 2010 15:35:19 -0500
+
+gnome-screensaver (2.29.91-0ubuntu1) lucid; urgency=low
+
+  * New upstream version.
+  * Fixed bugs:
+    - CVE-2010-0422, handle monitor hotplugging more securely
+    - Fix screen dirt in floaters screensaver
+  * Refreshed patches:
+    - 04_force_blank_only_on_ltsp.patch
+    - 05_locking_for_compiz.patch
+  * debian/patches/13_nvidia_gamma_fade_fallback.patch:
+    - Updated tags with upstream bug number now I've sent it upstream.
+
+ -- Chris Coulson <chrisccoulson@ubuntu.com>  Wed, 17 Feb 2010 19:55:37 +0000
+
+gnome-screensaver (2.29.90-0ubuntu2) lucid; urgency=low
+
+  * debian/patches/13_nvidia_gamma_fade_fallback.patch:
+    - Fall back to XF86VM gamma fade if XRANDR gamma fade is not supported
+      (LP: #522806)
+
+ -- Chris Coulson <chrisccoulson@ubuntu.com>  Tue, 16 Feb 2010 22:17:16 +0000
+
+gnome-screensaver (2.29.90-0ubuntu1) lucid; urgency=low
+
+  * New upstream version, fixed bugs:
+    - #609337, CVE-2010-0414, handle monitor removal more securely
+  * Refreshed 02_keep_unlock_raised.patch
+
+ -- Chris Coulson <chrisccoulson@ubuntu.com>  Tue, 09 Feb 2010 19:44:48 +0000
+
+gnome-screensaver (2.29.1-0ubuntu1) lucid; urgency=low
+
+  * New upstream version.
+  * Fixed bugs:
+    - #597874, Use xrandr 1.2 gamma fading
+    - RH bug #546656, Fix crash in popsquares
+    - #598476, Don't crash when lock dialog dies during shake
+    - #593616, Fix multi-head issues
+    - #600488, Remove session inhibitors if the originator falls of the bus
+  * debian/control:
+    - Bump libgnome-desktop-dev build-dep to 2.29.0
+  * Dropped debian/patches/09_remove_session_inhibitors.patch:
+    - Merged upstream
+  * Dropped debian/patches/07_xfce_menu_entry.patch:
+    - Xubuntu uses xscreensaver now
+  * Refreshed patches:
+    - 02_keep_unlock_raised.patch
+    - 03_fix_ltsp-fading.patch
+    - 04_force_blank_only_on_ltsp.patch
+    - 05_locking_for_compiz.patch
+
+ -- Chris Coulson <chrisccoulson@ubuntu.com>  Sat, 06 Feb 2010 15:16:14 +0000
+
+gnome-screensaver (2.28.0-1ubuntu7) lucid; urgency=low
+
+  * debian/org.gnome.ScreenSaver.service, debian/gnome-screensaver.install:
+    Provide a D-Bus service file so gnome-screensaver gets respawned if it
+    dies. This ensures screen locking will work more reliably. (LP: #515832)
+  * debian/patches/12_use_dbus_service.patch: gnome-screensaver-command
+    should use D-Bus to start gnome-screensaver if it is not running.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 04 Feb 2010 09:58:05 -0800
+
+gnome-screensaver (2.28.0-1ubuntu6) lucid; urgency=low
+
+  * debian/patches/11_autostart_delay.patch:
+    - Delay autostarting the screensaver for 5 seconds after the start
+      of the session
+
+ -- Chris Coulson <chrisccoulson@ubuntu.com>  Mon, 01 Feb 2010 23:27:31 +0000
+
+gnome-screensaver (2.28.0-1ubuntu5) lucid; urgency=low
+
+  [ Chris Coulson ]
+  * 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 (LP: #505789)
+  * Drop debian/patches/90_autotools.patch - no longer needed
+  * Dropped debian/patches/08_gs_dialog_request_to_exit.patch - this is
+    fixed by this commit in gtk: 0748cf563d0d0d03001a62589f13be16a8ec06c1,
+    so there is no need to carry this patch any more.
+  * Drop debian/gconf-defaults: 
+    - Use upstream default for lock_enabled (locking on screensaver 
+      activation)
+    - user_switch_enabled is already set to the upstream default
+
+  [ Marc Deslauriers ]
+  * Added apport hook:
+    - debian/source_gnome-screensaver.py
+    - debian/gnome-screensaver.install
+
+ -- Chris Coulson <chrisccoulson@ubuntu.com>  Tue, 19 Jan 2010 17:46:56 +0000
+
+gnome-screensaver (2.28.0-1ubuntu4) lucid; urgency=low
+
+  * No change rebuild to use the new libgnome-desktop soname
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 06 Jan 2010 19:59:33 +0100
+
+gnome-screensaver (2.28.0-1ubuntu3) lucid; urgency=low
+
+  * debian/patches/09_legacy_scrsvr_inhibit.patch:
+    - Re-introduce the legacy method of inhibiting the screensaver,
+      which is wrapped by xdg-screensaver and still used by some
+      applications (LP: #428884)
+  * debian/patches/90_autotools.patch:
+    - Update autotools so that the XTEST support is built in
+  * debian/control:
+    - Add build-depend on libxtst-dev
+
+ -- Chris Coulson <chrisccoulson@ubuntu.com>  Tue, 22 Dec 2009 00:23:20 +0000
+
+gnome-screensaver (2.28.0-1ubuntu2) lucid; urgency=low
+
+  * debian/patches/09_remove_session_inhibitors.patch:
+    - Fix issue when applications leave inhibitors behind. (LP: #411350)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Mon, 07 Dec 2009 08:07:26 -0500
+
+gnome-screensaver (2.28.0-1ubuntu1) lucid; urgency=low
+
+  * Merge from Debian testing, remaining changes:
+    - debian/patches/08_gs_dialog_request_to_exit.patch:
+      - Don't let the dialog process exit on its own accord when the
+        password is entered incorrectly 5 times. Instead, request that
+        the main gnome-screensaver process terminates it when ready. This
+        avoids a race where the dialog process exits during the middle
+        of the auth-failure animation, leading to unhandled X errors
+    - debian/control.in:
+      - Move rss-glx from recommends to suggests
+      - Add xscreensaver-data-extra and screensaver-gl-extra to suggests
+      - Let xfce4-power-manager be an alternative to gnome-power-manager
+      - add Vcs-Bzr tag
+      - don't depend on gnome-session; it doesn't appear to actually be
+        required, xubuntu is doing fine without it
+      - don't build-depend on intltool
+    - debian/rules:
+      - don't use debian/po-up, translation updates will be provided via
+        langpacks.
+      - don't ship docbook docs
+      - don't ship the popsquares screensaver, this is already in
+        xscreensaver-data
+    - Add 07_xfce_menu_entry.patch: Show preferences in Xubuntu as well. 
+    - Adapt debian/watch to get unstable version
+    - Include local manpages gnome-screensaver(1),
+      gnome-screensaver-command(1), and gnome-screensaver-preferences(1)
+    - debian/gconf-defaults:
+      - remove entry for mode 'single' as it doesn't make sense without
+        specifying a screensaver
+      - don't use debian-specific theme
+      - disable locking by default
+    - Other patches:
+      - 03_fix_ltsp-fading.patch
+      - 05_locking_for_compiz.patch
+      - 02_keep_unlock_raised.patch
+      - 04_force_blank_only_on_ltsp.patch
+  * Dropped changes that appear to be casualties of merges:
+    - depend on dbus-x11 instead of dbus
+    - don't build-depend on libexif-dev, this seems not to be used for
+      anything any more
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 02 Dec 2009 02:12:16 +0000
+
+gnome-screensaver (2.28.0-1) unstable; urgency=low
+
+  * New upstream release.
+    - Remove libglade2-dev build dependency, no longer needed.
+  * Standards-Version is 3.8.3, no changes needed.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Thu, 24 Sep 2009 18:01:13 +0200
+
+gnome-screensaver (2.28.0-0ubuntu3) karmic; urgency=low
+
+  [ Chris Coulson ]
+  * debian/patches/08_gs_dialog_request_to_exit.patch:
+    - Updated to not register a handler for SIGTERM in the dialog. This 
+      prevents the dialog from hanging on timeouts or authentication
+      failures (LP: #454959)
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 18 Oct 2009 14:33:27 -0700
+
+gnome-screensaver (2.28.0-0ubuntu2) karmic; urgency=low
+
+  * debian/patches/08_gs_dialog_request_to_exit.patch:
+    - Don't let the dialog process exit on its own accord when the
+      password is entered incorrectly 5 times. Instead, request that
+      the main gnome-screensaver process terminates it when ready. This
+      avoids a race where the dialog process exits during the middle
+      of the auth-failure animation, leading to unhandled X errors
+      (LP: #446395)
+
+ -- Chris Coulson <chrisccoulson@ubuntu.com>  Fri, 16 Oct 2009 01:32:07 +0100
+
+gnome-screensaver (2.28.0-0ubuntu1) karmic; urgency=low
+
+  * New upstream version
+    Fixed bugs:
+    - #444927, get idle time from xorg (lp: #357494)
+    - #463010, Port gnome-screensaver from libglade to gtkbuilder
+    - #564061, Install .desktop file
+    - #570402, screensaver crash if number of screens changes
+    - #570941, String not marked for translation gnome-screensaver-command.c
+    - #574896, [Leave message] Cancel button should clean clipboard buffe
+    - #576463, can't unlock screen after upgrade until restarting 
+               gnome-screensaver
+    - #581995, Fade out doesn't properly fall back to gamma number if X server
+               only supports 0-size ramp
+    - #586174, Encoding key in desktop files is deprecated
+    - #589728, gnome-screensaver: implicit declaration g_printf
+    - #590776, screensaver is never activated
+    - #591193, Update/Create .gitignore
+    - #591194, Add Comment and Icon in gnome-screensaver.desktop
+    - #594082, gnome-screensaver ignores input when fading to black
+    Translators
+  * debian/control.in:
+    - don't use libglade
+  * debian/patches/06_unbreak_upgrade_from_jaunty.patch:
+    - the change is in the new version
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 23 Sep 2009 12:54:12 +0200
+
+gnome-screensaver (2.27.0-0ubuntu6) karmic; urgency=low
+
+  * debian/control.in:
+    - Move rss-glx from recommends to suggests (LP: #385850)
+    - Add xscreensaver-data-extra and screensaver-gl-extra to suggests
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Fri, 11 Sep 2009 11:00:55 +0200
+
+gnome-screensaver (2.27.0-0ubuntu5) karmic; urgency=low
+
+  [ Cody Somerville ]
+  [ Mario Limonciello ]
+  * debian/control: Let xfce4-power-manager be an alternative 
+    to gnome-power-manager. (LP: #412645)
+
+ -- Cody A.W. Somerville <cody-somerville@ubuntu.com>  Wed, 12 Aug 2009 14:49:09 -0300
+
+gnome-screensaver (2.27.0-0ubuntu4) karmic; urgency=low
+
+  * No-change rebuild for libgnomekbd{,ui}3 -> libgnomekbd{,ui}4
+    transition. 
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Sun, 09 Aug 2009 20:12:32 +0800
+
+gnome-screensaver (2.27.0-0ubuntu3) karmic; urgency=low
+
+  * Add 07_xfce_menu_entry.patch: Show preferences in Xubuntu as well. 
+    (LP: #393527)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 03 Jul 2009 18:25:09 +0200
+
+gnome-screensaver (2.27.0-0ubuntu2) karmic; urgency=low
+
+  * debian/patches/06_unbreak_upgrade_from_jaunty.patch:
+    - Make sure gnome-screensaver-dialog doesn't fail when
+      spawned from an older gnome-screensaver that calls it with
+      the deprecated "--away-message" option. This can happen on
+      upgrades where the Jaunty gnome-screensaver might spawn the
+      Karmic gnome-screensaver-dialog to unlock the screen.
+
+ -- Chris Coulson <chrisccoulson@googlemail.com>  Sun, 28 Jun 2009 23:13:11 +0100
+
+gnome-screensaver (2.27.0-0ubuntu1) karmic; urgency=low
+
+  * New upstream release: (LP: #345107)
+    - Add an autostart file for gnome-screensaver (#585485)
+    - Updated Translations
+    - Fixed audit GError usage (William Jon McCann)
+    - Fixed use g_strerror (William Jon McCann)
+    - Fixed logout_command setting may be overwritten with
+      keyboard_command value (William Jon McCann)
+    - Fixed gnome-screensaver-gl-helper calls gdk_x11_visual_get_xvisual
+      with NULL visual (William Jon McCann)
+    - Fixed Screenserver (William Jon McCann)
+    - Remove power notice signal
+    - Rely on GNOME session idle detection
+    - Proxy g-s inhibitors over to the session
+    - Read status message from session
+    - Accept a full path for theme (Matthias Clasen)
+    - Fix pixmap leak (Matthias Clasen)
+    - Fix dialog border width
+    - Add bevel around dialog
+    - get idle time from xorg (LP: #230749)
+    - screensavers-personal-slideshow should not show hidden directories (Jörg)
+    - "Random" preview is always the last saver (Maxim Ermilov) (LP: #53575)
+    - Calls wrong slideshow binary if there is one installed in
+      $PATH (Frederic Crozat)
+    - libgnome-desktop:gnome_bg_create_pixmap() leaks pixmaps and X
+      clients (Scott Remnant)
+    - Preview of "Blank screen" is not consistent (Neil Patel) (LP: #105836)
+    - Add GTK and GNOME to screensaver desktop (William Jon McCann)
+    - Screensaver suddenly stopped working (William Jon McCann)
+    - gnome-screensaver-dialog NULL pointer crash (William Jon McCann)
+    - gnome-screensaver should release mouse/keyboard when failed to grab both of
+      them (Joey Yu Zheng)
+    - Cleaning up GTK Includes in gnome-screensaver (Maxim Ermilov)
+  * debian/control.in:
+    - add Vcs-Bzr tag
+    - re-generate debian/control
+  * Adapt debian/watch to get unstable version
+  * debian/patches:
+    - remove 06_dont-leak-root-windows.patch and
+      07_fix_blank_screen_preview.patch as applied upstream
+    - removed 08_watch-all-X-screens-when-detecting-idle.patch as upstream
+      handled the issue in rewriting src/gs-watcher-x11.c (multiple X handling)
+
+ -- Didier Roche <didrocks@ubuntu.com>  Tue, 16 Jun 2009 10:59:32 +0200
+
+gnome-screensaver (2.26.1-2) unstable; urgency=low
+
+  * Depend on gnome-session 2.26, it is useless without it.
+    Closes: #536381.
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 11 Jul 2009 11:34:43 +0200
+
+gnome-screensaver (2.26.1-1) unstable; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
+  * New upstream release.
+  * debian/watch: don't uupdate.
+  * debian/copyright: updated.
+  * debian/patches/01_manpages_whatis.patch: removed, fixed upstream.
+  * debian/rules: remove simple-patchsys.mk
+  * Use unstable for Vcs-*
+  * Standards-Version is 3.8.2, no changes needed.
+  * debian/rules: install gconf-defaults file with default priority.
+  * debian/debian-floaters.desktop:
+    - Remove deprecated Encoding key.
+    - Add trailing semicolon to Categories.
+    - Add full path to the Exec command, as floaters is not in PATH.
+    - Add OnlyShowIn: GNOME.
+  * Add magic to make debian-floaters.desktop translatable. Thanks
+    Josselin Mouette for the explanations.
+    - Spanish translation by Francisco Javier Cuadrado.
+    - Swedish translation by Martin Bagge.
+    - German translation by Helge Kreutzmann. Closes: #533646.
+    - Portuguese translation by Américo Monteiro.
+
+  [ Josselin Mouette ]
+  * Add French translation for the desktop file.
+  * Enable building of docbook documentation.
+  * rules, gnome-screensaver.docs: install it in a non-Redhatish place.
+  * A bit of cleanup in build-dependencies.
+
+ -- Josselin Mouette <joss@debian.org>  Fri, 26 Jun 2009 21:46:05 +0200
+
+gnome-screensaver (2.24.1-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Standards version is 3.8.1.
+
+ -- Josselin Mouette <joss@debian.org>  Tue, 07 Apr 2009 11:28:17 +0200
+
+gnome-screensaver (2.24.1-1) experimental; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
+  * New upstream release.
+    - Restores the X gamma value instead of resetting it if it had been
+      modified. Closes: #496685.
+    - Update build dependencies.
+    - Standards-Version is 3.8.0, no changes needed.
+    - Add Vcs-* fields.
+    - Remove --with-gdm-config from DEB_CONFIGURE_EXTRA_FLAGS, it's been
+      removed upstream.
+    - patches/01_compiz_lock_bypass_CVE-2007-3920.patch:
+      + Removed, it has been properly fixed in the X server.
+        See http://bugzilla.gnome.org/show_bug.cgi?id=488264.
+    - debian/gnome-screensaver.manpages,
+      debian/gnome-screensaver*.1:
+      - Removed, the manpages are now shipped and installed upstream.
+
+  [ Josselin Mouette ]
+  * Don’t run dh_gconf twice.
+  * Require libgnomekbd-dev 2.24 because of the merge with libgnomekbdui 
+    and to ensure using libgnomekbd3.
+  * Include simple-patchsys.
+  * 01_manpages_whatis.patch: new patch; fixes bad whatis entries in the 
+    manual pages.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 10 Dec 2008 12:44:24 +0100
+
+gnome-screensaver (2.24.0-0ubuntu5) jaunty; urgency=low
+
+  * Prevent screen-saver activation when X screens other than 0 are
+    not idle. Packaged from Aaron Plattner's original (LP: #87317)
+
+ -- TJ <ubuntu@tjworld.net>  Fri, 27 Feb 2009 10:23:26 +0000
+
+gnome-screensaver (2.24.0-0ubuntu4) jaunty; urgency=low
+
+  * debian/patches/07_fix_blank_screen_preview.patch: The blank screen screen 
+    saver is not consistent in preview and actual mode, clear the preview 
+    window before showing it. Patch by Neil J. Patel was included upstream.
+    (LP: #199112)
+
+ -- Michael Terry <michael.terry@canonical.com>  Fri, 16 Jan 2009 14:31:13 -0500
+
+gnome-screensaver (2.24.0-0ubuntu3) jaunty; urgency=low
+
+  * rebuild for libgnome-desktop soname change
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 17 Dec 2008 21:36:52 +0100
+
+gnome-screensaver (2.24.0-0ubuntu2) intrepid; urgency=low
+
+  * debian/patches:06_dont-leak-root-windows.patch:
+    - Don't create the GNOME background pixmap with root=TRUE, since that
+      results in a permanent client connection and unfreeable foreign image;
+      the leak of these causes you to quickly run out of X clients, especially
+      on multiple monitors.  LP: #263211.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Fri, 10 Oct 2008 18:33:23 +0100
+
+gnome-screensaver (2.24.0-0ubuntu1) intrepid; urgency=low
+
+  * Upstream release.  Version bump and translations.
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 24 Sep 2008 12:40:02 -0500
+
+gnome-screensaver (2.23.90-0ubuntu1) intrepid; urgency=low
+
+  * Upstream release
+    * Improves XRandR support to notice monitor config changes
+    * Honors lockdown keys better
+    * Better checking for caps lock key
+  * debian/rules: Removing setting the GDM configuration file as the
+    value is no longer used by GNOME Screensaver.
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 17 Sep 2008 12:59:06 -0500
+
+gnome-screensaver (2.23.3-0ubuntu1) intrepid; urgency=low
+
+  * Upstream update
+  * debian/control: Increasing GTK+ required version to match upstream
+    configure script changes.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 21 Aug 2008 09:34:40 -0500
+
+gnome-screensaver (2.23.2-0ubuntu1) intrepid; urgency=low
+
+  * Upstream update
+  * control.in: Adding in a dependency on libgnome-desktop-dev 
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 16 Jun 2008 17:49:29 -0700
+
+gnome-screensaver (2.22.2-2) unstable; urgency=low
+
+  * Suggest xscreensaver-data. Closes: #469211.
+  * Depend on dbus-x11 instead of dbus.
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 18 Sep 2008 15:57:52 +0200
+
+gnome-screensaver (2.22.2-1ubuntu1) intrepid; urgency=low
+
+  * Merging in minor packaging changes from 2.22.2-1
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 08 May 2008 09:19:56 -0700
+
+gnome-screensaver (2.22.2-1) unstable; urgency=high
+
+  * New upstream bugfix release:
+    + SECURITY: CVE-2008-1683 unlocks session if 
+      it fails to get user attributes via getpwnam() (Closes: #475154).
+
+ -- Sebastian Dröge <slomo@debian.org>  Wed, 16 Apr 2008 10:50:22 +0200
+
+gnome-screensaver (2.22.2-0ubuntu1) hardy; urgency=low
+
+  * Upstream release.
+  * Adds a limit to the number of characters that can be entered into the
+    notes dialog.  LP: #196844
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 08 Apr 2008 09:10:54 -0700
+
+gnome-screensaver (2.22.1-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * debian/control.in:
+    + Move homepage to Homepage field.
+
+ -- Sebastian Dröge <slomo@debian.org>  Wed, 02 Apr 2008 18:54:19 +0200
+
+gnome-screensaver (2.22.1-0ubuntu1) hardy; urgency=medium
+
+  * New upstream release.  Fixes: CVE-2008-0887
+  * debian/control: Adding in VCS fields for packaging
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 02 Apr 2008 17:10:55 -0700
+
+gnome-screensaver (2.22.0-1) unstable; urgency=medium
+
+  [ Josselin Mouette ]
+  * 02_clear_clipboard.patch: clear the clipboard when locking the
+    screen. Closes: #455484.
+
+  [ Loic Minier ]
+  * Add a README.Debian to document that one should disable the gnome-keyring
+    PAM module if the recommended libpam-gnome-keyring isn't installed;
+    closes: #457549.
+
+  [ Sebastian Dröge ]
+  * New upstream stable release:
+    + Drop gnome-vfs build dependency and build depend on glib >= 2.15.0.
+    + 02_clear_clipboard.patch: Dropped, merged upstream.
+
+ -- Sebastian Dröge <slomo@debian.org>  Fri, 14 Mar 2008 10:15:47 +0100
+
+gnome-screensaver (2.22.0-0ubuntu1) hardy; urgency=low
+
+  * Upstream release.  Only whitespace and translation changes.
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 11 Mar 2008 10:31:33 -0700
+
+gnome-screensaver (2.21.6-0ubuntu3) hardy; urgency=low
+
+  * rebuild due to the libxklavier soname change
+
+ -- Sebastien Bacher <seb128@canonical.com>  Wed, 27 Feb 2008 15:51:38 +0100
+
+gnome-screensaver (2.21.6-0ubuntu2) hardy; urgency=low
+
+  * Updating control.in to have up-to-date dependencies:
+      no gnomevfs
+      glib >= 2.15.0
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 14 Feb 2008 14:57:25 -0800
+
+gnome-screensaver (2.21.6-0ubuntu1) hardy; urgency=low
+
+  * Upstream version update.
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 04 Feb 2008 10:26:29 -0800
+
+gnome-screensaver (2.20.0-2ubuntu1) hardy; urgency=low
+
+  * Updating to match updates from Debian 2.20.0-2
+      Adding man pages: gnome-screensaver.1, gnome-screensaver-control.1
+        and gnome-screensaver-preferences.1
+      Adding a control file to install them: gnome-screensaver.manpages
+      * debian/control.in
+        Adding libpam-gnome-keyring to recommends
+        Increasing standards version to 3.7.3
+      * debian/gnome-screensaver.pam
+        Add gnome keyring to PAM settings
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 11 Dec 2007 15:18:37 -0800
+
+gnome-screensaver (2.20.0-2) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Build-dep on libnotify-dev for "Leave Message" functionality to actually
+    work; thanks Hristo Hristov; Launchpad #140866; closes: #443766.
+
+  [ Sven Arvidsson ]
+  * Add man pages (Closes: #438606)
+
+  [ Josselin Mouette ]
+  * 01_compiz_lock_bypass_CVE-2007-3920.patch: place fix of the
+    security upload in a proper separate patch.
+  * gnome-screensaver.pam: add support for pam_gnome_keyring.
+  * Recommend libpam-gnome-keyring.
+
+  [ Loic Minier ]
+  * Drop duplicate --with-gdm-config flag; thanks Ted Gould and Ubuntu;
+    closes: #453512.
+
+  [ Sebastian Dröge ]
+  * ACK NMU (Closes: #446906) and upload to unstable.
+  * debian/control.in:
+    + Update Standards-Version to 3.7.3 (no additional changes needed).
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 10 Dec 2007 07:55:36 +0100
+
+gnome-screensaver (2.20.0-1.1ubuntu1) hardy; urgency=low
+
+  * Updating to now be based on Debian package
+  * Added patches:
+    03_fix_ltsp-fading.patch
+    05_locking_for_compiz.patch <-- prev. changelog entry as patch
+    02_keep_unlock_raised.patch
+    04_force_blank_only_on_ltsp.patch
+  * Removed Debian theme screensaver
+     removed debian-swirl-logo.svg, debian-floaters.desktop and
+       gnome-screensaver.install
+     removed entry from gconf-default along with mode 'single' as it doesn't
+       make sense without specifying a screensaver
+  * NOTE: Compared to other Ubuntu packages this DOES NOT contain the Ubuntu
+    screensaver, that is moving to the art packages and can not be found
+    here.
+  * Changed gconf_defaults to have Ubuntu defaults
+  * debian/control
+     Recommending xscreensaver packages with additional hacks in them
+  * debian/rules
+     Removed duplicate --with-gdm-config
+     Add install action to remove popsquares as it's in xscreensaver-data
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 20 Nov 2007 22:47:47 -0800
+
+gnome-screensaver (2.20.0-2) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Build-dep on libnotify-dev for "Leave Message" functionality to actually
+    work; thanks Hristo Hristov; Launchpad #140866; closes: #443766.
+
+  [ Sven Arvidsson ]
+  * Add man pages (Closes: #438606)
+
+  [ Josselin Mouette ]
+  * 01_compiz_lock_bypass_CVE-2007-3920.patch: place fix of the
+    security upload in a proper separate patch.
+  * gnome-screensaver.pam: add support for pam_gnome_keyring.
+  * Recommend libpam-gnome-keyring.
+
+  [ Loic Minier ]
+  * Drop duplicate --with-gdm-config flag; thanks Ted Gould and Ubuntu;
+    closes: #453512.
+
+  [ Sebastian Dröge ]
+  * ACK NMU (Closes: #446906) and upload to unstable.
+  * debian/control.in:
+    + Update Standards-Version to 3.7.3 (no additional changes needed).
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 10 Dec 2007 07:55:36 +0100
+
+gnome-screensaver (2.20.0-1.1) unstable; urgency=high
+
+  * Non-maintainer upload by the testing-security team
+  * Prevent screen lock bypass via shortcuts when compiz is running
+    (Closes: #446906) Fixes: CVE-2007-3920
+
+ -- Steffen Joeris <white@debian.org>  Wed, 24 Oct 2007 13:08:36 +0000
+
+gnome-screensaver (2.20.0-1) unstable; urgency=low
+
+  [ Riccardo Setti ]
+  * New upstream release
+  * Adjusted Build-Deps
+
+  [ Josselin Mouette ]
+  * Remove xscreensaver-gl from Recommends as it doesn't ship any 
+    .desktop files.
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 22 Sep 2007 15:07:01 +0200
+
+gnome-screensaver (2.18.2-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * Wrap build-deps and deps.
+  * Cleanups.
+  * Bump up Debhelper compatibility level to 5.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 29 May 2007 11:56:21 +0200
+
+gnome-screensaver (2.18.1-1) unstable; urgency=low
+
+  [ Riccardo Setti ]
+  * New upstream release.
+
+  [ Sebastian Dröge ]
+  * Upload to unstable, drop check-dist include.
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue,  1 May 2007 20:33:17 +0200
+
+gnome-screensaver (2.18.0-1) experimental; urgency=low
+
+  [ Riccardo Setti ]
+  * New upstream release
+
+  [ Loic Minier ]
+  * Build-dep on libgnomekbdui-dev (>= 0.1) for kbd-layout-indicator.
+  * Bump up libgtk2.0-dev build-dep to >= 2.10.0 to make the package
+    autobuildable.
+
+ -- Loic Minier <lool@dooz.org>  Sun, 25 Mar 2007 19:30:28 +0200
+
+gnome-screensaver (2.16.3-2) experimental; urgency=low
+
+  * Merge 2.14.3-2 up-to 2.14.3-4; SVN r7317:8959.
+    - Drop patch 00_dbus_0.90, obsolete.
+    - Drop patch 01_norwegian_translation_fix, merged upstream.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 17 Mar 2007 13:26:32 +0100
+
+gnome-screensaver (2.16.3-1) experimental; urgency=low
+
+  * Add a get-orig-source target to retrieve the upstream tarball.
+  * Include the new check-dist Makefile to prevent accidental uploads to
+    unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+  * New upstream stable release; bug fixes and translations.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 17 Mar 2007 11:43:49 +0100
+
+gnome-screensaver (2.16.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Remove duplicate build-dependency on libpam0g-dev.
+
+ -- Josselin Mouette <joss@debian.org>  Fri,  8 Dec 2006 23:13:56 +0100
+
+gnome-screensaver (2.16.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 30 Sep 2006 01:29:27 +0200
+
+gnome-screensaver (2.15.6-1) experimental; urgency=low
+
+  * New upstream development releases.
+    - Target at experimental.
+    - Build-depends on libgl1-mesa-dev, and libpam0g-dev
+    - Install Debian files via debian/gnome-screensaver.install instead of
+      debian/rules; install debian-floaters in
+      /usr/share/applications/screensavers instead of
+      /usr/share/gnome-screensaver/themes.
+    - Recommend xscreensaver-gl and rss-glx for additional screensavers.
+    - Depend on gnome-icon-theme >= 2.15.90, first version providing the
+      "preferences-desktop-screensaver" icon instead of "screensaver".
+  * Add CDBS' utils.
+
+ -- Loic Minier <lool@dooz.org>  Mon, 14 Aug 2006 00:20:19 +0200
+
+gnome-screensaver (2.14.3-4) unstable; urgency=low
+
+  [ Sven Arvidsson ]
+  * Fix spelling mistake in norwegian translation. (Closes: #402586)
+
+  [ Loic Minier ]
+  * Add a get-orig-source target to retrieve the upstream tarball.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 13 Jan 2007 23:30:43 +0100
+
+gnome-screensaver (2.14.3-3) unstable; urgency=low
+
+  * Add a gconf-defaults file.
+    + Set the default screensaver to be Debian floaters. (Closes: #367682)
+    + Enable user switch option.
+  * debian/rules: Register it with priority 15
+  * debian/control: Build-depend on debhelper 5.0.13.
+
+ -- Gustavo Franco <stratus@debian.org>  Fri, 24 Nov 2006 16:58:03 -0200
+
+gnome-screensaver (2.14.3-2) unstable; urgency=low
+
+  * debian/patches/00_dbus_0.90.patch
+    - Added. Use dbus_connection_close instead of dbus_connection_disconnect,
+    fixes FTBS with libdbus-1 >= 0.90 (Closes: #387240)
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Wed, 13 Sep 2006 10:38:38 +0200
+
+gnome-screensaver (2.14.3-1) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Add watch file.
+
+  [ Josselin Mouette ]
+  * Recommend gnome-power-manager.
+
+  [ Loic Minier ]
+  * New upstream release.
+
+ -- Loic Minier <lool@dooz.org>  Tue,  8 Aug 2006 11:28:31 +0200
+
+gnome-screensaver (2.14.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Loic Minier <lool@dooz.org>  Thu,  1 Jun 2006 12:02:48 +0200
+
+gnome-screensaver (2.14.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+  * debian/control.in:
+    - updated my e-mail address.
+    - bumped Standards-Version with no changes.
+    - added dependency on dbus (Closes: #353517).
+    - added build-dependency on libxxf86misc-dev (Closes: #357885).
+
+ -- Guilherme de S. Pastore <gpastore@debian.org>  Sat, 13 May 2006 12:25:18 -0300
+
+gnome-screensaver (2.14.0-1) unstable; urgency=low
+
+  * New upstream release 
+  * Update description.
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri, 17 Mar 2006 11:13:32 +0100
+
+gnome-screensaver (2.13.92-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/patches/02_multiscreen_lifelock.patch
+    + Removed. Fixed upstream
+  * debian/patches/01_dont_modify_bg.patch 
+    + Removed. Unsure if it actually fixed the bug or made the race condition
+    harder to trigger. So temporarely remove it for testing purposes
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Wed,  1 Mar 2006 14:00:18 +0100
+
+gnome-screensaver (0.0.24-2) unstable; urgency=low
+
+  * debian/patches/02_multiscreen_lifelock.patch 
+    + Added. Prevent gnome-screensaver lifelock when using multiple screen.
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri, 17 Feb 2006 14:38:17 +0100
+
+gnome-screensaver (0.0.24-1) unstable; urgency=low
+
+  [ Guilherme de S. Pastore ]
+  * New upstream release
+
+  [ Sjoerd Simons ]
+  * Upload to unstable
+  * Add --with-gdm-config=/etc/gdm/gdm.conf to DEB_CONFIGURE_EXTRA_FLAGS
+  * Add debian swirl floater screensaver. Thanks to Martin-Éric Racine
+    (Closes: #348281)
+  * Trim down the build-depends
+  * Add libexif-dev to the build-depends. Enables the slideshow screensaver to
+    rotate pictures when needed.
+  * debian/patches/01_dont_modify_bg.patch 
+    + Added. Calling gtk_widget_modify_bg seems to trigger a segv, so don't
+      call it.
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon,  6 Feb 2006 21:39:42 +0100
+
+gnome-screensaver (0.0.23-2) experimental; urgency=low
+
+  * Completed copyright and licensing notes. Thanks to Marc 'HE'
+    Brockschmidt <he@debian.org>.
+
+ -- Guilherme de S. Pastore <guilherme.pastore@terra.com.br>  Mon, 26 Dec 2005 09:57:58 -0200
+
+gnome-screensaver (0.0.23-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Guilherme de S. Pastore <guilherme.pastore@terra.com.br>  Wed, 21 Dec 2005 21:02:45 -0200
+
+gnome-screensaver (0.0.21-1) experimental; urgency=low
+
+  * Initial release (Closes: #317448)
+
+ -- Guilherme de S. Pastore <guilherme.pastore@terra.com.br>  Tue,  6 Dec 2005 20:30:00 -0200
+
--- gnome-screensaver-2.30.0.orig/debian/gnome-screensaver-command.1
+++ gnome-screensaver-2.30.0/debian/gnome-screensaver-command.1
@@ -0,0 +1,74 @@
+.\" Copyright (C) 2007 Sven Arvidsson <sa@whiz.se>
+.\"
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2,
+.\" or (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful, but
+.\" WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\"You should have received a copy of the GNU General Public License along
+.\"with this program; if not, write to the Free Software Foundation, Inc.,
+.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.TH gnome-screensaver-command 1 "2007\-09\-27" "GNOME"
+.SH NAME
+gnome-screensaver-command \- controls GNOME screensaver
+.SH SYNOPSIS
+.B gnome-screensaver-command
+.RI [ OPTION... ]
+.SH DESCRIPTION
+gnome-screensaver-command is a tool for controlling an already
+running instance of gnome-screensaver.
+.SH OPTIONS
+.TP
+.B \-\-exit
+Causes the screensaver to exit gracefully
+.TP
+.B \-q, \-\-query
+Query the state of the screensaver
+.TP
+.B \-t, \-\-time
+Query the length of time the screensaver has been active
+.TP
+.B \-l, \-\-lock
+Tells the running screensaver process to lock the screen immediately
+.TP
+.B \-c, \-\-cycle
+If the screensaver is active then switch to another graphics demo
+.TP
+.B \-a, \-\-activate
+Turn the screensaver on (blank the screen)
+.TP
+.B \-d, \-\-deactivate
+If the screensaver is active then deactivate it (un-blank the screen)
+.TP
+.B \-p, \-\-poke
+Poke the running screensaver to simulate user activity
+.TP
+.B \-i, \-\-inhibit
+Inhibit the screensaver from activating. Command blocks while inhibit
+is active.
+.TP
+.B \-n, \-\-application-name
+The calling application that is inhibiting the screensaver
+.TP
+.B \-r, \-\-reason
+The reason for inhibiting the screensaver
+.TP
+.B \-V, \-\-version
+Version of this application
+.SH AUTHORS
+.B gnome-screensaver-command
+is written by William Jon McCann <mccann@jhu.edu>.
+.P
+This manual page was written by Sven Arvidsson <sa@whiz.se>,
+for the Debian project (but may be used by others).
+.SH SEE ALSO
+.BR "gnome-screensaver" (1)
+.P
+The online documentation available through the program's
+.I Help
+menu.
--- gnome-screensaver-2.30.0.orig/debian/compat
+++ gnome-screensaver-2.30.0/debian/compat
@@ -0,0 +1 @@
+5
--- gnome-screensaver-2.30.0.orig/debian/source_gnome-screensaver.py
+++ gnome-screensaver-2.30.0/debian/source_gnome-screensaver.py
@@ -0,0 +1,64 @@
+#!/usr/bin/python
+
+'''Apport package hook for gnome-screensaver
+
+(c) 2010 Canonical Ltd.
+Contributors:
+Marc Deslauriers <marc.deslauriers@canonical.com>
+Chris Coulson <chris.coulson@canonical.com>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+from apport.hookutils import *
+import dbus
+
+def add_info(report):
+
+    attach_file_if_exists(report, '/etc/X11/xorg.conf', 'XorgConf')
+    attach_file_if_exists(report, '/var/log/Xorg.0.log', 'XorgLog')
+    attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld')
+
+    report['WindowManager'] = command_output(['gconftool-2','--get','/desktop/gnome/session/required_components/windowmanager'])
+
+    # We want the whole thing, not just the changes
+    report['GconfGnomeScreensaver'] = command_output(['gconftool-2', '-R', '/apps/gnome-screensaver'])
+    report['GconfGnomePowerManager'] = command_output(['gconftool-2', '-R', '/apps/gnome-power-manager'])
+    report['GconfGnomeSession'] = command_output(['gconftool-2', '-R', '/desktop/gnome/session'])
+    report['GconfGnomeLockdown'] = command_output(['gconftool-2', '-R', '/desktop/gnome/lockdown'])
+
+    try:
+        bus = dbus.SessionBus()
+        session_manager = bus.get_object('org.gnome.SessionManager', '/org/gnome/SessionManager')
+        session_manager_iface = dbus.Interface(session_manager, dbus_interface='org.gnome.SessionManager')
+        inhibitors = session_manager_iface.GetInhibitors()
+        inhibitors_str = ''
+        master_flag = 0
+        j = 1
+        for i in inhibitors:
+            obj = bus.get_object('org.gnome.SessionManager', i)
+            iface = dbus.Interface(obj, dbus_interface='org.gnome.SessionManager.Inhibitor')
+            app_id = iface.GetAppId()
+            flags = iface.GetFlags()
+            reason = iface.GetReason()
+	    if j > 1:
+		    inhibitors_str += '\n'
+            inhibitors_str += str(j) + ': AppId = ' + app_id + ', Flags = ' + str(flags) + ', Reason = ' + reason
+            j = j + 1
+            master_flag |= flags
+
+        report['GnomeSessionInhibitors'] = 'None' if inhibitors_str == '' else inhibitors_str
+        report['GnomeSessionIdleInhibited'] = 'Yes' if master_flag & 8 else 'No'
+    except:
+        report['GnomeSessionInhibitors'] = 'Failed to acquire'
+        report['GnomeSessionIdleInhibited'] = 'Unknown'
+
+if __name__ == '__main__':
+    report = {}
+    add_info(report)
+    for key in report:
+        print '[%s]\n%s' % (key, report[key])
--- gnome-screensaver-2.30.0.orig/debian/watch
+++ gnome-screensaver-2.30.0/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://ftp.gnome.org/pub/GNOME/sources/gnome-screensaver/([\d\.]+)/ gnome-screensaver-(.*)\.tar\.gz debian uupdate
--- gnome-screensaver-2.30.0.orig/debian/gnome-screensaver-preferences.1
+++ gnome-screensaver-2.30.0/debian/gnome-screensaver-preferences.1
@@ -0,0 +1,38 @@
+.\" Copyright (C) 2007 Sven Arvidsson <sa@whiz.se>
+.\"
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2,
+.\" or (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful, but
+.\" WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\"You should have received a copy of the GNU General Public License along
+.\"with this program; if not, write to the Free Software Foundation, Inc.,
+.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.TH gnome-screensaver-preferences 1 "2007\-09\-27" "GNOME"
+.SH NAME
+GNOME Screensaver Preferences \- configure GNOME Screensaver
+.SH SYNOPSIS
+.B gnome-screensaver-preferences
+.RI [ OPTIONS... ]
+.SH DESCRIPTION
+Manages preferences for the GNOME screen saver.
+.SH OPTIONS
+This program only accepts the standard GTK options.
+.SH AUTHORS
+.B gnome-screensaver-preferences
+is written by William Jon McCann <mccann@jhu.edu>.
+.P
+This manual page was written by Sven Arvidsson <sa@whiz.se>,
+for the Debian project (but may be used by others).
+.SH SEE ALSO
+.BR "gnome-screensaver" (1),
+.BR "gtk-options" (7)
+.P
+The online documentation available through the program's
+.I Help
+menu.
--- gnome-screensaver-2.30.0.orig/debian/control
+++ gnome-screensaver-2.30.0/debian/control
@@ -0,0 +1,64 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
+Source: gnome-screensaver
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Guilherme de S. Pastore <gpastore@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-screensaver/ubuntu
+Build-Depends: cdbs,
+               debhelper (>= 5.0.13),
+               gnome-pkg-tools (>= 0.10),
+               libdbus-glib-1-dev (>= 0.60),
+               libxml2-dev (>= 2.6.0),
+               libglib2.0-dev (>= 2.15.0),
+               libgconf2-dev (>= 2.6.1),
+               libgtk2.0-dev (>= 2.14.0),
+               libgnomeui-dev (>= 2.6),
+               libgnome-menu-dev (>= 2.11.1),
+               libgnome-desktop-dev (>= 2.29.0),
+               libgnomekbd-dev (>= 2.24),
+               libxt-dev,
+               libxext-dev,
+               libx11-dev,
+               libpam0g-dev,
+               xmlto,
+               x11proto-xext-dev,
+               x11proto-scrnsaver-dev,
+               libxss-dev,
+               x11proto-xf86vidmode-dev,
+               libxxf86vm-dev,
+               libxml-parser-perl,
+               libxxf86misc-dev,
+               libgl1-mesa-dev | libgl1-mesa-swx11-dev,
+               libnotify-dev,
+               libxtst-dev
+Standards-Version: 3.8.4
+Homepage: http://live.gnome.org/GnomeScreensaver
+
+Package: gnome-screensaver
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         dbus-x11,
+         gnome-icon-theme (>= 2.15.90)
+Recommends: gnome-power-manager | xfce4-power-manager,
+            xscreensaver-data,
+            xscreensaver-gl,
+            libpam-gnome-keyring
+Suggests: xscreensaver-data-extra,
+          xscreensaver-gl-extra,
+	  rss-glx
+Description: GNOME screen saver and locker
+ gnome-screensaver is a screen saver and locker that aims to have simple,
+ sane and secure defaults, and be well integrated with the GNOME desktop.
+ .
+ It is designed to support, among other things:
+ .
+  * the ability to lock down configuration settings
+  * translation into other languages
+  * user switching
--- gnome-screensaver-2.30.0.orig/debian/gnome-screensaver.pam
+++ gnome-screensaver-2.30.0/debian/gnome-screensaver.pam
@@ -0,0 +1,2 @@
+@include common-auth
+auth optional pam_gnome_keyring.so
--- gnome-screensaver-2.30.0.orig/debian/README.Debian
+++ gnome-screensaver-2.30.0/debian/README.Debian
@@ -0,0 +1,13 @@
+gnome-keyring warnings
+----------------------
+
+If you didn't install the libpam-gnome-keyring dependency, you should probably
+comment the pam_gnome_keyring.so line in /etc/pam.d/gnome-screensaver or you
+might see warnings similar to:
+
+    gnome-screensaver-dialog: PAM unable to dlopen(/lib/security/pam_gnome_keyring.so)
+    gnome-screensaver-dialog: PAM [error: /lib/security/pam_gnome_keyring.so: cannot open shared object file: No such file or directory]
+    gnome-screensaver-dialog: PAM adding faulty module: lib/security/pam_gnome_keyring.so
+
+These can also be ignored.
+
--- gnome-screensaver-2.30.0.orig/debian/org.gnome.ScreenSaver.service
+++ gnome-screensaver-2.30.0/debian/org.gnome.ScreenSaver.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.ScreenSaver
+Exec=/usr/bin/gnome-screensaver
--- gnome-screensaver-2.30.0.orig/debian/gnome-screensaver.install
+++ gnome-screensaver-2.30.0/debian/gnome-screensaver.install
@@ -0,0 +1,2 @@
+debian/source_gnome-screensaver.py            usr/share/apport/package-hooks
+debian/org.gnome.ScreenSaver.service          usr/share/dbus-1/services
--- gnome-screensaver-2.30.0.orig/debian/patches/11_autostart_delay.patch
+++ gnome-screensaver-2.30.0/debian/patches/11_autostart_delay.patch
@@ -0,0 +1,22 @@
+diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.28.0/src/gnome-screensaver.desktop.in gnome-screensaver-2.28.0.new/src/gnome-screensaver.desktop.in
+--- gnome-screensaver-2.28.0/src/gnome-screensaver.desktop.in	2009-09-23 09:27:27.000000000 +0100
++++ gnome-screensaver-2.28.0.new/src/gnome-screensaver.desktop.in	2010-02-01 23:27:00.882707509 +0000
+@@ -6,6 +6,7 @@
+ Exec=gnome-screensaver
+ OnlyShowIn=GNOME;
+ NoDisplay=true
++X-GNOME-Autostart-Delay=5
+ X-GNOME-Autostart-Phase=Application
+ X-GNOME-Autostart-Notify=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.28.0/src/gnome-screensaver.desktop.in.in gnome-screensaver-2.28.0.new/src/gnome-screensaver.desktop.in.in
+--- gnome-screensaver-2.28.0/src/gnome-screensaver.desktop.in.in	2009-08-26 17:06:12.000000000 +0100
++++ gnome-screensaver-2.28.0.new/src/gnome-screensaver.desktop.in.in	2010-02-01 23:26:47.685209757 +0000
+@@ -6,6 +6,7 @@
+ Exec=gnome-screensaver
+ OnlyShowIn=GNOME;
+ NoDisplay=true
++X-GNOME-Autostart-Delay=5
+ X-GNOME-Autostart-Phase=Application
+ X-GNOME-Autostart-Notify=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
--- gnome-screensaver-2.30.0.orig/debian/patches/10_legacy_scrsvr_inhibit.patch
+++ gnome-screensaver-2.30.0/debian/patches/10_legacy_scrsvr_inhibit.patch
@@ -0,0 +1,27 @@
+Description: Reintroduce legacy API for inhibiting the screensaver
+Author: Chris Coulson <chrisccoulson@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/428884
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=579430
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=579430
+
+diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.28.0/src/gs-monitor.c gnome-screensaver-2.28.0.new/src/gs-monitor.c
+--- gnome-screensaver-2.28.0/src/gs-monitor.c	2009-08-20 00:19:14.000000000 +0100
++++ gnome-screensaver-2.28.0.new/src/gs-monitor.c	2010-01-11 22:18:42.545853779 +0000
+@@ -28,6 +28,8 @@
+ 
+ #include <glib.h>
+ #include <glib-object.h>
++#include <X11/Xlib.h>
++#include <gdk/gdkx.h>
+ 
+ #include "gnome-screensaver.h"
+ 
+@@ -186,7 +188,7 @@
+ static void
+ gs_monitor_simulate_user_activity (GSMonitor *monitor)
+ {
+-        /* FIXME: reset the xsync timer? */
++        XResetScreenSaver (GDK_DISPLAY ());
+ 
+         /* request that the manager unlock -
+            will pop up a dialog if necessary */
--- gnome-screensaver-2.30.0.orig/debian/patches/05_locking_for_compiz.patch
+++ gnome-screensaver-2.30.0/debian/patches/05_locking_for_compiz.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.29.91/src/gs-manager.c gnome-screensaver-2.29.91.new/src/gs-manager.c
+--- gnome-screensaver-2.29.91/src/gs-manager.c	2010-02-17 20:11:27.520506231 +0000
++++ gnome-screensaver-2.29.91.new/src/gs-manager.c	2010-02-17 20:11:28.118009755 +0000
+@@ -1096,7 +1096,7 @@
+         }
+ 
+         /* Move keyboard and mouse grabs so dialog can be used */
+-        gs_grab_move_to_window (manager->priv->grab,
++        gs_grab_grab_window (manager->priv->grab,
+                                 gs_window_get_gdk_window (window),
+                                 gs_window_get_screen (window),
+                                 FALSE);
--- gnome-screensaver-2.30.0.orig/debian/patches/03_fix_ltsp-fading.patch
+++ gnome-screensaver-2.30.0/debian/patches/03_fix_ltsp-fading.patch
@@ -0,0 +1,14 @@
+diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.29.1/src/gs-fade.c gnome-screensaver-2.29.1.new/src/gs-fade.c
+--- gnome-screensaver-2.29.1/src/gs-fade.c	2010-01-29 03:16:16.000000000 +0000
++++ gnome-screensaver-2.29.1.new/src/gs-fade.c	2010-02-06 15:28:12.102656089 +0000
+@@ -411,6 +411,10 @@
+ 
+         screen_priv = &fade->priv->screen_priv[screen_idx];
+ 
++	if (g_getenv("LTSP_CLIENT")) {
++		return FADE_TYPE_NONE;  /* We're on an LTSP Client, bad idea to fade at all */
++	}
++
+         res = XF86VidModeQueryExtension (GDK_DISPLAY (), &event, &error);
+         if (! res)
+                 goto fade_none;
--- gnome-screensaver-2.30.0.orig/debian/patches/14_no_fade_on_user_switch.patch
+++ gnome-screensaver-2.30.0/debian/patches/14_no_fade_on_user_switch.patch
@@ -0,0 +1,17 @@
+Description: Work around LP: #546578 by disabling the fade effect on screen locking
+Bug-Ubuntu: https://launchpad.net/bugs/546578
+Forwarded: not-needed
+Author: Chris Coulson <chris.coulson@canonical.com>
+
+diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.30.0/src/gs-manager.c gnome-screensaver-2.30.0.new/src/gs-manager.c
+--- gnome-screensaver-2.30.0/src/gs-manager.c	2010-05-17 15:10:54.313445797 +0100
++++ gnome-screensaver-2.30.0.new/src/gs-manager.c	2010-05-17 15:33:41.393445141 +0100
+@@ -1754,7 +1754,7 @@
+         manager->priv->active = TRUE;
+ 
+         /* fade to black and show windows */
+-        do_fade = TRUE;
++        do_fade = FALSE;
+         if (do_fade) {
+                 manager->priv->fading = TRUE;
+                 gs_debug ("fading out");
--- gnome-screensaver-2.30.0.orig/debian/patches/04_force_blank_only_on_ltsp.patch
+++ gnome-screensaver-2.30.0/debian/patches/04_force_blank_only_on_ltsp.patch
@@ -0,0 +1,15 @@
+diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.29.91/src/gs-manager.c gnome-screensaver-2.29.91.new/src/gs-manager.c
+--- gnome-screensaver-2.29.91/src/gs-manager.c	2010-02-12 21:19:50.000000000 +0000
++++ gnome-screensaver-2.29.91.new/src/gs-manager.c	2010-02-17 20:10:58.308024123 +0000
+@@ -147,6 +147,11 @@
+                 return NULL;
+         }
+ 
++	if (g_getenv("LTSP_CLIENT")) {
++		gs_debug ("On LTSP Client, forcing blank only mode");
++		return NULL;
++	}
++
+         if (manager->priv->themes) {
+                 int number = 0;
+ 
--- gnome-screensaver-2.30.0.orig/debian/patches/02_keep_unlock_raised.patch
+++ gnome-screensaver-2.30.0/debian/patches/02_keep_unlock_raised.patch
@@ -0,0 +1,20 @@
+diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.29.90/src/gs-window-x11.c gnome-screensaver-2.29.90.new/src/gs-window-x11.c
+--- gnome-screensaver-2.29.90/src/gs-window-x11.c	2010-02-08 15:49:59.000000000 +0000
++++ gnome-screensaver-2.29.90.new/src/gs-window-x11.c	2010-02-09 19:50:21.692599167 +0000
+@@ -806,8 +806,15 @@
+         case ConfigureNotify:
+                 {
+                         XConfigureEvent *xce = &ev->xconfigure;
++			gboolean our_window;
++			gboolean we_are_showing_lock_box;
++			gboolean own_raise_event;
++
++			our_window = x11_window_is_ours (xce->window);
++			we_are_showing_lock_box = window->priv->lock_box;
++			own_raise_event = GDK_WINDOW_XID (GTK_WIDGET (window)->window) == xce->window;
+ 
+-                        if (! x11_window_is_ours (xce->window)) {
++                        if (!our_window || (we_are_showing_lock_box && !own_raise_event)) {
+                                 gs_window_raise (window);
+                         } else {
+                                 gs_debug ("not raising our windows");
--- gnome-screensaver-2.30.0.orig/debian/patches/16_dont_crash_in_kvm.patch
+++ gnome-screensaver-2.30.0/debian/patches/16_dont_crash_in_kvm.patch
@@ -0,0 +1,61 @@
+Description: Don't crash when the XF86VM extension doesn't allow the gamma to be set
+ On some systems where the XF86VM extension is present, the gamma value
+ can be read successfully with XF86VidModeGetGamma but attempting to
+ change the gamma value with XF86VidModeSetGamma will result in a
+ BadValue error (eg, on KVM).
+
+ Trap this error and abort the fade rather than crashing.
+Bug-Ubuntu: https://launchpad.net/bugs/581864
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=618932
+Forwarded: https://bugzilla.gnome.org/attachment.cgi?id=161276
+Author: Chris Coulson <chris.coulson@canonical.com>
+
+diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.30.0/src/gs-fade.c gnome-screensaver-2.30.0.new/src/gs-fade.c
+--- gnome-screensaver-2.30.0/src/gs-fade.c	2010-05-19 11:15:09.582946393 +0100
++++ gnome-screensaver-2.30.0.new/src/gs-fade.c	2010-05-19 11:17:21.960447308 +0100
+@@ -208,7 +208,13 @@
+                         g2.blue = XF86_MIN_GAMMA;
+                 }
+ 
++                gdk_error_trap_push ();
+                 status = XF86VidModeSetGamma (GDK_DISPLAY (), screen, &g2);
++                gdk_flush ();
++                if (gdk_error_trap_pop ()) {
++                        gs_debug ("Failed to set gamma. Bailing out and aborting fade");
++                        return FALSE;        
++                }
+         } else {
+ 
+ # ifdef HAVE_XF86VMODE_GAMMA_RAMP
+@@ -225,7 +231,13 @@
+                         b[i] = gamma_info->b[i] * ratio;
+                 }
+ 
++                gdk_error_trap_push ();
+                 status = XF86VidModeSetGammaRamp (GDK_DISPLAY (), screen, gamma_info->size, r, g, b);
++                gdk_flush ();
++                if (gdk_error_trap_pop ()) {
++                        gs_debug ("Failed to set gamma. Bailing out and aborting fade");
++                        return FALSE;                
++                }
+ 
+                 g_free (r);
+                 g_free (g);
+@@ -236,8 +248,6 @@
+ # endif /* !HAVE_XF86VMODE_GAMMA_RAMP */
+         }
+ 
+-        gdk_flush ();
+-
+         return status;
+ }
+ 
+@@ -392,7 +402,7 @@
+         screen_priv = &fade->priv->screen_priv[screen_idx];
+         res = xf86_whack_gamma (screen_idx, screen_priv, alpha);
+ 
+-        return TRUE;
++        return res;
+ #else
+         return FALSE;
+ #endif /* HAVE_XF86VMODE_GAMMA */
--- gnome-screensaver-2.30.0.orig/debian/patches/15_dont_crash_on_no_fade.patch
+++ gnome-screensaver-2.30.0/debian/patches/15_dont_crash_on_no_fade.patch
@@ -0,0 +1,50 @@
+Description: Don't crash on systems that don't support XF86VM or XRANDR gamma fade
+ Test if fade is supported on each screen before calling the fade_setup
+ virtual function.
+Bug-Ubuntu: https://launchpad.net/bugs/558721
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=618925
+Forwarded: https://bugzilla.gnome.org/attachment.cgi?id=161269
+Author: Chris Coulson <chris.coulson@canonical.com>
+
+diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.30.0/src/gs-fade.c gnome-screensaver-2.30.0.new/src/gs-fade.c
+--- gnome-screensaver-2.30.0/src/gs-fade.c	2010-05-19 10:58:40.410448496 +0100
++++ gnome-screensaver-2.30.0.new/src/gs-fade.c	2010-05-19 10:59:36.842968690 +0100
+@@ -727,9 +727,11 @@
+ 
+         for (i = 0; i < fade->priv->num_screens; i++) {
+                 screen_priv = &fade->priv->screen_priv[i];
+-                res = screen_priv->fade_setup (fade, i);
+-                if (res == FALSE)
+-                        return;
++                if (screen_priv->fade_type != FADE_TYPE_NONE) {
++                        res = screen_priv->fade_setup (fade, i);
++                        if (res == FALSE)
++                                return;
++                }
+         }
+ 
+         if (fade->priv->timer_id > 0) {
+@@ -846,6 +848,8 @@
+ gs_fade_reset (GSFade *fade)
+ {
+         int i;
++        struct GSFadeScreenPrivate *screen_priv;
++
+         g_return_if_fail (GS_IS_FADE (fade));
+ 
+         gs_debug ("Resetting fade");
+@@ -858,8 +862,12 @@
+ 
+         gs_fade_set_alpha (fade, fade->priv->current_alpha);
+ 
+-        for (i = 0; i < fade->priv->num_screens; i++)
+-                fade->priv->screen_priv[i].fade_finish (fade, i);
++        for (i = 0; i < fade->priv->num_screens; i++) {
++                screen_priv = &fade->priv->screen_priv[i];
++                if (screen_priv->fade_type != FADE_TYPE_NONE) {
++                        screen_priv->fade_finish (fade, i);
++                }
++        }
+ }
+ 
+ static void
--- gnome-screensaver-2.30.0.orig/debian/patches/12_use_dbus_service.patch
+++ gnome-screensaver-2.30.0/debian/patches/12_use_dbus_service.patch
@@ -0,0 +1,42 @@
+Description: Use D-Bus to start gnome-screensaver if it is not running.
+Author: Marc Deslauriers <marc.deslauriers@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-screensaver/+bug/515832
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=609029
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=609029
+
+diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.28.0/src/gnome-screensaver-command.c gnome-screensaver-2.28.0.new/src/gnome-screensaver-command.c
+--- gnome-screensaver-2.28.0/src/gnome-screensaver-command.c	2009-08-26 09:06:12.000000000 -0700
++++ gnome-screensaver-2.28.0.new/src/gnome-screensaver-command.c	2010-02-03 12:01:26.000000000 -0800
+@@ -88,19 +88,19 @@
+ static GMainLoop *loop = NULL;
+ 
+ static gboolean
+-screensaver_is_running (DBusConnection *connection)
++screensaver_start_service (DBusConnection *connection)
+ {
+         DBusError               error;
+-        gboolean                exists;
++        gboolean                success;
+ 
+         g_return_val_if_fail (connection != NULL, FALSE);
+ 
+         dbus_error_init (&error);
+-        exists = dbus_bus_name_has_owner (connection, GS_SERVICE, &error);
++        success = dbus_bus_start_service_by_name (connection, GS_SERVICE, 0, NULL, &error);
+         if (dbus_error_is_set (&error))
+                 dbus_error_free (&error);
+ 
+-        return exists;
++        return success;
+ }
+ 
+ static DBusMessage *
+@@ -468,7 +468,7 @@
+ 
+         dbus_connection_setup_with_g_main (connection, NULL);
+ 
+-        if (! screensaver_is_running (connection)) {
++        if (! screensaver_start_service (connection)) {
+                 g_message ("Screensaver is not running!");
+                 exit (1);
+         }
--- gnome-screensaver-2.30.0.orig/debian/patches/13_nvidia_gamma_fade_fallback.patch
+++ gnome-screensaver-2.30.0/debian/patches/13_nvidia_gamma_fade_fallback.patch
@@ -0,0 +1,40 @@
+Description: Fall back to XF86VM gamma fade if XRANDR gamma fade is not supported
+Author: Chris Coulson <chrisccoulson@ubuntu.com>
+Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/gnome-screensaver/+bug/522806
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=610294
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=610294
+
+diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.29.90/src/gs-fade.c gnome-screensaver-2.29.90.new/src/gs-fade.c
+--- gnome-screensaver-2.29.90/src/gs-fade.c	2010-02-16 22:41:37.233254048 +0000
++++ gnome-screensaver-2.29.90.new/src/gs-fade.c	2010-02-16 22:52:43.700769263 +0000
+@@ -573,6 +573,10 @@
+         GdkDisplay *display = gdk_display_get_default ();
+         GdkScreen *screen = gdk_display_get_screen (display, screen_idx);
+         struct GSFadeScreenPrivate *screen_priv;
++        GnomeRRCrtc **crtcs;
++        GnomeRRCrtc *crtc;
++        gboolean res;
++        int gamma_size;
+ 
+         screen_priv = &fade->priv->screen_priv[screen_idx];
+ 
+@@ -585,6 +589,19 @@
+                 return;
+         }
+ 
++        crtcs = gnome_rr_screen_list_crtcs (screen_priv->rrscreen);
++
++        while (*crtcs)
++        {
++                crtc = *crtcs;
++                res = gnome_rr_crtc_get_gamma (crtc, &gamma_size, NULL, NULL, NULL);
++                if (res == FALSE || gamma_size == 0) {
++                        screen_priv->fade_type = FADE_TYPE_NONE;
++                        return;                
++                }
++                crtcs++;
++        }
++
+         screen_priv->fade_type = FADE_TYPE_XRANDR;
+         screen_priv->fade_setup = xrandr_fade_setup;
+         screen_priv->fade_finish = screen_fade_finish;
