INSTALL | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++
config.guess | 6 -
config.sub | 10 +-
configure | 24 ++---
configure.ac | 6 -
debian/changelog | 13 ++
debian/rules | 4
debian/xsfbs/xsfbs.sh | 7 -
xdm.man.cpp | 1
9 files changed, 271 insertions(+), 34 deletions(-)
New commits:
commit 150d68c38ec35d94c6c8a03a4490047dfa3580df
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Wed Aug 29 09:54:16 2007 +0200
New upstream release
diff --git a/INSTALL b/INSTALL
index e69de29..5458714 100644
--- a/INSTALL
+++ b/INSTALL
@@ -0,0 +1,234 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff --git a/config.guess b/config.guess
index 0f0fe71..278f9e9 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-03-06'
+timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@ EOF
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
diff --git a/config.sub b/config.sub
index 5defff6..1761d8b 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-01-18'
+timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -683,6 +683,10 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
diff --git a/configure b/configure
index e96c60c..9bdac13 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xdm 1.1.5.
+# Generated by GNU Autoconf 2.61 for xdm 1.1.6.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xdm'
PACKAGE_TARNAME='xdm'
-PACKAGE_VERSION='1.1.5'
-PACKAGE_STRING='xdm 1.1.5'
+PACKAGE_VERSION='1.1.6'
+PACKAGE_STRING='xdm 1.1.6'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1508,7 +1508,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xdm 1.1.5 to adapt to many kinds of systems.
+\`configure' configures xdm 1.1.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1578,7 +1578,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xdm 1.1.5:";;
+ short | recursive ) echo "Configuration of xdm 1.1.6:";;
esac
cat <<\_ACEOF
@@ -1771,7 +1771,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xdm configure 1.1.5
+xdm configure 1.1.6
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1785,7 +1785,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xdm $as_me 1.1.5, which was
+It was created by xdm $as_me 1.1.6, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2475,7 +2475,7 @@ fi
# Define the identity of the package.
PACKAGE='xdm'
- VERSION='1.1.5'
+ VERSION='1.1.6'
cat >>confdefs.h <<_ACEOF
@@ -24955,7 +24955,7 @@ _ACEOF
if test "${with_xrdb+set}" = set; then
withval=$with_xrdb; XRDB=$withval
else
- XRDB=bindir/xrdb
+ XRDB=${bindir}/xrdb
fi
@@ -24982,7 +24982,7 @@ _ACEOF
if test "${with_default_session+set}" = set; then
withval=$with_default_session; DEF_SESSION=$withval
else
- DEF_SESSION="bindir/xterm -ls"
+ DEF_SESSION="${bindir}/xterm -ls"
fi
@@ -25960,7 +25960,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xdm $as_me 1.1.5, which was
+This file was extended by xdm $as_me 1.1.6, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26013,7 +26013,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xdm config.status 1.1.5
+xdm config.status 1.1.6
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index c858044..9740a98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xdm (1:1.1.5-3) UNRELEASED; urgency=low
+xdm (1:1.1.6-1) unstable; urgency=low
[ Debconf translation updates ]
* Romanian updated. Closes: #421748
@@ -7,8 +7,13 @@ xdm (1:1.1.5-3) UNRELEASED; urgency=low
[ Brice Goglin ]
* Update to new xsfbs which does not call laptop-detect anymore,
closes: #438098.
+ * New upstream release.
+ + Fix non-existing section in the manpage, thanks Luca Capello,
+ closes: #376391.
+ + Revert "Set path to xrdb and default session in debian/rules"
+ now that it is properly fixed upstream.
- -- Brice Goglin <[EMAIL PROTECTED]> Wed, 29 Aug 2007 09:44:52 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]> Wed, 29 Aug 2007 09:48:33 +0200
xdm (1:1.1.5-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index f53f6e0..cb27361 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,9 +22,7 @@ confflags += --with-pam \
--with-color-pixmap=debian.xpm \
--with-bw-pixmap=debianbw.xpm \
--disable-dynamic-greeter \
- --with-xft \
- --with-xrdb=/usr/bin/xrdb \
- --with-default-session="/usr/bin/xterm -ls"
+ --with-xft
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
commit fe6ee1013ddcf6c46c2955926213d4c90acc38e9
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Wed Aug 29 09:45:40 2007 +0200
Update to new xsfbs which does not call laptop-detect anymore
diff --git a/debian/changelog b/debian/changelog
index 5614008..c858044 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,11 @@ xdm (1:1.1.5-3) UNRELEASED; urgency=low
* Romanian updated. Closes: #421748
* Vietnamese updated. Closes: #427192
- -- Christian Perrier <[EMAIL PROTECTED]> Sun, 26 Aug 2007 14:21:00 +0200
+ [ Brice Goglin ]
+ * Update to new xsfbs which does not call laptop-detect anymore,
+ closes: #438098.
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Wed, 29 Aug 2007 09:44:52 +0200
xdm (1:1.1.5-2) unstable; urgency=low
commit 575efb7249d7cf194f07e45db17e601d9c259231
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Wed Aug 29 09:36:00 2007 +0200
Do not call laptop-detect, let the only user call it directly
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 52473ca..a90ff7d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -59,13 +59,6 @@ fi
ARCHITECTURE="$(dpkg --print-installation-architecture)"
-LAPTOP=""
-if [ -n "$(which laptop-detect)" ]; then
- if laptop-detect >/dev/null; then
- LAPTOP=true
- fi
-fi
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit e775ab1778850663a755279470d3ad6a2c9c0054
Author: Alan Coopersmith <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
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])
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
