xorg-server: Changes to 'ubuntu'
debian/changelog | 9 ++++-
debian/control | 2 -
debian/patches/219_fedora-pointer-barriers.diff | 41 ++++++++++++++++++++++++
3 files changed, 49 insertions(+), 3 deletions(-)
New commits:
commit 465ba533d3a12d9fee80aaca42d394774d9c4941
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Jun 16 10:27:41 2011 +1000
Release to oneiric
diff --git a/debian/changelog b/debian/changelog
index 2522950..0bb5c19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.10.2-1ubuntu1) UNRELEASED; urgency=low
+xorg-server (2:1.10.2-1ubuntu1) oneiric; urgency=low
[ Timo Aaltonen ]
* Merge from Debian unstable, remaining changes:
commit 305c69f5e0e73125abf47e20e4dccb8b4f60dcb5
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Jun 15 16:22:45 2011 +1000
Add prerequisite commit to pointer-barrier patch to fix build
diff --git a/debian/patches/219_fedora-pointer-barriers.diff b/debian/patches/219_fedora-pointer-barriers.diff
index c316377..57e4718 100644
--- a/debian/patches/219_fedora-pointer-barriers.diff
+++ b/debian/patches/219_fedora-pointer-barriers.diff
@@ -643,3 +643,44 @@ index d005369..6ba276e 100644
--
1.7.4.4
+commit 703baece7ebd128a6742d0523d5b3ebe65126fa5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Feb 11 12:19:26 2011 +1000
+
+ dix: Add IsFloating(device) wrapper.
+
+ Simplifies check for floating devices.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
+
+diff --git a/dix/events.c b/dix/events.c
+index 4826781..f6d92cf 100644
+--- a/dix/events.c
++++ b/dix/events.c
+@@ -328,6 +328,13 @@ IsMaster(DeviceIntPtr dev)
+ return dev->type == MASTER_POINTER || dev->type == MASTER_KEYBOARD;
+ }
+
++Bool
++IsFloating(DeviceIntPtr dev)
++{
++ return GetMaster(dev, MASTER_KEYBOARD) == NULL;
++}
++
++
+ /**
+ * Max event opcode.
+ */
+diff --git a/include/dix.h b/include/dix.h
+index 12e4b59..3f99098 100644
+--- a/include/dix.h
++++ b/include/dix.h
+@@ -570,6 +570,7 @@ extern Bool _X_EXPORT IsPointerDevice( DeviceIntPtr dev);
+ extern Bool _X_EXPORT IsKeyboardDevice(DeviceIntPtr dev);
+ extern Bool IsPointerEvent(InternalEvent *event);
+ extern _X_EXPORT Bool IsMaster(DeviceIntPtr dev);
++extern _X_EXPORT Bool IsFloating(DeviceIntPtr dev);
+
+ extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
+ extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);
commit cc4f37c00d906fceeb43799e0246e6cdcd5876a7
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Jun 15 10:51:52 2011 +1000
Bump mesa-common-dev b/d to pick up multiarch DRI paths
diff --git a/debian/changelog b/debian/changelog
index 2807fdd..2522950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xorg-server (2:1.10.2-1ubuntu1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Merge from Debian unstable, remaining changes:
- rules:
+ Disable SELinux, libaudit-dev is not in main yet. (LP #406226)
@@ -81,7 +82,11 @@ xorg-server (2:1.10.2-1ubuntu1) UNRELEASED; urgency=low
* Add 219_fedora-pointer-barrier.diff:
Pointer barrier and cursor confinement patch backported to 1.10.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 31 May 2011 14:12:19 +0300
+ [ Christopher James Halse Rogers ]
+ * debian/control:
+ Bump mesa-common-dev build-dep to pick up multiarch DRI paths.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 15 Jun 2011 10:51:18 +1000
xorg-server (2:1.10.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 4822af8..15f0c8e 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@ Build-Depends:
x11proto-xf86dri-dev (>= 2.1.0),
libdrm-dev (>= 2.4.3) [!hurd-i386],
x11proto-gl-dev (>= 1.4.10),
- mesa-common-dev (>= 7.10.1~git20110215.cc1636b6-0ubuntu2),
+ mesa-common-dev (>= 7.10.3-0ubuntu1),
libgl1-mesa-dev (>= 7.8),
libxmuu-dev (>= 1:0.99.1),
libxext-dev (>= 1:0.99.1),
Reply to: