xdm: Changes to 'debian-unstable'
ChangeLog | 36 ++++++++++++++++++++++++++++++++++++
config/Xresources.cpp | 9 +++++++++
debian/changelog | 7 +++++++
3 files changed, 52 insertions(+)
New commits:
commit b94c15ff6a915bfebc94bbd1561e8b811293c9d8
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Sep 21 21:36:15 2007 +0200
Grab another upstream commit to really fix config/Xresources.cpp
diff --git a/ChangeLog b/ChangeLog
index 8f6e6a6..494d55b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+commit dbdd97d3c7dc65b43e0f62a312c5a774b33f11ca
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Sep 21 11:03:54 2007 -0700
+
+ Debian bug #440389: 800x600 settings got lost, screen now too wide
+
+ Debian bug #440389 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440389>
+ When deleting the XPM #ifdefs, a set of #if WIDTH < 800 resources
+ got accidentally deleted as well. (Cause & fix found by Brice Goglin)
+
+commit 01a4ff1cf0787c2b2348bfe58bce9a79ebba0cd7
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 27 14:17:13 2007 -0700
+
+ Restore #endif accidentally removed in d0d4581be22aba9021c5a672bd9e5ba719961e29
+
+commit e775ab1778850663a755279470d3ad6a2c9c0054
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Aug 16 14:47:17 2007 -0700
+
+ Version bump: 1.1.6
+
+commit 298811a10ee1b72c553d18cc40bdfde17afb14e8
+Author: Luca Capello <luca@pca.it>
+Date: Sun Jul 2 18:57:05 2006 +0200
+
+ Debian Bug #376391: xdm manpage refers to non-existent section 'Typical Usage'
+
+commit 593788896cdba598ceaa5fbf9e4d214583ffb6ed
+Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
+Date: Wed Aug 15 18:38:53 2007 -0700
+
+ Debian Bug #437961: loading Xresources fails because bindir/xrdb does not exist
+
+ <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=437961>
+
commit ef1be3254966018fede7c33dea2f41b9351ef699
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 10 10:43:10 2007 -0700
diff --git a/debian/changelog b/debian/changelog
index 24d568a..14178f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xdm (1:1.1.6-3) unstable; urgency=low
+
+ * Grab upstream commit 28f4ded22488ce8542ff8b9871f6b4e04614058d to
+ really fix config/Xresources.cpp, closes: #440389.
+
+ -- Brice Goglin <bgoglin@debian.org> Fri, 21 Sep 2007 21:35:43 +0200
+
xdm (1:1.1.6-2) unstable; urgency=low
* Grab upstream commit 923176024d3d6b7f5b392b4f9a07cce8c6ed3823 to
commit bfc7b237546cfde707a9023032da7fa71d567324
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Sep 21 11:03:54 2007 -0700
Debian bug #440389: 800x600 settings got lost, screen now too wide
Debian bug #440389 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440389>
When deleting the XPM #ifdefs, a set of #if WIDTH < 800 resources
got accidentally deleted as well. (Cause & fix found by Brice Goglin)
diff --git a/config/Xresources.cpp b/config/Xresources.cpp
index 5ba0f40..8c04efc 100644
--- a/config/Xresources.cpp
+++ b/config/Xresources.cpp
@@ -36,6 +36,15 @@ xlogin*greetFace: Serif-24:bold:italic
xlogin*face: Helvetica-18
xlogin*promptFace: Helvetica-18:bold
xlogin*failFace: Helvetica-18:bold
+XHASHelse
+xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1
+xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
+xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
+xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
+xlogin*greetFace: Serif-18:bold:italic
+xlogin*face: Helvetica-12
+xlogin*promptFace: Helvetica-12:bold
+xlogin*failFace: Helvetica-14:bold
XHASHendif
XHASHifdef COLOR
Reply to: