xdm: Changes to 'debian-unstable'

[Brice Goglin <bgoglin@alioth.debian.org>]

 debian/changelog    |    1 +
 debian/local/Xreset |    5 +++++
 2 files changed, 6 insertions(+)

New commits:
commit a37aee1f488841a19be1d3e891cea5774a6bb409
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sat Mar 6 16:21:03 2010 +0100

    Add Xreset hook

diff --git a/debian/changelog b/debian/changelog
index 01ad1f4..6a89876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ xdm (1:1.1.9-1) UNRELEASED; urgency=low
       11_xdm_strerror.diff, 12_remove_pidfile.diff,
       applied upstream.
   * Refresh patches.
+  * Add Xreset hook, closes: #571607.
 
  -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 22:05:09 +0100
 
diff --git a/debian/local/Xreset b/debian/local/Xreset
index 1513a26..eccc019 100644
--- a/debian/local/Xreset
+++ b/debian/local/Xreset
@@ -4,6 +4,11 @@
 #
 # This script is run as root after the user's X session ends.
 
+# Use common Xreset framework if it exist
+if [ -x /etc/X11/Xreset ] ; then
+    /etc/X11/Xreset
+fi
+
 # Remove the utmp entry for the session.
 if grep -qs '^use-sessreg' /etc/X11/xdm/xdm.options \
   && which sessreg >/dev/null 2>&1; then