xserver-xorg-input-synaptics: Changes to 'ubuntu'
debian/changelog | 4 ++--
debian/local/66-xorg-synaptics-quirks.rules | 13 +++++++++++++
debian/rules | 2 --
debian/xserver-xorg-input-synaptics.install | 2 ++
4 files changed, 17 insertions(+), 4 deletions(-)
New commits:
commit e7a59e791a2d3a7e908385c4b9878a1872b2efdc
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Sep 29 21:40:45 2011 +0300
Add the udev rules file back (renamed)
And move the installation to x-x-i-s.install, since ubuntu only supports
Linux anyway.
diff --git a/debian/changelog b/debian/changelog
index 2e0e4bd..520ec6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
xserver-xorg-input-synaptics (1.4.1-1ubuntu2) UNRELEASED; urgency=low
- * rules: Really install the quirks file, and migrate to using
- MatchProduct on it.
+ * Really install the quirks files, and rename the udev rules file
+ to emphasize that it's about quirks.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 29 Sep 2011 20:59:07 +0300
diff --git a/debian/local/66-xorg-synaptics-quirks.rules b/debian/local/66-xorg-synaptics-quirks.rules
new file mode 100644
index 0000000..d3af3c4
--- /dev/null
+++ b/debian/local/66-xorg-synaptics-quirks.rules
@@ -0,0 +1,13 @@
+ACTION!="add|change", GOTO="xorg_synaptics_quirks_end"
+KERNEL!="event*", GOTO="xorg_synaptics_quirks_end"
+
+ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="xorg_synaptics_quirks_end"
+
+# Placeholder for platform specific quirks needing
+# ID_INPUT.tags to be set.
+ATTR{[dmi/id]product_name}=="Inspiron 1011", ENV{ID_INPUT.tags}="inspiron_1011"
+ATTR{[dmi/id]product_name}=="Inspiron 1012", ENV{ID_INPUT.tags}="inspiron_1012"
+ATTR{[dmi/id]product_name}=="Inspiron 1120", ENV{ID_INPUT.tags}="inspiron_1120"
+ATTR{[dmi/id]product_name}=="HP MiniNote 1000", ENV{ID_INPUT.tags}="mininote_1000"
+
+LABEL="xorg_synaptics_quirks_end"
diff --git a/debian/rules b/debian/rules
index d530761..3d192dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,6 @@ override_dh_auto_install:
override_dh_install:
find debian/tmp -name '*.la' -delete
dh_install --fail-missing
- install -d debian/xserver-xorg-input-synaptics/usr/share/X11/xorg.conf.d
- install -m 644 debian/local/51-synaptics-quirks.conf debian/xserver-xorg-input-synaptics/usr/share/X11/xorg.conf.d
# That's a plugin, use appropriate warning level:
override_dh_shlibdeps:
diff --git a/debian/xserver-xorg-input-synaptics.install b/debian/xserver-xorg-input-synaptics.install
index 0835787..9e72614 100644
--- a/debian/xserver-xorg-input-synaptics.install
+++ b/debian/xserver-xorg-input-synaptics.install
@@ -2,3 +2,5 @@ usr/lib/xorg/modules/input/*.so
usr/bin/*
usr/share/man
usr/share/X11
+debian/local/51-synaptics-quirks.conf usr/share/X11/xorg.conf.d
+debian/local/66-xorg-synaptics-quirks.rules lib/udev/rules.d
Reply to: