xorg: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/local/Xsession.d/50x11-common_determine-startup | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 094b3111bf3374dca6f364dd213941b79d91800b
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 14 22:43:46 2010 +0100
Fix typo in Xsession.d/50x11-common_determine-startup
diff --git a/debian/changelog b/debian/changelog
index 7a58436..59e409d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+5) UNRELEASED; urgency=low
+
+ * Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899.
+
+ -- Brice Goglin <bgoglin@debian.org> Sun, 14 Mar 2010 22:41:20 +0100
+
xorg (1:7.5+4) unstable; urgency=low
* Add Xreset and Xreset.d support, closes: #230422.
diff --git a/debian/local/Xsession.d/50x11-common_determine-startup b/debian/local/Xsession.d/50x11-common_determine-startup
index 4ed7a32..cd9e4d3 100644
--- a/debian/local/Xsession.d/50x11-common_determine-startup
+++ b/debian/local/Xsession.d/50x11-common_determine-startup
@@ -7,7 +7,7 @@
# executable, fall back to looking for a user's custom X session script, if
# allowed by the options file.
if [ -z "$STARTUP" ]; then
- if has_option allow-user-session; then
+ if has_option allow-user-xsession; then
for STARTUPFILE in "$USERXSESSION" "$ALTUSERXSESSION"; do
if [ -e "$STARTUPFILE" ]; then
if [ -x "$STARTUPFILE" ]; then
@@ -36,7 +36,7 @@ fi
# If we still have not found a startup program, give up.
if [ -z "$STARTUP" ]; then
ERRMSG="unable to start X session ---"
- if has_option allow-user-session; then
+ if has_option allow-user-xsession; then
ERRMSG="$ERRMSG no \"$USERXSESSION\" file, no \"$ALTUSERXSESSION\" file,"
fi
errormsg "$ERRMSG no session managers, no window managers, and no terminal" \
Reply to: