From: Michael Prokop <mika@grml.org>
Date: Thu, 6 Dec 2007 22:35:17 +0000 (+0100)
Subject: Replace EmulateMiddleButtonTime with EmulateMidButtonTime; symlink check
X-Git-Tag: 0.3.37~2
X-Git-Url: http://git.grml.org/?p=grml-x.git;a=commitdiff_plain;h=0cad33639c16146cf494e96cdb4efca1b170d2df

Replace EmulateMiddleButtonTime with EmulateMidButtonTime; symlink check
---

diff --git a/debian/changelog b/debian/changelog
index b361d13..d60d1ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ grml-x (0.3.37) unstable; urgency=low
 
   * Replace EmulateMiddleButtonTime with EmulateMidButtonTime.
     Thanks, Jerome Potts!
+  * Make sure /etc/X11/X is not a symlink to /bin/true (broken
+    Debian package/upgrade).
 
  -- Michael Prokop <mika@grml.org>  Sun, 18 Nov 2007 23:51:43 +0100
 
diff --git a/grml-x b/grml-x
index cb4c1fc..62d2c5a 100755
--- a/grml-x
+++ b/grml-x
@@ -352,7 +352,7 @@ Section \"InputDevice\"
   Option        \"MaxSpeed\"      \"2.00\"
   Option        \"AccelFactor\" \"0.030\"
   Option        \"UpDownScrolling\" \"1\"
-  Option        \"EmulateMidButtonTime\" \"75\"
+  Option        \"EmulateMiddleButtonTime\" \"75\"
   Option        \"CircularScrolling\" \"1\"
   Option        \"CircScrollDelta\" \"0.1\"
   Option        \"CircScrollTrigger\" \"8\"
@@ -893,6 +893,11 @@ $fg[red]"
 function runit
 {
   writeconfig
+  if [ "$(readlink /etc/X11/X)" = /bin/true ] ; then
+     print "$bold_color$fg[red]Fatal: /etc/X11/X is a symlink to /bin/true."
+     print "Fix it via running 'ln -sf /usr/bin/Xorg /etc/X11/X'"
+     exit 10
+  fi
   if [ -z "$NOSTART" ] ; then
     print "$reset_color"
     if [ -x /etc/init.d/xorg-common ] ; then