From 76156920cee74e314a2ac2f244598a26b07a89da Mon Sep 17 00:00:00 2001
From: Kai Hendry <hendry@iki.fi>
Date: Mon, 26 Jan 2009 19:57:54 +0100
Subject: [PATCH] simpler

---
 debian/changelog                |   14 ++++++++++++++
 scripts/live-bottom/21xvidemode |    4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 scripts/live-bottom/21xvidemode

diff --git a/debian/changelog b/debian/changelog
index bfbaf59..1fcb2a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+live-initramfs (1.154.5-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Try again
+
+ -- Kai Hendry <hendry@webconverger.com>  Sun, 25 Jan 2009 21:44:16 +0100
+
+live-initramfs (1.154.5-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Trying Jordi's patch
+
+ -- Kai Hendry <hendry@iki.fi>  Sun, 25 Jan 2009 19:43:00 +0100
+
 live-initramfs (1.154.5-1) unstable; urgency=low
 
   * Also checking for wicd in 23networking, thanks to Ben Armstrong
diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
old mode 100644
new mode 100755
index 6f27c85..aad0569
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -22,14 +22,14 @@ esac
 
 # live-initramfs script
 
-if [ "${XAUTOCONFIG}" != "Yes" ]
+if [ -n "${NOXAUTOCONFIG}" ]
 then
 	exit 0
 fi
 
 log_begin_msg "Configuring X kludges..."
 
-if [ -n "${XVIDEOMODE}" -o -n "${XDPI}" ]
+if [ -n "${XVIDEOMODE}" ]
 then
 	echo "# X session startup script: /etc/X11/Xsession.d/55xvideomode
 if which xrandr; then xrandr ${XVIDEOMODE:+"-s"} ${XVIDEOMODE} || /bin/true; fi
-- 
1.5.6.5

