xinit: Changes to 'debian-unstable'
.gitignore | 23
COPYING | 25 -
ChangeLog | 475 +++++++++++++++++---
Makefile.am | 7
Makefile.in | 15
aclocal.m4 | 22
autogen.sh | 13
config.h.in | 12
configure | 138 +++++
configure.ac | 4
debian/changelog | 27 -
debian/control | 2
debian/copyright | 3
debian/patches/06_move_serverauthfile_into_tmp.diff | 20
debian/patches/series | 9
debian/rules | 2
debian/watch | 3
startx.cmd | 4
startx.cpp | 34 -
startx.man | 56 +-
xinit.c | 199 ++++----
xinit.man | 8
xinitrc.cmd | 6
xinitrc.cpp | 76 ++-
24 files changed, 944 insertions(+), 239 deletions(-)
New commits:
commit bca0424dda3730e290329c1a9db58e21681ff947
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Sep 14 22:52:21 2007 +0200
Prepare changelog for upload to unstable
diff --git a/debian/changelog b/debian/changelog
index aa40c90..cffe2e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-xinit (1.0.5-1) UNRELEASED; urgency=low
+xinit (1.0.5-1) unstable; urgency=low
* New upstream release.
* Add 06_move_serverauthfile_into_tmp.diff so that startx auth files
are removed on reboot, thanks Luca Capello, closes: #357736.
+ * Add myself to Uploaders, and remove Branden with his permission.
- -- Brice Goglin <bgoglin@debian.org> Fri, 14 Sep 2007 22:50:34 +0200
+ -- Brice Goglin <bgoglin@debian.org> Fri, 14 Sep 2007 22:51:49 +0200
xinit (1.0.4-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 010ffcc..24942a6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xinit
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Julien Cristau <jcristau@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-1), quilt
Standards-Version: 3.7.2.0
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xinit
commit 8079c5ad9891525e2b9635c1ba732373cc0d934c
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Sep 14 22:50:47 2007 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index b539f85..758a40e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+commit e91874313c99dfb6be042cd1739e463e080b71fc
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Sep 5 10:14:52 2007 -0700
+
+ Bump version to 1.0.5.
+
+commit 2640fb97a42e0d91603defc0f37388735c56a54d
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Sep 4 13:05:47 2007 -0700
+
+ Fix broken test for /dev/random cookie generation failure.
+
+commit fc6cc81be41af58ffd996994e1325dd072a9ab34
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Jul 13 15:34:43 2007 -0700
+
+ Use /dev/random to generate the cookie if mcookie is unavailable.
+
+ Setting XAUTHORITY without having actually generated a cookie and created
+ .Xauthority led to issues if somebody like ssh later came around and made the
+ .Xauthority file for their own setup. So, simply make it so that we never
+ fail to create one.
+
commit e9c1d1667b58c738cb1317219cc0ac84bef2a5d6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon May 21 20:00:38 2007 -0700
diff --git a/config.guess b/config.guess
index 0f0fe71..396482d 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='2006-07-02'
# 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
@@ -161,7 +161,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
- sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -781,7 +780,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- *:MINGW*:*)
+ i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -791,15 +790,12 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
- case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T | authenticamd)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- esac ;;
+ x86:Interix*:[3456]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[3456]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -954,9 +950,6 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- xtensa:Linux:*:*)
- echo xtensa-unknown-linux-gnu
- exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1215,15 +1208,6 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
- SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
- exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff --git a/config.sub b/config.sub
index 5defff6..387c18d 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='2006-07-02'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fido | fr30 | frv \
+ | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -276,7 +276,6 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -285,7 +284,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -324,7 +323,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -368,7 +367,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -910,10 +909,6 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
- sde)
- basic_machine=mipsisa32-sde
- os=-elf
- ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -925,9 +920,6 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
- sh5el)
- basic_machine=sh5le-unknown
- ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1222,7 +1214,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1374,9 +1366,6 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
- os=-elf
- ;;
spu-*)
os=-elf
;;
@@ -1417,9 +1406,6 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
- mep-*)
- os=-elf
- ;;
mips*-cisco)
os=-elf
;;
diff --git a/configure b/configure
index c3666cc..84a8620 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 xinit 1.0.4.
+# Generated by GNU Autoconf 2.61 for xinit 1.0.5.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xinit'
PACKAGE_TARNAME='xinit'
-PACKAGE_VERSION='1.0.4'
-PACKAGE_STRING='xinit 1.0.4'
+PACKAGE_VERSION='1.0.5'
+PACKAGE_STRING='xinit 1.0.5'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1249,7 +1249,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 xinit 1.0.4 to adapt to many kinds of systems.
+\`configure' configures xinit 1.0.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1319,7 +1319,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xinit 1.0.4:";;
+ short | recursive ) echo "Configuration of xinit 1.0.5:";;
esac
cat <<\_ACEOF
@@ -1423,7 +1423,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xinit configure 1.0.4
+xinit configure 1.0.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1437,7 +1437,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 xinit $as_me 1.0.4, which was
+It was created by xinit $as_me 1.0.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2107,7 +2107,7 @@ fi
# Define the identity of the package.
PACKAGE='xinit'
- VERSION='1.0.4'
+ VERSION='1.0.5'
cat >>confdefs.h <<_ACEOF
@@ -5958,7 +5958,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 xinit $as_me 1.0.4, which was
+This file was extended by xinit $as_me 1.0.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6011,7 +6011,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xinit config.status 1.0.4
+xinit config.status 1.0.5
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 b62a159..aa40c90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xinit (1.0.4-3) UNRELEASED; urgency=low
+xinit (1.0.5-1) UNRELEASED; urgency=low
+ * New upstream release.
* Add 06_move_serverauthfile_into_tmp.diff so that startx auth files
are removed on reboot, thanks Luca Capello, closes: #357736.
- -- Brice Goglin <bgoglin@debian.org> Wed, 15 Aug 2007 14:08:53 +0200
+ -- Brice Goglin <bgoglin@debian.org> Fri, 14 Sep 2007 22:50:34 +0200
xinit (1.0.4-2) experimental; urgency=low
commit e91874313c99dfb6be042cd1739e463e080b71fc
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 5 10:14:52 2007 -0700
Bump version to 1.0.5.
diff --git a/configure.ac b/configure.ac
index c89828b..1aee1d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xinit,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
+AC_INIT(xinit,[1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 2640fb97a42e0d91603defc0f37388735c56a54d
Author: Eric Anholt <eric@anholt.net>
Date: Tue Sep 4 13:05:47 2007 -0700
Fix broken test for /dev/random cookie generation failure.
diff --git a/startx.cpp b/startx.cpp
index f4e24fd..42421ef 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -189,7 +189,7 @@ authdisplay=${display:-:0}
mcookie=`MK_COOKIE`
#else
mcookie=`dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"`
-if x"$mcookie" = x; then
+if test x"$mcookie" = x; then
echo "Couldn't create cookie"
exit 1
fi
commit 2e092e607fe2f013cbb8b1d9e3fe97de4097b86d
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Aug 17 08:41:30 2007 +0200
Be paranoiac when choosing the serverauth filename in 06_move_serverauthfile_into_tmp.diff
diff --git a/debian/patches/06_move_serverauthfile_into_tmp.diff b/debian/patches/06_move_serverauthfile_into_tmp.diff
index dd2b2ff..82547d1 100644
--- a/debian/patches/06_move_serverauthfile_into_tmp.diff
+++ b/debian/patches/06_move_serverauthfile_into_tmp.diff
@@ -14,7 +14,7 @@ Index: xinit/startx.cpp
XCOMM create a file with auth information for the server. ':0' is a dummy.
-xserverauthfile=$HOME/.serverauth.$$
-+xserverauthfile=/tmp/.serverauth.$$
++xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
xauth -q -f $xserverauthfile << EOF
add :$dummy . $mcookie
EOF
commit 12076440aee13ec0d0e61de6d8cbfcb4deb048d6
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Aug 15 14:37:54 2007 +0200
Add 06_move_serverauthfile_into_tmp.diff so that startx auth files are removed on reboot
diff --git a/debian/changelog b/debian/changelog
index 4f74ea5..b62a159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xinit (1.0.4-3) UNRELEASED; urgency=low
+
+ * Add 06_move_serverauthfile_into_tmp.diff so that startx auth files
+ are removed on reboot, thanks Luca Capello, closes: #357736.
+
+ -- Brice Goglin <bgoglin@debian.org> Wed, 15 Aug 2007 14:08:53 +0200
+
xinit (1.0.4-2) experimental; urgency=low
* Add upstream URL in debian/copyright; thanks, Jörg Jaspert.
diff --git a/debian/patches/06_move_serverauthfile_into_tmp.diff b/debian/patches/06_move_serverauthfile_into_tmp.diff
new file mode 100644
index 0000000..dd2b2ff
--- /dev/null
+++ b/debian/patches/06_move_serverauthfile_into_tmp.diff
@@ -0,0 +1,20 @@
+Move startx auth files in /tmp so they are removed on reboot.
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
+The trap patch didn't seem to work on reboot.
+---
+ startx.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: xinit/startx.cpp
+===================================================================
+--- xinit.orig/startx.cpp 2007-08-15 14:21:36.000000000 +0200
++++ xinit/startx.cpp 2007-08-15 14:22:41.000000000 +0200
+@@ -189,7 +189,7 @@
+ dummy=0
+
+ XCOMM create a file with auth information for the server. ':0' is a dummy.
+-xserverauthfile=$HOME/.serverauth.$$
++xserverauthfile=/tmp/.serverauth.$$
+ xauth -q -f $xserverauthfile << EOF
+ add :$dummy . $mcookie
+ EOF
diff --git a/debian/patches/series b/debian/patches/series
index b5ed162..e1db3c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
03_debian_startx_manpage.diff -p1
04_startx_paths.diff -p2
05_use_bash.diff
+06_move_serverauthfile_into_tmp.diff
commit fc6cc81be41af58ffd996994e1325dd072a9ab34
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jul 13 15:34:43 2007 -0700
Use /dev/random to generate the cookie if mcookie is unavailable.
Setting XAUTHORITY without having actually generated a cookie and created
.Xauthority led to issues if somebody like ssh later came around and made the
.Xauthority file for their own setup. So, simply make it so that we never
fail to create one.
diff --git a/startx.cpp b/startx.cpp
index eba83b8..f4e24fd 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -170,7 +170,6 @@ fi
removelist=
-#if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE)
XCOMM set up default Xauth info for this machine
case `uname` in
Linux*)
@@ -186,7 +185,15 @@ Linux*)
esac
authdisplay=${display:-:0}
+#if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE)
mcookie=`MK_COOKIE`
+#else
+mcookie=`dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"`
+if x"$mcookie" = x; then
+ echo "Couldn't create cookie"
+ exit 1
+fi
+#endif
dummy=0
XCOMM create a file with auth information for the server. ':0' is a dummy.
@@ -215,8 +222,6 @@ EOF
fi
done
-#endif
-
#if defined(__SCO__) || defined(__UNIXWARE__)
if [ "$REMOTE_SERVER" = "TRUE" ]; then
exec SHELL_CMD ${client}
commit 52b4ab768b884909b5a07851c54b27d593f98960
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 26 22:23:19 2007 +0100
* Add upstream URL in debian/copyright; thanks, Jörg Jaspert.
diff --git a/debian/changelog b/debian/changelog
index 266243f..4f74ea5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xinit (1.0.4-2) experimental; urgency=low
+
+ * Add upstream URL in debian/copyright; thanks, Jörg Jaspert.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 26 Jun 2007 22:19:34 +0100
+
xinit (1.0.4-1) experimental; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/copyright b/debian/copyright
index 2806eba..5d6d733 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/app/
+
Copyright 1986, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
commit fa88c4e68b791fe5d3bd25ad7a41635df844d80e
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 2 15:42:38 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 2e10406..266243f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xinit (1.0.4-1) UNRELEASED; urgency=low
+xinit (1.0.4-1) experimental; urgency=low
[ Timo Aaltonen ]
* Split xbase-clients, new versioning using the module version.
@@ -21,7 +21,7 @@ xinit (1.0.4-1) UNRELEASED; urgency=low
* Install the upstream changelog.
* Add watch file.
- -- Julien Cristau <jcristau@debian.org> Sat, 02 Jun 2007 15:39:25 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 02 Jun 2007 15:42:01 +0200
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
commit 5d7ef62a16079759158d7c8780a9f07e42b960b4
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 2 15:40:04 2007 +0200
Add/install the upstream changelog; add a watch file.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..b539f85
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,417 @@
+commit e9c1d1667b58c738cb1317219cc0ac84bef2a5d6
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon May 21 20:00:38 2007 -0700
+
+ Version bump: 1.0.4
+
+commit 3686497f31ac9f548f6f3aa5d4418a96fe564497
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon May 21 18:42:56 2007 -0700
+
+ Remove old Imake checks now that we always build with autoconf
+
+commit d5b726c2dbc22b6fd9623604e9252aaef30c387c
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon May 21 18:18:56 2007 -0700
+
+ Remove support for pre-POSIX-1990 platforms
+
+commit dfba9a82068b44429a08b307d26b91495c10c7c1
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon May 21 17:52:38 2007 -0700
+
+ Modernize list of Xservers printed when "X" is not found in $PATH
+
+commit a73284c7aeeab7ee0c1b6027819955ef7b08f23d
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon May 21 17:09:40 2007 -0700
+
+ Replace static ChangeLog with dist hook to generate from git log
+
+commit 8942f1fd8377c0e67e5ad493af55b7d7b3f996c7
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon May 21 16:49:18 2007 -0700
+
+ Don't print windowpath debug messages unless built -DDEBUG
+
+ No need to print warnings on systems without vt support
+
+commit fa78528b44d4c1c50594359e17114208834a84fd
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Fri Aug 25 16:48:00 2006 -0800
+
+ X.Org Bugzilla #8013: xinit should set WINDOWPATH
+
+ X.Org Bugzilla #8013: <https://bugs.freedesktop.org/show_bug.cgi?id=8013>
+ Patch #6701: <https://bugs.freedesktop.org/attachment.cgi?id=6701>
+
+commit 64f1a94404924b1ada6b43ed33c80a560712ec36
+Author: Daniel Drake <ddrake@brontes3d.com>
+Date: Mon May 21 16:33:23 2007 -0700
+
+ Fill in COPYING File (X.Org Bugzilla #11024)
+
+commit 3b6dad2ba4d4507cd742d8e7ff760fe006c0aa23
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri May 18 23:44:06 2007 -0700
+
+ Bug #10616: Clarify syntax on xinit & startx man pages
+
+ X.Org Bugzilla #10616: <https://bugs.freedesktop.org/show_bug.cgi?id=10616>
+ Reported upstream from
+ Debian bug #267744 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=267744>
+
+commit ad23a55a581ab18c4614e2cb5d82c4376ee88722
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Nov 6 14:56:07 2006 -0800
+
+ Stop hardcoding /usr/X11R6/bin in manpage examples
+
+commit c50afd78af7496938a10b317c5e41b4d99d1fc60
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Nov 6 14:47:34 2006 -0800
+
+ Change example X server argument from bc to -br now that bc is gone
+
+commit 7b3e51364355716731670522b578b23d40fb356b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Nov 6 14:46:42 2006 -0800
+
+ Add *~ to .gitignore to skip over emacs/patch droppings
+
+commit c9da362e9f3f80a91b91011c21ef85e1cd3ef48b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Nov 6 14:46:15 2006 -0800
+
+ renamed: .cvsignore -> .gitignore
+
+commit de19be83afe7d0dc9a71fa529e80d91b4e26bdda
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Fri Oct 13 17:53:12 2006 -0400
+
+ Bump to 1.0.3
+
+commit 4fc9d215202b494a9182913f84eb41ba2bd1e39b
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Tue Jun 20 19:25:51 2006 +0000
+
+ Check setuid() return value. Bugzilla #7116.
+
+commit 732e5f17cf5189854654360e978a62d6d6b82d4b
+Author: Jeremy C. Reed <reed@reedmedia.net>
+Date: Sat May 27 15:28:04 2006 +0000
+
+ In comments, change contractions to be spelled out to fix cpp "missing
+ terminating" errors with single quotes.
+
+commit db74ad799da27eec04b5aed64e3564aef9156a04
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sun Apr 30 14:19:19 2006 +0000
+
+ Quote MCOOKIE to allow to specify a command with args (ie
+ MCOOKIE="/usr/sbin/openssl rand -hex 16" ./configure ...)
+
+commit 797f51d176ab9a29497a9141a57a968c5a7d3792
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sun Apr 2 01:06:41 2006 +0000
+
+ Bump to 1.0.2.
+
+commit bbf54921031f679c0d266a6b2ef4926f872d18f1
+Author: Jeremy C. Reed <reed@reedmedia.net>
+Date: Sat Feb 25 15:20:06 2006 +0000
+
+ Bug #4449 <https://bugs.freedesktop.org/show_bug.cgi?id=4449> Be more
+ portable (for different /bin/sh shells) for the arithmetic.
+ NetBSD's /bin/sh didn't like: dummy=$((dummy+1)) and complained: startx:
+ arith: syntax error: "dummy+1"
+ This was fixed by NetBSD and also by Gentoo, see:
+ https://launchpad.net/distros/ubuntu/+source/xinit/+bug/31241
+
+commit 6690352bdd01603a5e82e177aab4804d5424b8b1
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:51 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 9ea919f305201ad9c3695a4534f08d5d373d3eb5
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:22:44 2005 +0000
+
+ Stub COPYING files
+
+commit 0a95c12d2dd1da5a2c2f7ef3a731ef40074fba23
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:07 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 18056e663f89b0b5019f549365afbdf975a59d61
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:22 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit cc7dfc25d5854ac08dfa7dc52c96702e60777e5c
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 17:08:50 2005 +0000
+
+ Add m4 magic to allow AS_HELP_STRING to work with older versions of
+ autoconf 2.57.
+
+commit b0081f30f7d2bdc59509e09b7d147700456d562e
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:24 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 15470956794d19c3b1ee0d17e727e0a77436518f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:01:43 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 66b04609fdf1910588e05f74f772441c712ed0cc
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:35:01 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit d286ee2400f8f9c4110971545ef50a556e5c08f9
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Nov 20 22:08:53 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 0a06386696875638e9e9b6e47e95affbf542e25d
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 15 04:05:59 2005 +0000
+
+ Make the programs used in the xinit scripts configurable.
+
+commit 549c55ea15e60b9aca5da1ed6f18564f1e69cd26
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 15 04:03:10 2005 +0000
+
+ Make using full paths in the xinit scripts optional.
+
+commit 277975ec73744657e556a0c6380614d8684db7df
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Thu Nov 10 04:25:39 2005 +0000
+
+ Add settings for SHELL_CMD & ARCHMANDEFS to match monolith changes for bug
+ #3180.
+ AC_DEFINE(XORG,...) so it is listed as available server in xinit help
+ output.
+ Update cpp -D flags to match monolith changes for bug #3180.
+
+commit 6e7bcf4f2ea8bb868ed8b0459f1c0d6cc172f4ae
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:09:21 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit af47a9e0dd891dcaa52b12f4eda85381e0467916
+Author: Kean Johnson <kean@armory.com>
+Date: Tue Nov 8 06:33:33 2005 +0000
+
+ See ChangeLog entry 2005-11-07 for details.
+
+commit 6beb2e4769b8b3708f30ee7adf8037a4e1f39f3d
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:47:54 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit dc0b907e02d6c1ab917e30c4b262b5c9f780ef12
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 23:56:23 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 0c48fdb05b2538c94c809e25c8690a7094900e07
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sun Oct 16 22:18:22 2005 +0000
+
+ Use cpp to substitute variables in man pages
+
+commit 9c8787d2ce69e55b9ba362a92f01592d8ee0a3a3
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 11 01:09:43 2005 +0000
+
+ Don't define HAS_COOKIE_MAKER if mcookie wasn't found.
+
+commit e2dd25d3cf2f10c0cff0d37d05f58b81344db68b
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Oct 4 01:27:34 2005 +0000
+
+ Bug #2027: Treat SIGTERM like SIGINT in xinit. (Andreas Luik)
+
+commit 48ea043e65943fd66e03788be9867c69b96c738c
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Mon Aug 29 01:56:12 2005 +0000
+
+ Bump to 0.99.1.
+
+commit 9f74cfed8f808009b3acfa0af383218f3bf0fc00
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Mon Aug 29 01:54:30 2005 +0000
+
+ Define HAS_COOKIE_MAKER and search for mcookie so startx will generate
+ xauth tokens for the servers it starts.
+
+commit 52fb36b1ec52e78916bf9cf1a5e7bdce05482b0c
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Thu Aug 11 18:11:32 2005 +0000
+
+ Bugzilla #4045: Do a missed replacement of @@ with \ in startx.
+ Submitted by: David Schleef <ds@schleef.org>
+
+commit ef53714d87aa71309fe2f22862f1892a8e620336
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Thu Aug 11 18:09:45 2005 +0000
+
+ Set CSRG_BASED for BSD systems so the build succeeds.
+
+commit 2b515c0e9940d3fc5b4151d10678f3c0b09668fc
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:34 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 22c07dc931424a64046c489ff95b9ca14d7a5552
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Jul 26 18:58:15 2005 +0000
+
+ Use AC_TYPE_SIGNAL and AC_FUNC_VFORK to replace Imake's SIGNAL_DEFINES and
+ -DHAS_VFORK
+
+commit db7faf36b93971eef4857d24efe0de155b7cdb19
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Jul 26 18:55:42 2005 +0000
+
+ Add config.h includes for modularization Use RETSIGTYPE if defined by
+ autoconf in addition to Imake's SIGNALRETURNSINT. Use
+ HAVE_WORKING_VFORK if defined by autoconf in addition to Imake's
+ HAS_VFORK
+
+commit e5280bb6562129bf7617a24784b19da4cbd7abc8
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 25 23:19:06 2005 +0000
+
+ Bug #3860: Avoid a bashism. (Diego Pettenò)
+
+commit 4c76716e9eef58c7de7dab27bdeca33a2980b726
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sat Jul 23 03:02:58 2005 +0000
+
+ Move manpages to section 1.
+
+commit b5a90f98073bfa5d5615f5aa0ae73af07f625bbb
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Wed Jul 20 22:49:25 2005 +0000
+
+ Use kbd_mode -a to restore console keyboard on Solaris x86 too.
+
+commit e83a8d3f9816605106a496c89f9e9ccfae3e4f4c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Jul 20 19:31:57 2005 +0000
+
+ Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+ configure cache, you cache it, and the cached value is probably wrong.
+
+commit d8980cb7b6df64cf92c5b660f838497296dbb0bb
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sat Jul 16 23:29:38 2005 +0000
+
+ x11perf/Makefile.am: xinit/Makefile.am: xvidtune/Makefile.am:
+ - Replace $< with portable macro xinit/Makefile.am: xinit/configure.ac:
+ xvidtune/Makefile.am: xvidtune/configure.ac:
+ - Use more portable cpp invocations for pre-processing files
+ xfs/configure.ac:
+ - Add XTRANS_CONNECTION_FLAGS so xtrans transport type defines are set
+ correctly
+
+commit d731a249d0c1c7f9eb77828c0d6e79cfdaf75589
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 5 21:12:01 2005 +0000
+
+ Build system for xinit
+
+commit dd7fee44b126636d6c3edd9e325ce411e3ae5d78
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Apr 20 17:54:12 2005 +0000
+
+ Separate server auth and client .Xautority file in startx. .Xautority might
+ have credentials from other Xservers which we might not want to enable
+ on ours Bugzilla #3078).
+
+commit 4118bc8579ac75620ea6cda2b16d3ebbe4f5b6af
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:49 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 52279458e75907cb4d004e8be0c87f1c7b714159
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:35:24 2004 +0000
Reply to: