xdm: Changes to 'debian-unstable'

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

 config/Xresources.cpp |    1 +
 debian/changelog      |    7 +++++++
 2 files changed, 8 insertions(+)

New commits:
commit 6086f29e3014e9929eb0c9d0d601cce260db36ad
Author: Brice Goglin <bgoglin@debian.org>
Date:   Wed Aug 29 20:37:27 2007 +0200

    New upload with upstream commit 923176024d3d6b7f5b392b4f9a07cce8c6ed3823 to fix missing #endif

diff --git a/debian/changelog b/debian/changelog
index 9740a98..24d568a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xdm (1:1.1.6-2) unstable; urgency=low
+
+  * Grab upstream commit 923176024d3d6b7f5b392b4f9a07cce8c6ed3823 to
+    fix missing #endif.
+
+ -- Brice Goglin <bgoglin@debian.org>  Wed, 29 Aug 2007 20:36:13 +0200
+
 xdm (1:1.1.6-1) unstable; urgency=low
 
   [ Debconf translation updates ]

commit f513239490e3812f9cede92bd17febf818dc88df
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Mon Aug 27 14:17:13 2007 -0700

    Restore #endif accidentally removed in d0d4581be22aba9021c5a672bd9e5ba719961e29

diff --git a/config/Xresources.cpp b/config/Xresources.cpp
index a98287b..5ba0f40 100644
--- a/config/Xresources.cpp
+++ b/config/Xresources.cpp
@@ -36,6 +36,7 @@ xlogin*greetFace:	Serif-24:bold:italic
 xlogin*face: 		Helvetica-18
 xlogin*promptFace: 	Helvetica-18:bold
 xlogin*failFace: 	Helvetica-18:bold
+XHASHendif
 
 XHASHifdef COLOR
 xlogin*borderWidth: 1