xorg: Changes to 'ubuntu'
debian/changelog | 7 +++++++
debian/local/Xsession.d/50x11-common_determine-startup | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 885bd907a3c7780f56eea30541d68a7ea1f4232a
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Thu Mar 4 16:25:59 2010 +0200
50x11-common_determine-startup: Fix a typo in the option name (LP: #526532)
diff --git a/debian/changelog b/debian/changelog
index dbead1c..d539a17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.5+1ubuntu12) UNRELEASED; urgency=low
+
+ * 50x11-common_determine-startup: Fix a typo in the option name
+ (LP: #526532)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 04 Mar 2010 16:22:39 +0200
+
xorg (1:7.5+1ubuntu11) lucid; urgency=low
* Reapply changes from 1:7.5+1ubuntu6, which got clobbered by a later
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: