debian/changelog | 11 +++++++++++
debian/local/Xsession.d/20x11-common_process-args | 10 +++++++++-
debian/local/Xsession.d/30x11-common_xresources | 2 +-
debian/local/Xsession.d/50x11-common_determine-startup | 4 ++--
debian/local/Xsession.d/90x11-common_ssh-agent | 2 +-
5 files changed, 24 insertions(+), 5 deletions(-)
New commits:
commit cb478dc795461cade35129a49daba4091e2ee280
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 2 16:57:13 2010 +0200
Import changes from 1:7.5+1ubuntu11
diff --git a/debian/changelog b/debian/changelog
index 67a74d3..dbead1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg (1:7.5+1ubuntu11) lucid; urgency=low
+
+ * Reapply changes from 1:7.5+1ubuntu6, which got clobbered by a later
+ upload:
+ - Introduce an Xsession.d function has_option() to simplify option
+ checking. (LP: #530675)
+ - Fix $OPTIONFILE parsing to only match keywords on the beginning of
+ lines.
+
+ -- Martin Pitt <martin.p...@ubuntu.com> Tue, 02 Mar 2010 15:42:08 +0100
+
xorg (1:7.5+1ubuntu10) lucid; urgency=low
* debian/apport/source_xorg.py
diff --git a/debian/local/Xsession.d/20x11-common_process-args
b/debian/local/Xsession.d/20x11-common_process-args
index 7395c15..149d1d2 100644
--- a/debian/local/Xsession.d/20x11-common_process-args
+++ b/debian/local/Xsession.d/20x11-common_process-args
@@ -5,6 +5,14 @@
# read OPTIONFILE
OPTIONS=$(cat "$OPTIONFILE") || true
+has_option() {
+ if [ "${OPTIONS#*
+$1}" != "$OPTIONS" ]; then
+ return 0
+ else
+ return 1
+ fi
+}
# Determine how many arguments were provided.
case $# in
@@ -16,7 +24,7 @@ case $# in
case "$1" in
failsafe)
# Failsafe session was requested.
- if [ "${OPTIONS#*allow-failsafe}" != "$OPTIONS" ]; then
+ if has_option allow-failsafe; then
if [ -e /usr/bin/x-terminal-emulator ]; then
if [ -x /usr/bin/x-terminal-emulator ]; then
exec x-terminal-emulator -geometry +1+1
diff --git a/debian/local/Xsession.d/30x11-common_xresources
b/debian/local/Xsession.d/30x11-common_xresources
index 9f39de9..c3f53a8 100644
--- a/debian/local/Xsession.d/30x11-common_xresources
+++ b/debian/local/Xsession.d/30x11-common_xresources
@@ -13,7 +13,7 @@ if [ -d "$SYSRESOURCES" ] && type xrdb >/dev/null 2>&1; then
fi
fi
-if [ "${OPTIONS#*allow-user-resources}" != "$OPTIONS" ] && [ -f
"$USRRESOURCES" ]; then
+if has_option allow-user-resources && [ -f "$USRRESOURCES" ]; then
if type xrdb >/dev/null 2>&1; then
xrdb -merge $USRRESOURCES
else
diff --git a/debian/local/Xsession.d/50x11-common_determine-startup
b/debian/local/Xsession.d/50x11-common_determine-startup
index e2479fd..4ed7a32 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 [ "${OPTIONS#*allow-user-session}" != "$OPTIONS" ]; then
+ if has_option allow-user-session; 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 [ "${OPTIONS#*allow-user-session}" != "$OPTIONS" ]; then
+ if has_option allow-user-session; then
ERRMSG="$ERRMSG no \"$USERXSESSION\" file, no \"$ALTUSERXSESSION\" file,"
fi
errormsg "$ERRMSG no session managers, no window managers, and no terminal" \
diff --git a/debian/local/Xsession.d/90x11-common_ssh-agent
b/debian/local/Xsession.d/90x11-common_ssh-agent
index bc9b2a0..5397434 100644
--- a/debian/local/Xsession.d/90x11-common_ssh-agent
+++ b/debian/local/Xsession.d/90x11-common_ssh-agent
@@ -6,7 +6,7 @@ STARTSSH=
SSHAGENT=/usr/bin/ssh-agent
SSHAGENTARGS=
-if [ "${OPTIONS#*use-ssh-agent}" != "$OPTIONS" ]; then
+if has_option use-ssh-agent; then
if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \
&& [ -z "$SSH2_AUTH_SOCK" ]; then
STARTSSH=yes
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nmtxv-0004jp...@alioth.debian.org
