debian/changelog | 7 +++
debian/local/60-magictrackpad.conf | 5 ++
debian/patches/102-magic-mouse.patch | 65 -----------------------------------
debian/patches/series | 1
debian/rules | 4 ++
5 files changed, 16 insertions(+), 66 deletions(-)
New commits:
commit e411c43054f593ea36e83ed2aa55323ddda04766
Author: Chase Douglas <chase.doug...@canonical.com>
Date: Mon Sep 13 21:48:24 2010 +0200
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
diff --git a/debian/changelog b/debian/changelog
index 8b52298..abcb2da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.3.2-6ubuntu3) 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...@canonical.com> Thu, 16 Sep 2010 09:38:26
+0200
+
xserver-xorg-input-evdev (1:2.3.2-6ubuntu2) maverick; urgency=low
* Add 102-magic-mouse.patch - Patch from Chase Douglas to set default
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
commit ad51bb58ec0d97a53452f9de20f96c9a28d0f4c8
Author: Chase Douglas <chase.doug...@canonical.com>
Date: Thu Sep 16 09:29:15 2010 +0200
Revert "Patch from cnd to enable multitouch support for Magic Trackpad"
The patch is a debdiff, not a source patch.
This reverts commit d21f83610790469d7eee930ac0e23fa901dc3528.
diff --git a/debian/patches/102-magic-mouse.patch
b/debian/patches/102-magic-mouse.patch
deleted file mode 100644
index b7e207e..0000000
--- a/debian/patches/102-magic-mouse.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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 d34102b..2e7260d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
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/e1owaaf-0002je...@alioth.debian.org
