xorg: Changes to 'debian-unstable'
debian/changelog | 12 ++++++++++--
debian/local/Xsession | 1 +
debian/local/Xsession.5 | 7 +++++++
debian/local/Xsession.d/40x11-common_xsessionrc | 6 ++++++
debian/x11-common.NEWS | 12 ++++++++++++
5 files changed, 36 insertions(+), 2 deletions(-)
New commits:
commit 751aa513804ba924daa9d3773ac08281d922bdb3
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Dec 30 22:48:03 2007 -0500
* Add support for $HOME/.xsessionrc. Closes: #411639
This file, if present, will get sourced during the start of your X
session. This allows you to set session-wide environment variables easily
for things like locale information. Patch adapted from one by Yves-Alexis
Perez. Thanks also to Holger Levsen and Osamu Aoki for advice.
+ Adds 40x11-common_xsessionrc to /etc/X11/Xsession.d
+ Document this in Xsession.5 manpage
+ Add a NEWS.Debian entry about it
diff --git a/debian/changelog b/debian/changelog
index ade1d5c..c2cd2b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,16 @@ xorg (1:7.3+9) UNRELEASED; urgency=low
[ David Nusinow ]
* Don't force fbdev on mac mini ppc any more. The ati driver no longer uses
fbdev, and it has been reported to work on mac minis without it.
-
- -- David Nusinow <dnusinow@debian.org> Sun, 23 Dec 2007 17:05:01 -0500
+ * Add support for $HOME/.xsessionrc. Closes: #411639
+ This file, if present, will get sourced during the start of your X
+ session. This allows you to set session-wide environment variables easily
+ for things like locale information. Patch adapted from one by Yves-Alexis
+ Perez. Thanks also to Holger Levsen and Osamu Aoki for advice.
+ + Adds 40x11-common_xsessionrc to /etc/X11/Xsession.d
+ + Document this in Xsession.5 manpage
+ + Add a NEWS.Debian entry about it
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 30 Dec 2007 22:23:39 -0500
xorg (1:7.3+8) unstable; urgency=low
diff --git a/debian/local/Xsession b/debian/local/Xsession
index e818342..246ee90 100644
--- a/debian/local/Xsession
+++ b/debian/local/Xsession
@@ -74,6 +74,7 @@ USRRESOURCES=$HOME/.Xresources
SYSSESSIONDIR=/etc/X11/Xsession.d
USERXSESSION=$HOME/.xsession
+USERXSESSIONRC=$HOME/.xsessionrc
ALTUSERXSESSION=$HOME/.Xsession
ERRFILE=$HOME/.xsession-errors
diff --git a/debian/local/Xsession.5 b/debian/local/Xsession.5
index a3268b7..16b617e 100644
--- a/debian/local/Xsession.5
+++ b/debian/local/Xsession.5
@@ -186,6 +186,13 @@ the user's
.I $HOME/.Xresources
file is merged in the same way.
.TP
+.I /etc/X11/Xsession.d/40x11\-common_xsessionrc
+Source global environment variables.
+This script will source anything in
+.IR $HOME/.xsessionrc
+if the file is present. This allows the user to set global environment
+variables for their X session, such as locale information.
+.TP
.I /etc/X11/Xsession.d/50x11\-common_determine\-startup
Determine startup program.
The X client to launch as the controlling process (the one that, upon
diff --git a/debian/local/Xsession.d/40x11-common_xsessionrc b/debian/local/Xsession.d/40x11-common_xsessionrc
new file mode 100644
index 0000000..305f363
--- /dev/null
+++ b/debian/local/Xsession.d/40x11-common_xsessionrc
@@ -0,0 +1,6 @@
+# This file is sourced by Xsession(5), not executed.
+
+#Source user defined xsessionrc (locales and other environment variables)
+if [ -r "$USERXSESSIONRC" ]; then
+ . "$USERXSESSIONRC"
+fi
diff --git a/debian/x11-common.NEWS b/debian/x11-common.NEWS
index 13922c4..9b178e3 100644
--- a/debian/x11-common.NEWS
+++ b/debian/x11-common.NEWS
@@ -1,3 +1,15 @@
+x11-common (1:7.3+9) unstable; urgency=low
+
+ * This release provides the ability to set session-wide environment
+ variables easily. If you have the file ".xsessionrc" in your home
+ directory it will be read (sourced) by the X session scripts during
+ login. This allows you to easily set environment variables in this file
+ that apply to all apps. This is most immediately useful for setting
+ locale information. Remember that for most shells you will have to
+ explicitly export the variable for it to take effect in your session.
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 30 Dec 2007 22:14:30 -0500
+
x11-common (1:7.0.11) unstable; urgency=low
* With the change to X11R7, various paths have been changed, including
Reply to: