diff -u gnome-screensaver-2.20.0/debian/changelog gnome-screensaver-2.20.0/debian/changelog
--- gnome-screensaver-2.20.0/debian/changelog
+++ gnome-screensaver-2.20.0/debian/changelog
@@ -1,3 +1,10 @@
+gnome-screensaver (2.20.0-0ubuntu4.1) gutsy-proposed; urgency=low
+
+  * debian/patches/05_improved_locking.patch:
+    - use more robust locking in g-s-s (LP: #145123)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 19 Oct 2007 10:52:23 +0200
+
 gnome-screensaver (2.20.0-0ubuntu4) gutsy; urgency=low
 
   * debian/control:
only in patch2:
unchanged:
--- gnome-screensaver-2.20.0.orig/debian/patches/05_improved_locking.patch
+++ gnome-screensaver-2.20.0/debian/patches/05_improved_locking.patch
@@ -0,0 +1,12 @@
+diff -u ref/gnome-screensaver-2.20.0/src/gs-manager.c gnome-screensaver-2.20.0/src/gs-manager.c
+--- ref/gnome-screensaver-2.20.0/src/gs-manager.c	2007-10-17 21:42:29.000000000 +0200
++++ gnome-screensaver-2.20.0/src/gs-manager.c	2007-10-17 21:25:29.000000000 +0200
+@@ -1050,7 +1050,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);