xorg: Changes to 'debian-unstable'
debian/changelog | 6 +++++-
debian/local/Xsession.5 | 6 +++---
debian/local/Xsession.options.5 | 8 +++++++-
3 files changed, 15 insertions(+), 5 deletions(-)
New commits:
commit 40573dbb41fc3e016522d9cf706b709b578caeff
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue May 15 01:26:04 2007 +0200
Add documentation for use-session-dbus in Xsession.options(5).
diff --git a/debian/changelog b/debian/changelog
index d8fde97..e70e4a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,12 +12,14 @@ xorg (1:7.2-4) UNRELEASED; urgency=low
manpage. Thanks Mikhail Gusarov (closes: #405739).
* Replace references to .Xsession with .xsession in Xsession(5) and
Xsession.options(5) manpages. Thanks Reuben Thomas (closes: #365430).
+ * Add documentation for use-session-dbus in Xsession.options(5), based on
+ 75dbus_dbus-launch header in the dbus package, closes: #322284.
[ Timo Aaltonen ]
* Xsession.d/*: change 'which' -> '/usr/bin/which', since the zsh builtin
command can in some circumstances make the login fail.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 15 May 2007 01:14:28 +0200
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 15 May 2007 01:24:23 +0200
xorg (1:7.2-3) unstable; urgency=low
diff --git a/debian/local/Xsession.options.5 b/debian/local/Xsession.options.5
index eb0d21e..1d672ee 100644
--- a/debian/local/Xsession.options.5
+++ b/debian/local/Xsession.options.5
@@ -68,6 +68,12 @@ If the file is present but not executable, it may still be used, but is
assumed to be a Bourne shell script, and executed with
.BR sh (1).
.TP
+.B use-session-dbus
+If the
+.BR dbus
+package is installed, the session bus will be activated at X session
+launch.
+.TP
.B use\-ssh\-agent
If the
.BR ssh\-agent (1)
commit 3aea3c5cdd969febcecb391c05b2e53735c93590
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue May 15 01:14:54 2007 +0200
Replace references to .Xsession with .xsession in Xsession(5) and Xsession.options(5)
diff --git a/debian/changelog b/debian/changelog
index 57b955b..d8fde97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,12 +10,14 @@ xorg (1:7.2-4) UNRELEASED; urgency=low
* Make xephem conflict versioned as <= 3.4-5 (closes: #419533).
* Replace references to xserver-common with x11-common in Xwrapper.config(5)
manpage. Thanks Mikhail Gusarov (closes: #405739).
+ * Replace references to .Xsession with .xsession in Xsession(5) and
+ Xsession.options(5) manpages. Thanks Reuben Thomas (closes: #365430).
[ Timo Aaltonen ]
* Xsession.d/*: change 'which' -> '/usr/bin/which', since the zsh builtin
command can in some circumstances make the login fail.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 15 May 2007 00:53:27 +0200
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 15 May 2007 01:14:28 +0200
xorg (1:7.2-3) unstable; urgency=low
diff --git a/debian/local/Xsession.5 b/debian/local/Xsession.5
index 8f18986..6ebc225 100644
--- a/debian/local/Xsession.5
+++ b/debian/local/Xsession.5
@@ -117,7 +117,7 @@ This argument is ignored if there is no \(oqallow\-user\-xsession\(cq line
in
.IR Xsession.options .
(If the administrator does not want users writing their own
-.I .Xsession
+.I .xsession
files, it makes little sense to permit them to specify the names of
arbitrary programs to run.)
.SS "DEFAULT STARTUP PROCEDURE"
@@ -360,7 +360,7 @@ It has been deprecated for over ten years at the time of this writing.
.I .Xresources
should be used instead.
.TP
-.I $HOME/.Xsession
+.I $HOME/.xsession
is a sequence of commands invoking X clients (or a session manager such as
.BR xsm (1x)).
See the manual page for
@@ -368,7 +368,7 @@ See the manual page for
and/or
.I /usr/share/doc/x11\-common/examples/xsession
for tips on writing an
-.I .Xsession
+.I .xsession
file.
.SH "OUTPUT FILES"
.TP
diff --git a/debian/local/Xsession.options.5 b/debian/local/Xsession.options.5
index 0625db1..eb0d21e 100644
--- a/debian/local/Xsession.options.5
+++ b/debian/local/Xsession.options.5
@@ -60,7 +60,7 @@ X resources when they log in.
.TP
.B allow\-user\-xsession
If users have an executable file called
-.I .Xsession
+.I .xsession
in their home directories, it can be used as the startup program for the X
session (see
.BR Xsession (5)).
Reply to: