xserver-xorg-input-synaptics: Changes to 'debian-unstable'
debian/66-xorg-synaptics.rules | 16 ++++++++++++++++
debian/changelog | 11 +++++++++++
debian/control | 13 ++++++++++++-
debian/rules | 12 +++++++++---
debian/xserver-xorg-input-synaptics.install | 1 -
5 files changed, 48 insertions(+), 5 deletions(-)
New commits:
commit a6853d951e809abcdee99e3fcabd7f79986bf494
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 02:09:24 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 4f72d90..25cd192 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xserver-xorg-input-synaptics (1.2.0-3) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Install an udev rule instead of an fdi file on linux.
* Build against xserver 1.7.
- -- Julien Cristau <jcristau@debian.org> Thu, 26 Nov 2009 18:55:04 +0100
+ [ Timo Aaltonen ]
+ * Build against Xserver 1.7.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:04 +0200
xserver-xorg-input-synaptics (1.2.0-2) unstable; urgency=low
commit b06702185f768955598f904816af546f6648d6f7
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 2 17:00:31 2009 +0100
Build against xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 370e5ed..4f72d90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-synaptics (1.2.0-3) UNRELEASED; urgency=low
* Install an udev rule instead of an fdi file on linux.
+ * Build against xserver 1.7.
-- Julien Cristau <jcristau@debian.org> Thu, 26 Nov 2009 18:55:04 +0100
diff --git a/debian/control b/debian/control
index 58360d4..84df90d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
libxext-dev,
libxi-dev (>= 2:1.2.0),
x11proto-core-dev,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
pkg-config,
quilt,
automake,
commit 90b1b3bebc6f3a1da3cec2220a12cfd617bb28d8
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 2 16:59:57 2009 +0100
Wrap build-deps in debian/control
diff --git a/debian/control b/debian/control
index a14aa62..58360d4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,18 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Mattia Dongili <malattia@debian.org>
-Build-Depends: debhelper (>= 5.0.0), libx11-dev, libxext-dev, libxi-dev (>= 2:1.2.0), x11proto-core-dev, xserver-xorg-dev (>= 2:1.5.99.901), pkg-config, quilt, automake, libtool, xutils-dev
+Build-Depends:
+ debhelper (>= 5.0.0),
+ libx11-dev,
+ libxext-dev,
+ libxi-dev (>= 2:1.2.0),
+ x11proto-core-dev,
+ xserver-xorg-dev (>= 2:1.5.99.901),
+ pkg-config,
+ quilt,
+ automake,
+ libtool,
+ xutils-dev,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
commit f01b6ccbe59bf4c2246fb65897f48f1a3e4ce63a
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Nov 26 18:57:01 2009 +0100
Install an udev rule instead of an fdi file on Linux
diff --git a/debian/66-xorg-synaptics.rules b/debian/66-xorg-synaptics.rules
new file mode 100644
index 0000000..b3b457f
--- /dev/null
+++ b/debian/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/changelog b/debian/changelog
index ccff423..370e5ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.2.0-3) UNRELEASED; urgency=low
+
+ * Install an udev rule instead of an fdi file on linux.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 26 Nov 2009 18:55:04 +0100
+
xserver-xorg-input-synaptics (1.2.0-2) unstable; urgency=low
[ Mattia Dongili ]
diff --git a/debian/rules b/debian/rules
index 7632c72..5c8cc5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -76,9 +77,6 @@ install: build
dh_installdirs
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
- install -d $(CURDIR)/debian/tmp/usr/share/hal/fdi/policy/20thirdparty
- install -m 0644 fdi/11-x11-synaptics.fdi \
- $(CURDIR)/debian/tmp/usr/share/hal/fdi/policy/20thirdparty
# Build architecture-dependent files here.
binary-arch: build install serverabi
@@ -88,6 +86,14 @@ binary-arch: build install serverabi
dh_installdocs
dh_installchangelogs ChangeLog
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
+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 \
+ debian/xserver-xorg-input-synaptics/usr/share/hal/fdi/policy/20thirdparty
+endif
dh_installman
dh_link
dh_strip
diff --git a/debian/xserver-xorg-input-synaptics.install b/debian/xserver-xorg-input-synaptics.install
index 762fd15..f897163 100644
--- a/debian/xserver-xorg-input-synaptics.install
+++ b/debian/xserver-xorg-input-synaptics.install
@@ -1,3 +1,2 @@
usr/lib/xorg/modules/input/*.so
usr/bin/*
-usr/share/hal/fdi/policy/20thirdparty/*
Reply to: