debian/66-xorg-synaptics.rules | 16 ----------------
debian/changelog | 2 ++
debian/local/10-synaptics.conf | 5 +++++
debian/local/66-xorg-synaptics.rules | 10 ++++++++++
debian/rules | 4 +++-
5 files changed, 20 insertions(+), 17 deletions(-)
New commits:
commit 846c0208b6d10d837663bc703453f4478cdedf5e
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 16:57:22 2010 +0300
Drop Ubuntu specific quirks from the udev rules, add a placeholder.
diff --git a/debian/changelog b/debian/changelog
index 808ad2d..1948a44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-input-synaptics (1.2.2-1) UNRELEASED; urgency=low
(LP: #340340)
* Run udevadm trigger on postinst, and depend on udev [linux-any].
* Add 10-synaptics.conf.
+ * Drop Ubuntu specific quirks from the udev rules, add a placeholder.
[ Julien Cristau ]
* Add hurd-i386 to the Architecture field. Requested by Samuel Thibault.
diff --git a/debian/local/66-xorg-synaptics.rules
b/debian/local/66-xorg-synaptics.rules
index b3b457f..f4d5069 100644
--- a/debian/local/66-xorg-synaptics.rules
+++ b/debian/local/66-xorg-synaptics.rules
@@ -3,14 +3,8 @@ KERNEL!="event*", GOTO="xorg_synaptics_end"
ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="xorg_synaptics_end"
-ENV{x11_driver}="synaptics"
+# Placeholder for platform specific quirks needing
+# ID_INPUT.tags to be set.
-# model specific quirks
-ATTR{[dmi/id]product_name}=="Inspiron 1011|Inspiron 1012", \
- ENV{x11_options.JumpyCursorThreshold}="90", \
- ENV{x11_options.AreaBottomEdge}="4100"
-
-ATTR{[dmi/id]product_name}=="HP MiniNote 1000", \
- ENV{x11_options.JumpyCursorThreshold}="20"
LABEL="xorg_synaptics_end"
commit b7e39fd17074c1818c3a5c15fe64b1af95a2c389
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 15:32:38 2010 +0300
Add 10-synaptics.conf.
diff --git a/debian/changelog b/debian/changelog
index 91e57ab..808ad2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-input-synaptics (1.2.2-1) UNRELEASED; urgency=low
* Add xserver-xorg-input-synaptics-dev for the header and .pc files.
(LP: #340340)
* Run udevadm trigger on postinst, and depend on udev [linux-any].
+ * Add 10-synaptics.conf.
[ Julien Cristau ]
* Add hurd-i386 to the Architecture field. Requested by Samuel Thibault.
diff --git a/debian/local/10-synaptics.conf b/debian/local/10-synaptics.conf
new file mode 100644
index 0000000..f1badee
--- /dev/null
+++ b/debian/local/10-synaptics.conf
@@ -0,0 +1,5 @@
+Section "InputClass"
+ Identifier "touchpad catchall"
+ MatchIsTouchpad "on"
+ Driver "synaptics"
+EndSection
diff --git a/debian/rules b/debian/rules
index 72f148e..6e5b476 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,6 +90,8 @@ binary-arch: build install serverabi
ifeq ($(DEB_HOST_ARCH_OS), linux)
install -d debian/xserver-xorg-input-synaptics/lib/udev/rules.d
install -m 644 debian/local/66-xorg-synaptics.rules
debian/xserver-xorg-input-synaptics/lib/udev/rules.d
+ install -d debian/xserver-xorg-input-synaptics/usr/lib/X11/xorg.conf.d
+ install -m 644 debian/local/10-synaptics.conf
debian/xserver-xorg-input-synaptics/usr/lib/X11/xorg.conf.d
else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
install -d
debian/xserver-xorg-input-synaptics/usr/share/hal/fdi/policy/20thirdparty
install -m 0644 fdi/11-x11-synaptics.fdi \
commit 62b51f5f5ba86f62b3fe13cb36ab2a744bec597b
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 15:19:08 2010 +0300
Move udev rules to debian/local
diff --git a/debian/66-xorg-synaptics.rules b/debian/66-xorg-synaptics.rules
deleted file mode 100644
index b3b457f..0000000
--- a/debian/66-xorg-synaptics.rules
+++ /dev/null
@@ -1,16 +0,0 @@
-ACTION!="add|change", GOTO="xorg_synaptics_end"
-KERNEL!="event*", GOTO="xorg_synaptics_end"
-
-ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="xorg_synaptics_end"
-
-ENV{x11_driver}="synaptics"
-
-# model specific quirks
-ATTR{[dmi/id]product_name}=="Inspiron 1011|Inspiron 1012", \
- ENV{x11_options.JumpyCursorThreshold}="90", \
- ENV{x11_options.AreaBottomEdge}="4100"
-
-ATTR{[dmi/id]product_name}=="HP MiniNote 1000", \
- ENV{x11_options.JumpyCursorThreshold}="20"
-
-LABEL="xorg_synaptics_end"
diff --git a/debian/local/66-xorg-synaptics.rules
b/debian/local/66-xorg-synaptics.rules
new file mode 100644
index 0000000..b3b457f
--- /dev/null
+++ b/debian/local/66-xorg-synaptics.rules
@@ -0,0 +1,16 @@
+ACTION!="add|change", GOTO="xorg_synaptics_end"
+KERNEL!="event*", GOTO="xorg_synaptics_end"
+
+ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="xorg_synaptics_end"
+
+ENV{x11_driver}="synaptics"
+
+# model specific quirks
+ATTR{[dmi/id]product_name}=="Inspiron 1011|Inspiron 1012", \
+ ENV{x11_options.JumpyCursorThreshold}="90", \
+ ENV{x11_options.AreaBottomEdge}="4100"
+
+ATTR{[dmi/id]product_name}=="HP MiniNote 1000", \
+ ENV{x11_options.JumpyCursorThreshold}="20"
+
+LABEL="xorg_synaptics_end"
diff --git a/debian/rules b/debian/rules
index 37ad494..72f148e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,7 +89,7 @@ binary-arch: build install serverabi
dh_install --sourcedir=debian/tmp --list-missing
--exclude=synaptics_drv.la --exclude=usr/share/man
ifeq ($(DEB_HOST_ARCH_OS), linux)
install -d debian/xserver-xorg-input-synaptics/lib/udev/rules.d
- install -m 644 debian/66-xorg-synaptics.rules
debian/xserver-xorg-input-synaptics/lib/udev/rules.d
+ install -m 644 debian/local/66-xorg-synaptics.rules
debian/xserver-xorg-input-synaptics/lib/udev/rules.d
else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
install -d
debian/xserver-xorg-input-synaptics/usr/share/hal/fdi/policy/20thirdparty
install -m 0644 fdi/11-x11-synaptics.fdi \
--
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/e1nwc3o-0002gu...@alioth.debian.org
