debian/changelog | 5 ++
debian/control | 1
debian/patches/137_add_device_property_support.patch | 37 +++++++++----------
debian/serverminver | 2 -
4 files changed, 25 insertions(+), 20 deletions(-)
New commits:
commit 607306b3d744e14f74147c984d5ad27fcdda248c
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Thu Oct 9 14:19:13 2008 +0300
Add Breaks for synaptics, evdev and bump serverminver.
diff --git a/debian/changelog b/debian/changelog
index 63be19c..89ee923 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ xorg-server (2:1.5.1-1ubuntu3) UNRELEASED; urgency=low
match the current version in master (final API for XI 1.5).
(LP: #274728)
* Bump the build-dep on x11proto-input-dev and libxi-dev.
+ * Bump the serverminver because of newer properties API.
+ * Add Breaks against current synaptics and evdev, since they use the old
+ API and need to be updated with the server.
- -- Timo Aaltonen <[EMAIL PROTECTED]> Mon, 29 Sep 2008 09:30:04 +0300
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 09 Oct 2008 14:18:23 +0300
xorg-server (2:1.5.1-1ubuntu2) intrepid; urgency=low
diff --git a/debian/control b/debian/control
index c1f1346..70bdf14 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,7 @@ Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<<
1:7.0.0),
xserver-xorg-video-2, xserver-xorg-input-2
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
xserver-common
+Breaks: xserver-xorg-input-synaptics (<= 0.15.2-0ubuntu3),
xserver-xorg-input-evdev (<= 1:2.0.99+git20080912-0ubuntu2)
Provides: xserver
Description: Xorg X server - core server
The Xorg X server is an X server for several architectures and operating
diff --git a/debian/serverminver b/debian/serverminver
index 557865f..cf49710 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1 +1 @@
-2:1.4.99.906-2ubuntu2
+2:1.5.1-1ubuntu3
commit b1b567e30678b6515ff3067ed7f1aae5f541c3ae
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Thu Oct 9 13:08:17 2008 +0300
Fix 137 backport, one line missing from XIGetDeviceProperty
..which resulted in an endless loop. Yay.
diff --git a/debian/patches/137_add_device_property_support.patch
b/debian/patches/137_add_device_property_support.patch
index 56a1701..34dca94 100644
--- a/debian/patches/137_add_device_property_support.patch
+++ b/debian/patches/137_add_device_property_support.patch
@@ -1,7 +1,7 @@
Index: xorg-server/Xi/Makefile.am
===================================================================
---- xorg-server.orig/Xi/Makefile.am 2008-09-27 00:32:44.000000000 +0300
-+++ xorg-server/Xi/Makefile.am 2008-09-27 00:32:51.000000000 +0300
+--- xorg-server.orig/Xi/Makefile.am 2008-10-09 12:45:05.000000000 +0300
++++ xorg-server/Xi/Makefile.am 2008-10-09 12:45:11.000000000 +0300
@@ -75,6 +75,8 @@
ungrdevb.c \
ungrdevb.h \
@@ -14,8 +14,8 @@ Index: xorg-server/Xi/Makefile.am
EXTRA_DIST = stubs.c
Index: xorg-server/Xi/exglobals.h
===================================================================
---- xorg-server.orig/Xi/exglobals.h 2008-09-27 00:32:44.000000000 +0300
-+++ xorg-server/Xi/exglobals.h 2008-09-27 00:32:51.000000000 +0300
+--- xorg-server.orig/Xi/exglobals.h 2008-10-09 12:45:05.000000000 +0300
++++ xorg-server/Xi/exglobals.h 2008-10-09 12:45:11.000000000 +0300
@@ -50,6 +50,7 @@
extern Mask DeviceButtonGrabMask;
extern Mask DeviceButtonMotionMask;
@@ -34,8 +34,8 @@ Index: xorg-server/Xi/exglobals.h
Index: xorg-server/Xi/extinit.c
===================================================================
---- xorg-server.orig/Xi/extinit.c 2008-09-27 00:32:44.000000000 +0300
-+++ xorg-server/Xi/extinit.c 2008-09-27 00:32:51.000000000 +0300
+--- xorg-server.orig/Xi/extinit.c 2008-10-09 12:45:05.000000000 +0300
++++ xorg-server/Xi/extinit.c 2008-10-09 12:45:11.000000000 +0300
@@ -109,6 +109,8 @@
#include "ungrdev.h"
#include "ungrdevb.h"
@@ -175,8 +175,8 @@ Index: xorg-server/Xi/extinit.c
Index: xorg-server/Xi/xiproperty.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/Xi/xiproperty.c 2008-09-27 00:36:39.000000000 +0300
-@@ -0,0 +1,772 @@
++++ xorg-server/Xi/xiproperty.c 2008-10-09 13:07:10.000000000 +0300
+@@ -0,0 +1,773 @@
+/*
+ * Copyright © 2006 Keith Packard
+ * Copyright © 2008 Peter Hutterer
@@ -596,6 +596,7 @@ Index: xorg-server/Xi/xiproperty.c
+ return rc;
+ }
+ }
++ handler = handler->next;
+ }
+ }
+ *value = &prop->value;
@@ -952,7 +953,7 @@ Index: xorg-server/Xi/xiproperty.c
Index: xorg-server/Xi/xiproperty.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/Xi/xiproperty.h 2008-09-27 00:32:51.000000000 +0300
++++ xorg-server/Xi/xiproperty.h 2008-10-09 12:45:11.000000000 +0300
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2008 Peter Hutterer
@@ -1005,8 +1006,8 @@ Index: xorg-server/Xi/xiproperty.h
+#endif /* XIPROPERTY_C */
Index: xorg-server/dix/devices.c
===================================================================
---- xorg-server.orig/dix/devices.c 2008-09-27 00:32:44.000000000 +0300
-+++ xorg-server/dix/devices.c 2008-09-27 00:32:51.000000000 +0300
+--- xorg-server.orig/dix/devices.c 2008-10-09 12:45:05.000000000 +0300
++++ xorg-server/dix/devices.c 2008-10-09 12:45:11.000000000 +0300
@@ -57,6 +57,7 @@
#define NEED_EVENTS
#define NEED_REPLIES
@@ -1111,8 +1112,8 @@ Index: xorg-server/dix/devices.c
Index: xorg-server/include/exevents.h
===================================================================
---- xorg-server.orig/include/exevents.h 2008-09-27 00:32:44.000000000
+0300
-+++ xorg-server/include/exevents.h 2008-09-27 00:32:51.000000000 +0300
+--- xorg-server.orig/include/exevents.h 2008-10-09 12:45:05.000000000
+0300
++++ xorg-server/include/exevents.h 2008-10-09 12:45:11.000000000 +0300
@@ -173,10 +173,64 @@
Mask /* mask */,
int /* maskndx */);
@@ -1181,8 +1182,8 @@ Index: xorg-server/include/exevents.h
#endif /* EXEVENTS_H */
Index: xorg-server/include/inputstr.h
===================================================================
---- xorg-server.orig/include/inputstr.h 2008-09-27 00:32:44.000000000
+0300
-+++ xorg-server/include/inputstr.h 2008-09-27 00:32:51.000000000 +0300
+--- xorg-server.orig/include/inputstr.h 2008-10-09 12:45:05.000000000
+0300
++++ xorg-server/include/inputstr.h 2008-10-09 12:45:11.000000000 +0300
@@ -266,6 +266,41 @@
#endif
} LedFeedbackClassRec;
@@ -1241,7 +1242,7 @@ Index: xorg-server/include/inputstr.h
Index: xorg-server/include/xserver-properties.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/include/xserver-properties.h 2008-09-27 00:32:51.000000000
+0300
++++ xorg-server/include/xserver-properties.h 2008-10-09 12:45:11.000000000
+0300
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2008 Red Hat, Inc.
@@ -1277,8 +1278,8 @@ Index: xorg-server/include/xserver-properties.h
+#endif
Index: xorg-server/include/Makefile.am
===================================================================
---- xorg-server.orig/include/Makefile.am 2008-09-27 00:32:44.000000000
+0300
-+++ xorg-server/include/Makefile.am 2008-09-27 00:32:51.000000000 +0300
+--- xorg-server.orig/include/Makefile.am 2008-10-09 12:45:05.000000000
+0300
++++ xorg-server/include/Makefile.am 2008-10-09 12:45:11.000000000 +0300
@@ -53,6 +53,7 @@
xkbfile.h \
xkbsrv.h \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
