debian/changelog | 1 +
debian/patches/508_device_off_release_buttons.patch | 13 -------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 14 deletions(-)
New commits:
commit 2748454864ec6e3f974c0765fa51701a82910bd2
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Wed Jul 25 13:35:15 2012 +0200
Remove 508_device_off_release_buttons.patch
diff --git a/debian/changelog b/debian/changelog
index b7b924c..bb4f3cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg-server (2:1.12.99.902-1) UNRELEASED; urgency=low
* Bump minimum required abi, randr, dri2 and gl protos.
* Refreshed patches to apply on x1.13
* Remove patches merged upstream:
+ - 508_device_off_release_buttons.patch
- 510-dix-return-early-from-DisableDevice-if-the-device-is.patch
- 511-dix-move-freeing-the-sprite-into-a-function.patch
- 512-dix-free-the-sprite-when-disabling-the-device.patch
diff --git a/debian/patches/508_device_off_release_buttons.patch
b/debian/patches/508_device_off_release_buttons.patch
deleted file mode 100644
index 167fd07..0000000
--- a/debian/patches/508_device_off_release_buttons.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/dix/devices.c b/dix/devices.c
-index cdbc2b0..640312a 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -432,6 +432,8 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
- if (*prev != dev)
- return FALSE;
-
-+ ReleaseButtonsAndKeys(dev);
-+
- /* float attached devices */
- if (IsMaster(dev)) {
- for (other = inputInfo.devices; other; other = other->next) {
diff --git a/debian/patches/series b/debian/patches/series
index 291778c..847685c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,4 +25,3 @@
# Temporary, until it's reviewed & accepted upstream
500_pointer_barrier_thresholds.diff
-508_device_off_release_buttons.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/e1stzsd-0007lh...@vasks.debian.org
