libxfixes: Changes to 'ubuntu'
debian/changelog | 38 ++++--
debian/control | 6 -
debian/libxfixes3.symbols | 3
debian/patches/01_fixesproto-v6.diff | 202 +++++++++++++++++++++++++++++++++++
debian/patches/series | 2
debian/rules | 3
6 files changed, 239 insertions(+), 15 deletions(-)
New commits:
commit 9d8c5d44e669b7d921d825dd0c9ff12e87048552
Author: Christopher James Halse Rogers <raof@ubuntu.com>
Date: Fri Jan 27 18:56:19 2012 +1100
Add proposed fixesproto v6 support
diff --git a/debian/changelog b/debian/changelog
index ee46d5f..591188e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libxfixes (1:5.0-4ubuntu1) precise; urgency=low
+
+ * debian/control:
+ - Bump x11proto-fixes build dep to pick up v6 protocol.
+ * debian/patches/01_fixesproto-v6.diff:
+ - Add support for proposed protocol. This is LIKELY TO CHANGE before
+ 12.04 release.
+ * debian/libxfixes3.symbols:
+ - Add new symbols from proposed protocol
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 27 Jan 2012 18:47:43 +1100
+
libxfixes (1:5.0-4) unstable; urgency=low
* Team upload.
diff --git a/debian/control b/debian/control
index a507388..b6f1585 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
Source: libxfixes
Section: x11
Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8.1.3),
dh-autoreconf,
libx11-dev (>= 2:1.3.3-2),
- x11proto-fixes-dev (>= 1:5.0),
+ x11proto-fixes-dev (>= 1:5.0-2ubuntu1~),
pkg-config,
quilt,
xutils-dev (>= 1:7.5+4),
diff --git a/debian/libxfixes3.symbols b/debian/libxfixes3.symbols
index 2cedbeb..7dffb59 100644
--- a/debian/libxfixes3.symbols
+++ b/debian/libxfixes3.symbols
@@ -1,9 +1,11 @@
libXfixes.so.3 libxfixes3 #MINVER#
+ XFixesBarrierReleasePointer@Base 1:5.0-4ubuntu1
XFixesChangeCursor@Base 0
XFixesChangeCursorByName@Base 0
XFixesChangeSaveSet@Base 0
XFixesCopyRegion@Base 0
XFixesCreatePointerBarrier@Base 1:5.0
+ XFixesCreatePointerBarrierVelocity@Base 1:5.0-4ubuntu1
XFixesCreateRegion@Base 0
XFixesCreateRegionFromBitmap@Base 0
XFixesCreateRegionFromGC@Base 0
@@ -25,6 +27,7 @@ libXfixes.so.3 libxfixes3 #MINVER#
XFixesQueryExtension@Base 0
XFixesQueryVersion@Base 0
XFixesRegionExtents@Base 0
+ XFixesSelectBarrierInput@Base 1:5.0-4ubuntu1
XFixesSelectCursorInput@Base 0
XFixesSelectSelectionInput@Base 0
XFixesSetCursorName@Base 0
diff --git a/debian/patches/01_fixesproto-v6.diff b/debian/patches/01_fixesproto-v6.diff
new file mode 100644
index 0000000..673c20b
--- /dev/null
+++ b/debian/patches/01_fixesproto-v6.diff
@@ -0,0 +1,202 @@
+commit 5251cfa60a123a73e8261ea654200eba1e653b33
+Author: Christopher James Halse Rogers <raof@ubuntu.com>
+Date: Fri Jan 27 18:32:45 2012 +1100
+
+ libXFixes v6: Pointer barrier improvements
+
+diff --git a/include/X11/extensions/Xfixes.h b/include/X11/extensions/Xfixes.h
+index 8995d14..992bff1 100644
+--- a/include/X11/extensions/Xfixes.h
++++ b/include/X11/extensions/Xfixes.h
+@@ -259,11 +259,48 @@ XFixesCreatePointerBarrier(Display *dpy, Window w, int x1, int y1,
+ int x2, int y2, int directions,
+ int num_devices, int *devices);
+
++PointerBarrier
++XFixesCreatePointerBarrierVelocity(Display *dpy, Window w, int x1, int y1,
++ int x2, int y2, int directions, int velocity,
++ int num_devices, int *devices);
++
+ void
+ XFixesDestroyPointerBarrier(Display *dpy, PointerBarrier b);
+
+ #endif /* XFIXES_MAJOR >= 5 */
+
++#if XFIXES_MAJOR >= 6
++
++typedef int32_t BarrierEventID;
++
++typedef struct {
++ int type; /* event base */
++ int subtype;
++ unsigned long serial;
++ Bool send_event;
++ Display *display;
++ Window window;
++ BarrierEventID event_id;
++ int directions;
++ PointerBarrier barrier;
++ int x;
++ int y;
++ int velocity;
++ Time timestamp;
++} XFixesBarrierNotifyEvent;
++
++void
++XFixesSelectBarrierInput (Display *dpy,
++ Window win,
++ unsigned long eventMask);
++
++void
++XFixesBarrierReleasePointer(Display *dpy,
++ PointerBarrier b,
++ BarrierEventID event_id);
++
++#endif
++
+ _XFUNCPROTOEND
+
+ #endif /* _XFIXES_H_ */
+diff --git a/src/Cursor.c b/src/Cursor.c
+index b3dfed1..6053046 100644
+--- a/src/Cursor.c
++++ b/src/Cursor.c
+@@ -334,3 +334,84 @@ XFixesDestroyPointerBarrier(Display *dpy, PointerBarrier b)
+ UnlockDisplay (dpy);
+ SyncHandle();
+ }
++
++void
++XFixesSelectBarrierInput (Display *dpy, Window win, unsigned long eventMask)
++{
++ XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy);
++ xXFixesSelectBarrierInputReq *req;
++
++ XFixesSimpleCheckExtension (dpy, info);
++ if (info->major_version < 6)
++ return;
++
++ LockDisplay (dpy);
++ GetReq (XFixesSelectBarrierInput, req);
++ req->reqType = info->codes->major_opcode;
++ req->xfixesReqType = X_XFixesSelectBarrierInput;
++ req->window = win;
++ req->eventMask = eventMask;
++ UnlockDisplay (dpy);
++ SyncHandle();
++}
++
++PointerBarrier
++XFixesCreatePointerBarrierVelocity(Display *dpy, Window w, int x1, int y1,
++ int x2, int y2, int directions, int velocity,
++ int num_devices, int *devices)
++{
++ XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy);
++ xXFixesCreatePointerBarrierVelocityReq *req;
++ PointerBarrier barrier;
++ int extra = 0;
++
++ XFixesCheckExtension (dpy, info, 0);
++ if (info->major_version < 6)
++ return 0;
++
++ if (num_devices)
++ extra = (((2 * num_devices) + 3) / 4) * 4;
++
++ LockDisplay (dpy);
++ GetReqExtra (XFixesCreatePointerBarrierVelocity, extra, req);
++ req->reqType = info->codes->major_opcode;
++ req->xfixesReqType = X_XFixesCreatePointerBarrierVelocity;
++ barrier = req->barrier = XAllocID (dpy);
++ req->window = w;
++ req->x1 = x1;
++ req->y1 = y1;
++ req->x2 = x2;
++ req->y2 = y2;
++ req->directions = directions;
++ req->velocity = velocity;
++ if ((req->num_devices = num_devices)) {
++ int i;
++ CARD16 *devs = (CARD16 *)(req + 1);
++ for (i = 0; i < num_devices; i++)
++ devs[i] = (CARD16)(devices[i]);
++ }
++
++ UnlockDisplay (dpy);
++ SyncHandle();
++ return barrier;
++}
++
++void
++XFixesBarrierReleasePointer(Display *dpy, PointerBarrier b, BarrierEventID event_id)
++{
++ XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy);
++ xXFixesBarrierReleasePointerReq *req;
++
++ XFixesSimpleCheckExtension (dpy, info);
++ if (info->major_version < 6)
++ return;
++
++ LockDisplay (dpy);
++ GetReq (XFixesBarrierReleasePointer, req);
++ req->reqType = info->codes->major_opcode;
++ req->xfixesReqType = X_XFixesBarrierReleasePointer;
++ req->barrier = b;
++ req->event_id = event_id;
++ UnlockDisplay (dpy);
++ SyncHandle();
++}
+diff --git a/src/Xfixes.c b/src/Xfixes.c
+index c32ee39..dc41e25 100644
+--- a/src/Xfixes.c
++++ b/src/Xfixes.c
+@@ -253,6 +253,26 @@ XFixesWireToEvent(Display *dpy, XEvent *event, xEvent *wire)
+ aevent->cursor_name = awire->name;
+ return True;
+ }
++ case XFixesBarrierNotify: {
++ XFixesBarrierNotifyEvent *aevent;
++ xXFixesBarrierNotifyEvent *awire;
++ awire = (xXFixesBarrierNotifyEvent *)wire;
++ aevent = (XFixesBarrierNotifyEvent *)event;
++ aevent->type = awire->type & 0x7F;
++ aevent->subtype = awire->subtype;
++ aevent->serial = _XSetLastRequestRead(dpy,
++ (xGenericReply *) wire);
++ aevent->send_event = (awire->type & 0x80) != 0;
++ aevent->display = dpy;
++ aevent->window = awire->window;
++ aevent->event_id = awire->event_id;
++ aevent->barrier = awire->barrier;
++ aevent->x = awire->x;
++ aevent->y = awire->y;
++ aevent->velocity = awire->velocity;
++ aevent->timestamp = awire->timestamp;
++ return True;
++ }
+ }
+ return False;
+ }
+@@ -292,6 +312,22 @@ XFixesEventToWire(Display *dpy, XEvent *event, xEvent *wire)
+ awire->cursorSerial = aevent->cursor_serial;
+ awire->name = aevent->cursor_name;
+ }
++ case XFixesBarrierNotify: {
++ XFixesBarrierNotifyEvent *aevent;
++ xXFixesBarrierNotifyEvent *awire;
++ awire = (xXFixesBarrierNotifyEvent *)wire;
++ aevent = (XFixesBarrierNotifyEvent *)event;
++ awire->type = aevent->type | (aevent->send_event ? 0x80 : 0);
++ awire->subtype = aevent->subtype;
++ awire->window = aevent->window;
++ awire->event_id = aevent->event_id;
++ awire->barrier = aevent->barrier;
++ awire->x = aevent->x;
++ awire->y = aevent->y;
++ awire->velocity = aevent->velocity;
++ awire->timestamp = aevent->timestamp;
++ return True;
++ }
+ }
+ return False;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index fdffa2a..af85a93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# placeholder
+01_fixesproto-v6.diff
commit c7da264b7876e586e816d3003345ff88457afa8c
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jun 12 00:15:48 2011 +0200
Don't include debug symbols for the udeb in libxfixes3-dbg.
diff --git a/debian/changelog b/debian/changelog
index 14f231b..ee46d5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxfixes (1:5.0-4) unstable; urgency=low
+
+ * Team upload.
+ * Don't include debug symbols for the udeb in libxfixes3-dbg.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 12 Jun 2011 00:16:17 +0200
+
libxfixes (1:5.0-3) unstable; urgency=low
* Team upload.
diff --git a/debian/rules b/debian/rules
index fa04756..db83b37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,8 @@ override_dh_install:
# Debug package:
override_dh_strip:
- dh_strip --dbg-package=$(PACKAGE)-dbg
+ dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
+ dh_strip -N$(PACKAGE)
# Shlibs:
override_dh_makeshlibs:
commit e381eac44b55ebca80e165be2f842ec17d75c6c4
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 16:01:28 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 4c4edce..14f231b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libxfixes (1:5.0-3) UNRELEASED; urgency=low
+libxfixes (1:5.0-3) unstable; urgency=low
+
+ * Team upload.
[ Steve Langasek ]
* Build for multiarch.
@@ -6,7 +8,7 @@ libxfixes (1:5.0-3) UNRELEASED; urgency=low
[ Julien Cristau ]
* Bump Standards-Version to 3.9.2.
- -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 15:59:02 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 16:01:20 +0200
libxfixes (1:5.0-2) unstable; urgency=low
commit 5ab0efb502fcf0760e9cdccb213a073cb5601c9b
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 16:01:06 2011 +0200
Bump Standards-Version to 3.9.2.
diff --git a/debian/changelog b/debian/changelog
index 1622220..4c4edce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libxfixes (1:5.0-3) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Julien Cristau ]
+ * Bump Standards-Version to 3.9.2.
+
-- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 15:59:02 +0200
libxfixes (1:5.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 578f7d1..a507388 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
pkg-config,
quilt,
xutils-dev (>= 1:7.5+4),
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxfixes
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxfixes.git
commit 1c550915b07dea4a287cc8a961e878ffe6725e65
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 16:00:51 2011 +0200
Add changelog entry for multiarch
diff --git a/debian/changelog b/debian/changelog
index 890d803..1622220 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxfixes (1:5.0-3) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 15:59:02 +0200
+
libxfixes (1:5.0-2) unstable; urgency=low
[ Julien Cristau ]
Reply to: