debian/changelog | 5 +++++
debian/local/Xsession.5 | 24 ++++++++++++------------
debian/local/Xwrapper.config.5 | 2 +-
debian/local/xserver-wrapper.c | 4 ++++
4 files changed, 22 insertions(+), 13 deletions(-)
New commits:
commit 4cc436fba0ae99f06727f46e297b6c27940fa49c
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 31 16:04:59 2009 +0100
Document recent changes in the xserver wrapper's changelog
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 760f8eb..fab4072 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -70,6 +70,10 @@
* messages at build and run time to allow the user to know
* what failed on unsupported systems
* (30 Mar 2007)
+ * Brice Goglin: drop privileges on alternate config file given with
+ * -xf86config (14 Jun 2007)
+ * Loïc Minier: on Linux, also consider alternate tty devices (major 5 and
+ * minor < 64) as consoles (24 Sep 2008)
*
* This is free software; you may redistribute it and/or modify
* it under the terms of the GNU General Public License as
commit b1ca99f3f438bd4ed7640fc557cca24b9335af23
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 31 15:51:32 2009 +0100
Xwrapper.config(5): X is installed as /usr/bin/X, not /usr/bin/X11R6/X.
diff --git a/debian/changelog b/debian/changelog
index 15c12ad..f565e9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
[ Julien Cristau ]
* Xsession(5): fix the manpage references.
+ * Xwrapper.config(5): X is installed as /usr/bin/X, not /usr/bin/X11R6/X.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 23 Jan 2009 14:53:45 +0200
diff --git a/debian/local/Xwrapper.config.5 b/debian/local/Xwrapper.config.5
index 4d0abf5..63fad32 100644
--- a/debian/local/Xwrapper.config.5
+++ b/debian/local/Xwrapper.config.5
@@ -22,7 +22,7 @@ Xwrapper.config \- configuration options for X server wrapper
.I /etc/X11/Xwrapper.config
contains a set of flags that determine some of the behavior of Debian's X
server wrapper, which is installed on the system as
-.IR /usr/X11R6/bin/X .
+.IR /usr/bin/X .
The purpose of the wrapper, and of this configuration file, is twofold.
.PP
Firstly, it is intended to implement sound security practices.
commit f3811b8cf416ff86b24af79655c782d5efe1aace
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 31 15:48:47 2009 +0100
Xsession(5): fix the manpage references.
diff --git a/debian/changelog b/debian/changelog
index db65547..15c12ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xorg (1:7.4~6) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* scripts/vars.sparc: Remove sunbw2 from video-all, since monochrome
support has been deleted from xserver 1.6.
* scripts/vars.*: Drop mouse & kbd from input-all except for non-Linux
@@ -7,6 +8,9 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
* scripts/vars, rules: Remove scripts/vars, hasn't been used since
it was split.
+ [ Julien Cristau ]
+ * Xsession(5): fix the manpage references.
+
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 23 Jan 2009 14:53:45 +0200
xorg (1:7.4~5) experimental; urgency=low
diff --git a/debian/local/Xsession.5 b/debian/local/Xsession.5
index 16b617e..74d6911 100644
--- a/debian/local/Xsession.5
+++ b/debian/local/Xsession.5
@@ -29,9 +29,9 @@ is a Bourne shell
.RB ( sh (1))
script which is run when an X Window System
session is begun by
-.BR startx (1x)
+.BR startx (1)
or a display manager such as
-.BR xdm (1x).
+.BR xdm (1).
(Some display managers only invoke
.I Xsession
when specifically directed to so by the user; see the documentation for
@@ -48,7 +48,7 @@ needs to run in a special environment associated with X server
initialization.
.BR startx ,
.BR xdm ,
-.BR xinit (1x),
+.BR xinit (1),
and other similar programs handle this.
.PP
By default on a Debian system,
@@ -265,7 +265,7 @@ by
Here is an example of how one might write a script, named
.IR 40custom_load\-xmodmap ,
to invoke
-.BR xmodmap (1x):
+.BR xmodmap (1):
.PP
.nf
SYSMODMAP="/etc/X11/Xmodmap"
@@ -302,7 +302,7 @@ sent to standard error.
If the
.I DISPLAY
environment variable is set and the
-.BR xmessage (1x)
+.BR xmessage (1)
program is available,
.B xmessage
is also used to display the message.
@@ -377,7 +377,7 @@ should be used instead.
.TP
.I $HOME/.xsession
is a sequence of commands invoking X clients (or a session manager such as
-.BR xsm (1x)).
+.BR xsm (1)).
See the manual page for
.B xinit
for tips on writing an
@@ -402,14 +402,14 @@ session handling scripts.
Branden Robinson wrote this manual page.
.SH "SEE ALSO"
.BR Xsession.options (5),
-.BR X (7x),
+.BR X (7),
.BR run\-parts (1),
.BR ssh\-agent (1),
-.BR startx (1x),
+.BR startx (1),
.BR tempfile (1),
-.BR xdm (1x),
-.BR xmessage (1x),
-.BR xmodmap (1x),
-.BR xrdb (1x),
+.BR xdm (1),
+.BR xmessage (1),
+.BR xmodmap (1),
+.BR xrdb (1),
.BR sh (1)
.\" vim:set et tw=80:
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
