xdm: Changes to 'upstream-unstable'
Rebased ref, commits from common ancestor:
commit 576861d7e6158790e18ae79b8d566919b88d0cae
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 7 17:12:33 2008 -0500
xdm 1.1.7
diff --git a/configure.ac b/configure.ac
index a6f8ad3..3cd11be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,3 @@
-
dnl Copyright 2005 Red Hat, Inc.
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@@ -24,7 +23,7 @@ dnl Process this file with autoconf to create configure.
dnl $XdotOrg: app/xdm/configure.ac,v 1.42 2006/06/03 01:01:21 alanc Exp $
AC_PREREQ([2.57])
-AC_INIT(xdm,[1.1.6],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
+AC_INIT(xdm,[1.1.7],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 996fea2fb1ae1e419e673b89cc3778e371a29324
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 7 17:10:30 2008 -0500
Fix distcheck.
diff --git a/Makefile.am b/Makefile.am
index fe5f18e..dacdefd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,7 +151,7 @@ chooser_SOURCES = \
# App default files (*.ad)
-appdefaultdir = @appdefaultdir@
+appdefaultdir = @DESTDIR@@appdefaultdir@
APPDEFAULTFILES = Chooser
commit 87a8f18c334b3e5819f92d0f8f37cc41987486d4
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 20 19:11:53 2007 -0800
Darwin doesn't need __DARWIN__ anymore.
diff --git a/configure.ac b/configure.ac
index 0356ce7..a6f8ad3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,7 +128,7 @@ case $host_os in
SU="su"
;;
darwin*)
- OS_CFLAGS="-D__DARWIN__ -DNO_LASTLOG"
+ OS_CFLAGS="-DNO_LASTLOG"
SU="su -m"
;;
*bsd*|dragonfly*)
commit 28f4ded22488ce8542ff8b9871f6b4e04614058d
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
commit 923176024d3d6b7f5b392b4f9a07cce8c6ed3823
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
Reply to: