Rebased ref, commits from common ancestor:
commit ad3f68e5957f1653f275ddf05997d7d839311153
Author: Chase Douglas <chase.doug...@canonical.com>
Date: Tue Feb 1 17:52:05 2011 -0500
Add xi 2.1 support
* Add xi 2.1 support
- Added 1_xi2.1.patch
- Bump dependency on x11proto-input-dev for xi 2.1
- Add new xi 2.1 symbols to symbols file
* Update maintainer for Ubuntu upload
diff --git a/debian/changelog b/debian/changelog
index 778348d..8c53ba2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libxi (2:1.4.1-1ubuntu1) UNRELEASED; urgency=low
+
+ * Add xi 2.1 support
+ - Added 1_xi2.1.patch
+ - Bump dependency on x11proto-input-dev for xi 2.1
+ - Add new xi 2.1 symbols to symbols file
+ * Update maintainer for Ubuntu upload
+
+ -- Chase Douglas <chase.doug...@ubuntu.com> Mon, 21 Feb 2011 19:54:15 -0500
+
libxi (2:1.4.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 38dbf2c..dc0887e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
Source: libxi
Section: x11
Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu X-SWAT <ubunt...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Cyril Brulebois <k...@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
x11proto-core-dev (>= 7.0.13),
x11proto-xext-dev (>= 7.0.3),
- x11proto-input-dev (>= 1.9.99.902),
+ x11proto-input-dev (>= 2.0.1-1ubuntu1),
libx11-dev (>= 2:1.3.3-2),
libxext-dev (>= 2:1.1.1-3),
xmlto,
@@ -82,7 +83,7 @@ Depends:
libxi6 (= ${binary:Version}),
libx11-dev,
libxext-dev,
- x11proto-input-dev (>= 1.9.99.902),
+ x11proto-input-dev (>= 2.0.1-1ubuntu1),
xorg-sgml-doctools (>= 1:1.5),
Replaces:
x11proto-input-dev (<< 1.9.99)
diff --git a/debian/libxi6.symbols b/debian/libxi6.symbols
index 975a92b..a76b052 100644
--- a/debian/libxi6.symbols
+++ b/debian/libxi6.symbols
@@ -1,5 +1,6 @@
libXi.so.6 libxi6 #MINVER#
XAllowDeviceEvents@Base 0
+ XIAllowTouchEvents@Base 2:1.4.1-1ubuntu1
XChangeDeviceControl@Base 0
XChangeDeviceDontPropagateList@Base 0
XChangeDeviceKeyMapping@Base 0
@@ -27,6 +28,7 @@ libXi.so.6 libxi6 #MINVER#
XGetFeedbackControl@Base 0
XGetSelectedExtensionEvents@Base 0
XGrabDevice@Base 0
+ XIGrabTouchBegin@Base 2:1.4.1-1ubuntu1
XIAllowEvents@Base 2:1.2.99.4
XIChangeHierarchy@Base 2:1.2.99.4
XIChangeProperty@Base 2:1.2.99.4
@@ -72,6 +74,7 @@ libXi.so.6 libxi6 #MINVER#
XUngrabDevice@Base 0
XUngrabDeviceButton@Base 0
XUngrabDeviceKey@Base 0
+ XIUngrabTouchBegin@Base 2:1.4.1-1ubuntu1
_XiGetDevicePresenceNotifyEvent@Base 2:1.1.2
_xibadclass@Base 0
_xibaddevice@Base 0
diff --git a/debian/patches/1_xi2.1.patch b/debian/patches/1_xi2.1.patch
new file mode 100644
index 0000000..dc998d3
--- /dev/null
+++ b/debian/patches/1_xi2.1.patch
@@ -0,0 +1,375 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,7 @@ dnl Process this file with autoconf to c
+
+ AC_PREREQ([2.60])
+
+-AC_INIT(libXi, 1.4.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
++AC_INIT(libXi, 1.4.1.99.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE
+
+@@ -24,7 +24,7 @@ AC_PROG_LIBTOOL
+ AC_PROG_SED
+
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.2.99.1] [xextproto >=
7.0.3] [xext >= 1.0.99.1] [inputproto >= 1.9.99.902])
++PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.2.99.1] [xextproto >=
7.0.3] [xext >= 1.0.99.1] [inputproto >= 2.0.99.1])
+
+ # Check for xmlto and asciidoc for man page conversion
+ # (only needed by people building tarballs)
+--- a/include/X11/extensions/XInput2.h
++++ b/include/X11/extensions/XInput2.h
+@@ -135,6 +135,25 @@ typedef struct
+
+ typedef struct
+ {
++ int type;
++ int sourceid;
++ int mode;
++ int num_touches;
++} XITouchClassInfo;
++
++typedef struct
++{
++ int type;
++ int sourceid;
++ int number;
++ Atom label;
++ double min;
++ double max;
++ int resolution;
++} XITouchValuatorClassInfo;
++
++typedef struct
++{
+ int deviceid;
+ char *name;
+ int use;
+@@ -292,6 +311,20 @@ typedef struct {
+ int what;
+ } XIPropertyEvent;
+
++typedef struct {
++ int type; /* GenericEvent */
++ unsigned long serial; /* # of last request processed by server */
++ Bool send_event; /* true if this came from a SendEvent request
*/
++ Display *display; /* Display the event was read from */
++ int extension; /* XI extension offset */
++ int evtype;
++ Time time;
++ int deviceid;
++ int sourceid;
++ unsigned int touchid;
++ unsigned int flags;
++} XITouchOwnershipEvent;
++
+ _XFUNCPROTOBEGIN
+
+ extern Bool XIQueryPointer(
+@@ -415,6 +448,13 @@ extern Status XIAllowEvents(
+ Time time
+ );
+
++extern Status XIAllowTouchEvents(
++ Display* display,
++ int deviceid,
++ unsigned long touchid,
++ int event_mode
++);
++
+ extern int XIGrabButton(
+ Display* display,
+ int deviceid,
+@@ -466,6 +506,17 @@ extern int XIGrabFocusIn(
+ int num_modifiers,
+ XIGrabModifiers *modifiers_inout
+ );
++
++extern int XIGrabTouchBegin(
++ Display* display,
++ int deviceid,
++ Window grab_window,
++ int owner_events,
++ XIEventMask *mask,
++ int num_modifiers,
++ XIGrabModifiers *modifiers_inout
++);
++
+ extern Status XIUngrabButton(
+ Display* display,
+ int deviceid,
+@@ -496,6 +547,14 @@ extern Status XIUngrabFocusIn(
+ Display* display,
+ int deviceid,
+ Window grab_window,
++ int num_modifiers,
++ XIGrabModifiers *modifiers
++);
++
++extern Status XIUngrabTouchBegin(
++ Display* display,
++ int deviceid,
++ Window grab_window,
+ int num_modifiers,
+ XIGrabModifiers *modifiers
+ );
+--- a/src/XExtInt.c
++++ b/src/XExtInt.c
+@@ -146,6 +146,9 @@ static int
+ wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie *cookie);
+ static int
+ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie);
++static int
++wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in,
++ XGenericEventCookie *cookie);
+
+ static /* const */ XEvent emptyevent;
+
+@@ -268,7 +271,8 @@ static XExtensionVersion versions[] = {
+ XI_Add_DevicePresenceNotify_Minor},
+ {XI_Present, XI_Add_DeviceProperties_Major,
+ XI_Add_DeviceProperties_Minor},
+-{XI_Present, XI_2_Major, XI_2_Minor}
++{XI_Present, XI_2_Major, XI_2_Minor},
++{XI_Present, XI_2_Major, XI_2_1_Minor}
+ };
+
+ /***********************************************************************
+@@ -924,6 +928,10 @@ XInputWireToCookie(
+ case XI_ButtonRelease:
+ case XI_KeyPress:
+ case XI_KeyRelease:
++ case XI_TouchBegin:
++ case XI_TouchUpdate:
++ case XI_TouchUpdateUnowned:
++ case XI_TouchEnd:
+ *cookie = *(XGenericEventCookie*)save;
+ if (!wireToDeviceEvent((xXIDeviceEvent*)event, cookie))
+ {
+@@ -950,7 +958,16 @@ XInputWireToCookie(
+ break;
+ }
+ return ENQUEUE_EVENT;
+-
++ case XI_TouchOwnership:
++ *cookie = *(XGenericEventCookie*)save;
++ if (!wireToTouchOwnershipEvent((xXITouchOwnershipEvent*)event,
++ cookie))
++ {
++ printf("XInputWireToCookie: CONVERSION FAILURE! evtype=%d\n",
++ ge->evtype);
++ break;
++ }
++ return ENQUEUE_EVENT;
+ case XI_RawKeyPress:
+ case XI_RawKeyRelease:
+ case XI_RawButtonPress:
+@@ -1037,6 +1054,12 @@ sizeDeviceClassType(int type, int num_el
+ case XIValuatorClass:
+ l = sizeof(XIValuatorClassInfo);
+ break;
++ case XITouchClass:
++ l = sizeof(XITouchClassInfo);
++ break;
++ case XITouchValuatorClass:
++ l = sizeof(XITouchValuatorClassInfo);
++ break;
+ default:
+ printf("sizeDeviceClassType: unknown type %d\n", type);
+ break;
+@@ -1239,6 +1262,22 @@ copyPropertyEvent(XGenericEventCookie *c
+ }
+
+ static Bool
++copyTouchOwnershipEvent(XGenericEventCookie *cookie_in,
++ XGenericEventCookie *cookie_out)
++{
++ XITouchOwnershipEvent *in, *out;
++
++ in = cookie_in->data;
++
++ out = cookie_out->data = malloc(sizeof(XITouchOwnershipEvent));
++ if (!out)
++ return False;
++
++ *out = *in;
++ return True;
++}
++
++static Bool
+ copyRawEvent(XGenericEventCookie *cookie_in,
+ XGenericEventCookie *cookie_out)
+ {
+@@ -1297,8 +1336,15 @@ XInputCopyCookie(Display *dpy, XGenericE
+ case XI_ButtonRelease:
+ case XI_KeyPress:
+ case XI_KeyRelease:
++ case XI_TouchBegin:
++ case XI_TouchUpdate:
++ case XI_TouchUpdateUnowned:
++ case XI_TouchEnd:
+ ret = copyDeviceEvent(in, out);
+ break;
++ case XI_TouchOwnership:
++ ret = copyTouchOwnershipEvent(in, out);
++ break;
+ case XI_DeviceChanged:
+ ret = copyDeviceChangedEvent(in, out);
+ break;
+@@ -1427,6 +1473,12 @@ size_classes(xXIAnyInfo* from, int nclas
+ case XIValuatorClass:
+ l = sizeDeviceClassType(XIValuatorClass, 0);
+ break;
++ case XITouchClass:
++ l = sizeDeviceClassType(XITouchClass, 0);
++ break;
++ case XITouchValuatorClass:
++ l = sizeDeviceClassType(XITouchValuatorClass, 0);
++ break;
+ }
+
+ len += l;
+@@ -1527,6 +1579,35 @@ copy_classes(XIDeviceInfo* to, xXIAnyInf
+
+ }
+ break;
++ case XITouchClass:
++ {
++ XITouchClassInfo *cls_lib;
++ xXITouchInfo *cls_wire;
++
++ cls_wire = (xXITouchInfo*)any_wire;
++ cls_lib = next_block(&ptr_lib, sizeof(XITouchClassInfo));
++
++ cls_lib->mode = cls_wire->mode;
++ cls_lib->num_touches = cls_wire->num_touches;
++ }
++ break;
++ case XITouchValuatorClass:
++ {
++ XITouchValuatorClassInfo *cls_lib;
++ xXITouchValuatorInfo *cls_wire;
++
++ cls_wire = (xXITouchValuatorInfo*)any_wire;
++ cls_lib = next_block(&ptr_lib,
++ sizeof(XITouchValuatorClassInfo));
++
++ cls_lib->number = cls_wire->number;
++ cls_lib->label = cls_wire->label;
++ /* FIXME: fractional parts */
++ cls_lib->min = cls_wire->min.integral;
++ cls_lib->max = cls_wire->max.integral;
++ cls_lib->resolution = cls_wire->resolution;
++ }
++ break;
+ }
+ len += any_wire->length * 4;
+ ptr_wire += any_wire->length * 4;
+@@ -1697,6 +1778,28 @@ wireToEnterLeave(xXIEnterEvent *in, XGen
+
+ return 1;
+ }
++
++static int
++wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in,
++ XGenericEventCookie *cookie)
++{
++ XITouchOwnershipEvent *out = malloc(sizeof(XITouchOwnershipEvent));
++
++ cookie->data = out;
++
++ out->type = in->type;
++ out->display = cookie->display;
++ out->extension = in->extension;
++ out->evtype = in->evtype;
++ out->send_event = ((in->type & 0x80) != 0);
++ out->time = in->time;
++ out->deviceid = in->deviceid;
++ out->sourceid = in->sourceid;
++ out->touchid = in->touchid;
++ out->flags = in->flags;
++
++ return 1;
++}
+
+ static int
+ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie)
+--- a/src/XIAllowEvents.c
++++ b/src/XIAllowEvents.c
+@@ -51,3 +51,27 @@ XIAllowEvents(Display *dpy, int deviceid
+ SyncHandle();
+ return Success;
+ }
++
++Status
++XIAllowTouchEvents(Display *dpy, int deviceid, unsigned long touchid,
++ int event_mode)
++{
++ xXIAllowTouchEventsReq *req;
++
++ XExtDisplayInfo *extinfo = XInput_find_display(dpy);
++
++ LockDisplay(dpy);
++ if (_XiCheckExtInit(dpy, XInput_2_1, extinfo) == -1)
++ return (NoSuchExtension);
++
++ GetReq(XIAllowTouchEvents, req);
++ req->reqType = extinfo->codes->major_opcode;
++ req->ReqType = X_XIAllowTouchEvents;
++ req->deviceid = deviceid;
++ req->touchid = touchid;
++ req->mode = event_mode;
++
++ UnlockDisplay(dpy);
++ SyncHandle();
++ return Success;
++}
+--- a/src/XIPassiveGrab.c
++++ b/src/XIPassiveGrab.c
+@@ -145,6 +145,25 @@ XIGrabFocusIn(Display *dpy, int deviceid
+ modifiers_inout);
+ }
+
++int
++XIGrabTouchBegin(Display *dpy, int deviceid, Window grab_window,
++ Bool owner_events, XIEventMask *mask,
++ int num_modifiers, XIGrabModifiers *modifiers_inout)
++{
++ XExtDisplayInfo *extinfo = XInput_find_display(dpy);
++
++ LockDisplay(dpy);
++ if (_XiCheckExtInit(dpy, XInput_2_1, extinfo) == -1)
++ return -1;
++
++ UnlockDisplay(dpy);
++
++ return _XIPassiveGrabDevice(dpy, deviceid, XIGrabtypeTouchBegin, 0,
++ grab_window, None, GrabModeAsync,
GrabModeAsync,
++ owner_events, mask, num_modifiers,
++ modifiers_inout);
++}
++
+ static int
+ _XIPassiveUngrabDevice(Display* dpy, int deviceid, int grabtype, int detail,
+ Window grab_window, int num_modifiers, XIGrabModifiers
*modifiers)
+@@ -208,3 +227,19 @@ XIUngrabFocusIn(Display* display, int de
+ return _XIPassiveUngrabDevice(display, deviceid, XIGrabtypeFocusIn, 0,
+ grab_window, num_modifiers, modifiers);
+ }
++
++int
++XIUngrabTouchBegin(Display* display, int deviceid, Window grab_window,
++ int num_modifiers, XIGrabModifiers *modifiers)
++{
++ XExtDisplayInfo *extinfo = XInput_find_display(display);
++
++ LockDisplay(display);
++ if (_XiCheckExtInit(display, XInput_2_1, extinfo) == -1)
++ return -1;
++
++ UnlockDisplay(display);
++
++ return _XIPassiveUngrabDevice(display, deviceid, XIGrabtypeTouchBegin, 0,
++ grab_window, num_modifiers, modifiers);
++}
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..43bd4d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+1_xi2.1.patch
commit c8dbcf3de84b5ac6ab2d70fa9b500b09b8326eee
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Feb 8 00:04:36 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 02a14d0..778348d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-libxi (2:1.4.1-1) UNRELEASED; urgency=low
+libxi (2:1.4.1-1) unstable; urgency=low
* New upstream release.
* Use xorg-sgml-doctool's copy of xorg.css.
+ * Upload to unstable.
- -- Julien Cristau <jcris...@debian.org> Mon, 07 Feb 2011 23:48:11 +0100
+ -- Julien Cristau <jcris...@debian.org> Tue, 08 Feb 2011 00:04:32 +0100
libxi (2:1.4.0-1) experimental; urgency=low
commit 0623fde9070e80aea080b506c8c3e8094680f302
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Feb 7 23:51:20 2011 +0100
Use xorg-sgml-doctool's copy of xorg.css.
diff --git a/debian/changelog b/debian/changelog
index b4f47c3..02a14d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxi (2:1.4.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Use xorg-sgml-doctool's copy of xorg.css.
-- Julien Cristau <jcris...@debian.org> Mon, 07 Feb 2011 23:48:11 +0100
diff --git a/debian/control b/debian/control
index 494e359..38dbf2c 100644
--- a/debian/control
+++ b/debian/control
@@ -76,7 +76,14 @@ Description: X11 Input extension library (debug package)
Package: libxi-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxi6 (= ${binary:Version}),
libx11-dev, libxext-dev, x11proto-input-dev (>= 1.9.99.902)
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libxi6 (= ${binary:Version}),
+ libx11-dev,
+ libxext-dev,
+ x11proto-input-dev (>= 1.9.99.902),
+ xorg-sgml-doctools (>= 1:1.5),
Replaces:
x11proto-input-dev (<< 1.9.99)
Description: X11 Input extension library (development headers)
diff --git a/debian/libxi-dev.install b/debian/libxi-dev.install
index f59105c..1ddc544 100644
--- a/debian/libxi-dev.install
+++ b/debian/libxi-dev.install
@@ -4,7 +4,5 @@ usr/lib/pkgconfig/xi.pc
usr/include/X11/extensions/
usr/share/doc/libXi/specs/*.html usr/share/doc/libxi-dev
usr/share/doc/libXi/specs/*.txt usr/share/doc/libxi-dev
-usr/share/doc/libXi/specs/*.css usr/share/doc/libxi-dev
usr/share/doc/libXi/doc/*.html usr/share/doc/libxi-dev
usr/share/doc/libXi/doc/*.txt usr/share/doc/libxi-dev
-usr/share/doc/libXi/doc/*.css usr/share/doc/libxi-dev
commit 32be499910ec33f1405d1e6e65db9ee95d620eac
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Feb 7 23:48:23 2011 +0100
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index c3c12a2..a3372e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,70 @@
+commit be2a1b33c9394dcab52622bde53c83f1dd840ea0
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Jan 26 07:42:53 2011 +1000
+
+ libXi 1.4.1
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit e0c95ce2348a9c9afaa4862368c7a5ae6913457c
+Author: Carlos Garnacho <carl...@gnome.org>
+Date: Mon Jan 24 12:35:04 2011 +0100
+
+ Fill in mods/group->effective in XIQueryPointer()
+
+ the other XIModifierState/XIGroupState fields are being set correctly,
+ but the "effective" field was being left as undefined memory.
+
+ Signed-off-by: Carlos Garnacho <carl...@gnome.org>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit a5961a8459614fcaa801a47cda07d3ee8246b16f
+Author: Philipp Reh <s...@s-e-f-i.de>
+Date: Mon Jan 10 17:35:57 2011 +0100
+
+ Fix passive grabs.
+
+ _XIPassiveGrabDevice, which is called by alle the passive grab functions,
+ wrongly returns an error when it shouldn't.
+ The attached patch adds the missing "not" to properly test the error
+ condition of _XReply.
+
+ Signed-off-by: Philipp Reh <s...@s-e-f-i.de>
+ Reviewed-by: Daniel Stone <dan...@fooishbar.org>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 408db9e86a92c897390129ef27a804d7cf6ba6fb
+Author: Paulo Zanoni <pzan...@mandriva.com>
+Date: Thu Dec 16 14:10:05 2010 -0200
+
+ Use docbookx.dtd version 4.3 for all docs
+
+ Signed-off-by: Paulo Zanoni <pzan...@mandriva.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 9419fe9f0b21232d342885a693fbf9222b5844e4
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Mon Dec 13 19:49:58 2010 +0000
+
+ WireToEvent: Set display member of all events as well
+
+ All events were getting random uninitialised garbage for display; fix
+ that.
+
+ Signed-off-by: Daniel Stone <dan...@fooishbar.org>
+
+commit 549dd5f470148df74e65ce7bb1af316a2848a71d
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Nov 9 13:04:55 2010 -0500
+
+ config: HTML file generation: use the installed copy of xorg.css
+
+ Currenlty the xorg.css file is copied in each location
+ where a DocBook/XML file resides. This produces about
+ 70 copies in the $(docdir) install tree.
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
commit ea7e12eaf84ada28f4933e85ecf51a47c9db0b93
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Tue Nov 2 14:26:34 2010 +1000
diff --git a/debian/changelog b/debian/changelog
index ab6fb99..b4f47c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.4.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 07 Feb 2011 23:48:11 +0100
+
libxi (2:1.4.0-1) experimental; urgency=low
* New upstream release.
commit be2a1b33c9394dcab52622bde53c83f1dd840ea0
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Wed Jan 26 07:42:53 2011 +1000
libXi 1.4.1
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 0a4b384..e26392e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT(libXi, 1.4.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
+AC_INIT(libXi, 1.4.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit e0c95ce2348a9c9afaa4862368c7a5ae6913457c
Author: Carlos Garnacho <carl...@gnome.org>
Date: Mon Jan 24 12:35:04 2011 +0100
Fill in mods/group->effective in XIQueryPointer()
the other XIModifierState/XIGroupState fields are being set correctly,
but the "effective" field was being left as undefined memory.
Signed-off-by: Carlos Garnacho <carl...@gnome.org>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/XIQueryPointer.c b/src/XIQueryPointer.c
index b3bfebc..e068a97 100644
--- a/src/XIQueryPointer.c
+++ b/src/XIQueryPointer.c
@@ -86,9 +86,12 @@ XIQueryPointer(Display *dpy,
mods->base = rep.mods.base_mods;
mods->latched = rep.mods.latched_mods;
mods->locked = rep.mods.locked_mods;
+ mods->effective = mods->base | mods->latched | mods->locked;
+
group->base = rep.group.base_group;
group->latched = rep.group.latched_group;
group->locked = rep.group.locked_group;
+ group->effective = group->base | group->latched | group->locked;
buttons->mask_len = rep.buttons_len * 4;
buttons->mask = malloc(buttons->mask_len);
commit add72b3a78f9b35e8782310a1de4e031dbbc3a8d
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 14 06:22:55 2011 +0100
Upload to experimental, fixing version number.
diff --git a/debian/changelog b/debian/changelog
index 89de01a..ab6fb99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxi (2:1.4-1) UNRELEASED; urgency=low
+libxi (2:1.4.0-1) experimental; urgency=low
* New upstream release.
* Update debian/copyright from upstream COPYING.
@@ -10,7 +10,7 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
* Get rid of *.xml files before running dh_install.
* Ship *.html, *.txt, *.css in libxi-dev.
- -- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 06:02:57 +0100
+ -- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 06:22:37 +0100
libxi (2:1.3-6) unstable; urgency=medium
commit 83b98d6ae6da778bee95d63b912eddb517ec6651
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 14 06:21:37 2011 +0100
Ship *.html, *.txt, *.css in libxi-dev.
diff --git a/debian/changelog b/debian/changelog
index b292b13..89de01a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
* Switch dh_install from --list-missing to --fail-missing for added
safety.
* Get rid of *.xml files before running dh_install.
+ * Ship *.html, *.txt, *.css in libxi-dev.
-- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 06:02:57 +0100
diff --git a/debian/libxi-dev.install b/debian/libxi-dev.install
index 0d4d5b5..f59105c 100644
--- a/debian/libxi-dev.install
+++ b/debian/libxi-dev.install
@@ -2,3 +2,9 @@ usr/lib/libXi.a
usr/lib/libXi.so
usr/lib/pkgconfig/xi.pc
usr/include/X11/extensions/
+usr/share/doc/libXi/specs/*.html usr/share/doc/libxi-dev
+usr/share/doc/libXi/specs/*.txt usr/share/doc/libxi-dev
+usr/share/doc/libXi/specs/*.css usr/share/doc/libxi-dev
+usr/share/doc/libXi/doc/*.html usr/share/doc/libxi-dev
+usr/share/doc/libXi/doc/*.txt usr/share/doc/libxi-dev
+usr/share/doc/libXi/doc/*.css usr/share/doc/libxi-dev
commit 2376fbb994cce1e822c0b6a67ac74c67dc38b650
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 14 06:17:13 2011 +0100
Get rid of *.xml files before running dh_install.
diff --git a/debian/changelog b/debian/changelog
index 26962cc..b292b13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
* Add xmlto, xorg-sgml-doctools, and w3m build-dep accordingly.
* Switch dh_install from --list-missing to --fail-missing for added
safety.
+ * Get rid of *.xml files before running dh_install.
-- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 06:02:57 +0100
diff --git a/debian/rules b/debian/rules
index d758b6d..7956d93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,6 +82,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
+ find debian/tmp -name '*.xml' -delete
dh_install --sourcedir=debian/tmp --fail-missing --exclude=libXi.la
--exclude=usr/share/man/man3
dh_installman
dh_installchangelogs ChangeLog
commit 3975885fa7f23786f42e0fb2c4cb64c602dc3d95
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 14 06:11:59 2011 +0100
Switch dh_install from --list-missing to --fail-missing for added safety.
diff --git a/debian/changelog b/debian/changelog
index 2c606f5..26962cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
* Bump xutils-dev build-dep for new macros.
* Pass --with-xmlto and --without-fop to configure.
* Add xmlto, xorg-sgml-doctools, and w3m build-dep accordingly.
+ * Switch dh_install from --list-missing to --fail-missing for added
+ safety.
-- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 06:02:57 +0100
diff --git a/debian/rules b/debian/rules
index 9e6d9a5..d758b6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing --exclude=libXi.la
--exclude=usr/share/man/man3
+ dh_install --sourcedir=debian/tmp --fail-missing --exclude=libXi.la
--exclude=usr/share/man/man3
dh_installman
dh_installchangelogs ChangeLog
dh_link
commit aaf5b2e9f5ae8fb85a55b780b1443e0f81b44988
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 14 06:11:35 2011 +0100
Add xmlto, xorg-sgml-doctools, and w3m build-dep accordingly.
diff --git a/debian/changelog b/debian/changelog
index ae39dd1..2c606f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
* Update debian/copyright from upstream COPYING.
* Bump xutils-dev build-dep for new macros.
* Pass --with-xmlto and --without-fop to configure.
+ * Add xmlto, xorg-sgml-doctools, and w3m build-dep accordingly.
-- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 06:02:57 +0100
diff --git a/debian/control b/debian/control
index b3b1e57..494e359 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,11 @@ Build-Depends:
quilt,
xutils-dev (>= 1:7.5+4),
automake,
- libtool
+ libtool,
+# specs
+ xmlto,
+ xorg-sgml-doctools (>= 1:1.5),
+ w3m,
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxi
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxi.git
commit 99052eca48841a252a8ed6150480bc4c6f249c90
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 14 06:10:55 2011 +0100
Pass --with-xmlto and --without-fop to configure.
diff --git a/debian/changelog b/debian/changelog
index 52315ef..ae39dd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
* New upstream release.
* Update debian/copyright from upstream COPYING.
* Bump xutils-dev build-dep for new macros.
+ * Pass --with-xmlto and --without-fop to configure.
-- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 06:02:57 +0100
diff --git a/debian/rules b/debian/rules
index b6673c7..9e6d9a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,8 @@ build/config.status: configure
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
+ --with-xmlto \
+ --without-fop \
CFLAGS="$(CFLAGS)"
commit b81b2cda7310eeede99d1c8541731d3e71b09a37
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 14 06:05:22 2011 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index 5ed0b1a..52315ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxi (2:1.4-1) UNRELEASED; urgency=low
* New upstream release.
* Update debian/copyright from upstream COPYING.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 06:02:57 +0100
diff --git a/debian/control b/debian/control
index 64183c7..b3b1e57 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
asciidoc (>= 8.4.5),
pkg-config,
quilt,
- xutils-dev (>= 1:7.4+4),
+ xutils-dev (>= 1:7.5+4),
automake,
libtool
Standards-Version: 3.8.4
commit fd5447814061d92db18fe1961c1225cb0951acb6
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 14 06:04:34 2011 +0100
Update debian/copyright from upstream COPYING.
diff --git a/debian/changelog b/debian/changelog
index 3501767..5ed0b1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxi (2:1.4-1) UNRELEASED; urgency=low
* New upstream release.
+ * Update debian/copyright from upstream COPYING.
-- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 06:02:57 +0100
diff --git a/debian/copyright b/debian/copyright
index 9b57e3e..561c972 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -42,3 +42,46 @@ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
FROM LOSS OF
USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 2008 Peter Hutterer
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the author shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the author.
+
+Copyright © 2009 Red Hat, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
commit 400f2962680b92d5a19149958377a850dfabf3fe
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 14 06:03:08 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 7b189a2..c3c12a2 100644
--
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/e1prhwx-0004du...@alioth.debian.org
