diff -u gdm-2.30.0/debian/changelog gdm-2.30.0/debian/changelog --- gdm-2.30.0/debian/changelog +++ gdm-2.30.0/debian/changelog @@ -1,3 +1,10 @@ +gdm (2.30.0-0ubuntu6) lucid; urgency=low + + * debian/patches/34-add-xreset-support.patch: Add support for the common + Xreset framework. (LP: #559847) + + -- Timo Aaltonen Sat, 17 Apr 2010 14:27:35 +0300 + gdm (2.30.0-0ubuntu5) lucid; urgency=low * debian/patches/14_guest_session.patch: only in patch2: unchanged: --- gdm-2.30.0.orig/debian/patches/34-add-xreset-support.patch +++ gdm-2.30.0/debian/patches/34-add-xreset-support.patch @@ -0,0 +1,15 @@ +## Description: Add Xreset support +## Origin/Author: merged the change from Debian 2.20.10-2 +## Bug: https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/559847 +diff -Nur -x '*.orig' -x '*~' gdm-2.30.0/data/PostSession.in gdm-2.30.0.new/data/PostSession.in +--- gdm-2.30.0/data/PostSession.in 2010-03-30 00:42:03.000000000 +0300 ++++ gdm-2.30.0.new/data/PostSession.in 2010-04-17 14:27:28.171511570 +0300 +@@ -1,3 +1,8 @@ + #!/bin/sh + ++# Use common Xreset framework if it exist ++if [ -x /etc/X11/Xreset ] ; then ++ /etc/X11/Xreset ++fi ++ + exit 0