[Lunar-commits] <moonbase> xf86-input-synaptics: /etc/X11 is for user custom config - do not install there system files

[Zbigniew Luszpinski]

commit 3f7408970c057167d9408abf9d670645a1fe55be
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat Mar 17 14:16:15 2012 +0100

    xf86-input-synaptics: /etc/X11 is for user custom config - do not install there system files
---
 .../driver/xf86-input-synaptics/10-synaptics.conf  |    9 -------
 .../driver/xf86-input-synaptics/50-synaptics.conf  |   26 ++++++++++++++++++++
 xorg7/driver/xf86-input-synaptics/BUILD            |    7 ++----
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/xorg7/driver/xf86-input-synaptics/10-synaptics.conf b/xorg7/driver/xf86-input-synaptics/10-synaptics.conf
deleted file mode 100644
index 81a90fb..0000000
--- a/xorg7/driver/xf86-input-synaptics/10-synaptics.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Section "InputClass"
-        Identifier "touchpad catchall"
-        Driver "synaptics"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Option "TapButton1" "1"
-        Option "TapButton2" "2"
-        Option "TapButton3" "3"
-EndSection
diff --git a/xorg7/driver/xf86-input-synaptics/50-synaptics.conf b/xorg7/driver/xf86-input-synaptics/50-synaptics.conf
new file mode 100644
index 0000000..0faa29a
--- /dev/null
+++ b/xorg7/driver/xf86-input-synaptics/50-synaptics.conf
@@ -0,0 +1,26 @@
+# xorg.conf.d snippet that assigns the touchpad driver
+# to all touchpads. See xorg.conf.d(5) for more information on
+# InputClass.
+# DO NOT EDIT THIS FILE, your distribution will likely overwrite
+# it when updating. Copy (and rename) this file into
+# /etc/X11/xorg.conf.d first.
+# Additional options may be added in the form of
+#   Option "OptionName" "value"
+#
+Section "InputClass"
+        Identifier "touchpad catchall"
+        Driver "synaptics"
+        MatchIsTouchpad "on"
+        MatchDevicePath "/dev/input/event*"
+        Option "TapButton1" "1"
+        Option "TapButton2" "2"
+        Option "TapButton3" "3"
+EndSection
+
+Section "InputClass"
+        Identifier "touchpad ignore duplicates"
+        MatchIsTouchpad "on"
+        MatchOS "Linux"
+        MatchDevicePath "/dev/input/mouse*"
+        Option "Ignore" "on"
+EndSection
diff --git a/xorg7/driver/xf86-input-synaptics/BUILD b/xorg7/driver/xf86-input-synaptics/BUILD
index db01394..4bf917e 100644
--- a/xorg7/driver/xf86-input-synaptics/BUILD
+++ b/xorg7/driver/xf86-input-synaptics/BUILD
@@ -1,15 +1,12 @@
 (
   . /etc/profile.d/x11r7.rc  &&
-
+  install -m644 $SCRIPT_DIRECTORY/50-synaptics.conf conf  &&
   patch_it $SOURCE_CACHE/$SOURCE2 1  &&
 
   OPTS+=" --disable-unit-tests"
   default_build  &&
 
   mkdir -p /usr/share/hal/fdi/policy/10osvendor  &&
-  cp conf/11-x11-synaptics.fdi /usr/share/hal/fdi/policy/10osvendor/  &&
-
-  mkdir -p /etc/X11/xorg.conf.d  &&
-  install -m644 $SCRIPT_DIRECTORY/10-synaptics.conf /etc/X11/xorg.conf.d/
+  cp conf/11-x11-synaptics.fdi /usr/share/hal/fdi/policy/10osvendor/
 
 ) > $C_FIFO 2>&1