xdm: Changes to 'upstream-unstable'
configure.ac | 6 +++---
xdm.man.cpp | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit e775ab1778850663a755279470d3ad6a2c9c0054
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Aug 16 14:47:17 2007 -0700
Version bump: 1.1.6
diff --git a/configure.ac b/configure.ac
index 4a81c1e..0356ce7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,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.5],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
+AC_INIT(xdm,[1.1.6],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
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'
diff --git a/xdm.man.cpp b/xdm.man.cpp
index c95019a..ab511b7 100644
--- a/xdm.man.cpp
+++ b/xdm.man.cpp
@@ -1227,7 +1227,6 @@ a file \fI\.xsession,\fP
which contains commands that each user would like to use as a session.
\fIXsession\fP should also
implement a system default session if no user-specified session exists.
-See the section \fBTypical Usage\fP.
.PP
An argument may be passed to this program from the authentication widget
using the `set-session-argument' action. This can be used to select
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>
diff --git a/configure.ac b/configure.ac
index ec2debd..4a81c1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -425,14 +425,14 @@ AC_DEFINE_DIR(DEF_SERVER_LINE, DEF_SERVER_LINE,
# -DXRDB_PROGRAM="$(BINDIR)/xrdb"
AC_ARG_WITH(xrdb, AC_HELP_STRING([--with-xrdb=path],
[Use path for xrdb (default: bindir/xrdb)]),
- [XRDB=$withval], [XRDB=bindir/xrdb])
+ [XRDB=$withval], [XRDB=${bindir}/xrdb])
AC_DEFINE_DIR(XRDB_PROGRAM, XRDB,
[Define to pathname for xrdb program])
# -DDEF_SESSION="$(BINDIR)/xterm -ls"
AC_ARG_WITH(default-session, AC_HELP_STRING([--with-default-session=command],
[Use command for default session (default: bindir/xterm -ls)]),
- [DEF_SESSION=$withval], [DEF_SESSION="bindir/xterm -ls"])
+ [DEF_SESSION=$withval], [DEF_SESSION="${bindir}/xterm -ls"])
AC_DEFINE_DIR(DEF_SESSION, DEF_SESSION,
[Define to default command to start X session])
Reply to: