xorg: Changes to 'ubuntu'

[Timo Aaltonen <tjaalton-guest@alioth.debian.org>]

 debian/changelog                      |    8 ++++++++
 debian/local/Failsafe/failsafeXServer |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 3f3edd7c943b88976cfb196f20f3cc07cacc98e7
Author: Basilio Kublik <sourcercito@gmail.com>
Date:   Sat Jan 5 10:12:27 2008 +0200

    failsafeXServer: Add quotation marks to serverargs variable.

diff --git a/debian/changelog b/debian/changelog
index b6c4238..542afcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.3+9ubuntu2) hardy; urgency=low
+
+  [ Basilio Kublik ]
+  * failsafeXServer: Add quotation marks to serverargs variable
+    (LP: #151388).
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Sat, 05 Jan 2008 10:06:24 +0200
+
 xorg (1:7.3+9ubuntu1) hardy; urgency=low
 
   * Merge with Debian unstable, remaining changes:
diff --git a/debian/local/Failsafe/failsafeXServer b/debian/local/Failsafe/failsafeXServer
index ce82634..c7dae3e 100755
--- a/debian/local/Failsafe/failsafeXServer
+++ b/debian/local/Failsafe/failsafeXServer
@@ -44,7 +44,7 @@ failsafe_log=${BPX_LOG:-"/var/log/gdm/failsafe.log"}
 
 server=${BPX_SERVER:-/usr/bin/X}
 serverargs=${BPX_SERVERARGS:-"$*"}
-if [ -z $serverargs ]; then
+if [ -z "$serverargs" ]; then
     # Use :10 to avoid overwriting the (failed) Xorg.0.log
     serverargs=":10"
 fi