debian/changelog | 8 ++++ debian/patches/102-magic-mouse.patch | 65 +++++++++++++++++++++++++++++++++++ debian/patches/series | 1 3 files changed, 74 insertions(+)
New commits: commit d21f83610790469d7eee930ac0e23fa901dc3528 Author: Bryce Harrington <br...@bryceharrington.org> Date: Wed Sep 15 16:17:04 2010 -0700 Patch from cnd to enable multitouch support for Magic Trackpad diff --git a/debian/changelog b/debian/changelog index 225c61f..8b52298 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-input-evdev (1:2.3.2-6ubuntu2) maverick; urgency=low + + * Add 102-magic-mouse.patch - Patch from Chase Douglas to set default + input module to evdev for Apple Magic Mouse + (LP: #637430) + + -- Bryce Harrington <br...@ubuntu.com> Wed, 15 Sep 2010 16:13:54 -0700 + xserver-xorg-input-evdev (1:2.3.2-6ubuntu1) maverick; urgency=low * Add gesture support diff --git a/debian/patches/102-magic-mouse.patch b/debian/patches/102-magic-mouse.patch new file mode 100644 index 0000000..b7e207e --- /dev/null +++ b/debian/patches/102-magic-mouse.patch @@ -0,0 +1,65 @@ +From 90fb6f288d32f033bd8355d317c5580b1c836775 Mon Sep 17 00:00:00 2001 +From: Chase Douglas <chase.doug...@canonical.com> +Date: Mon, 13 Sep 2010 21:48:24 +0200 +Subject: [PATCH 1/1] Set default input module to evdev for Apple Magic Mouse (LP: #637430) + +* Set default input module to evdev for Apple Magic Mouse (LP: #637430) + - Add debian/local/60-magictrackpad.conf +--- + debian/changelog | 7 +++++++ + debian/local/60-magictrackpad.conf | 5 +++++ + debian/rules | 4 ++++ + 3 files changed, 16 insertions(+), 0 deletions(-) + create mode 100644 debian/local/60-magictrackpad.conf + +diff --git a/debian/changelog b/debian/changelog +index 225c61f..b502133 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,3 +1,10 @@ ++xserver-xorg-input-evdev (1:2.3.2-6ubuntu2) maverick; urgency=low ++ ++ * Set default input module to evdev for Apple Magic Mouse (LP: #637430) ++ - Add debian/local/60-magictrackpad.conf ++ ++ -- Chase Douglas <chase.doug...@ubuntu.com> Mon, 13 Sep 2010 21:46:44 +0200 ++ + xserver-xorg-input-evdev (1:2.3.2-6ubuntu1) maverick; urgency=low + + * Add gesture support +diff --git a/debian/local/60-magictrackpad.conf b/debian/local/60-magictrackpad.conf +new file mode 100644 +index 0000000..4b7f4aa +--- /dev/null ++++ b/debian/local/60-magictrackpad.conf +@@ -0,0 +1,5 @@ ++Section "InputClass" ++ Identifier "Magic Trackpad" ++ MatchUSBID "05ac:030e" ++ Driver "evdev" ++EndSection +diff --git a/debian/rules b/debian/rules +index cddc86e..d9e4e1c 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -21,6 +21,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)) +@@ -84,6 +85,9 @@ binary-arch: build install serverabi + dh_installdocs + dh_installchangelogs ChangeLog + dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la ++ifeq ($(DEB_HOST_ARCH_OS), linux) ++ install -D -m 644 debian/local/60-magictrackpad.conf debian/xserver-xorg-input-evdev/usr/share/X11/xorg.conf.d/60-magictrackpad.conf ++endif + dh_installman + dh_link + dh_strip +-- +1.7.1 + diff --git a/debian/patches/series b/debian/patches/series index 2e7260d..d34102b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 100-fix-touchup-problem-on-touchpads.patch 101-gestures.patch +102-magic-mouse.patch -- 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/e1ow1ea-0006zq...@alioth.debian.org