ChangeLog | 53 ++++++++++++++++++++++++++++++++++++++++
configure.ac | 2 -
debian/changelog | 12 +++++----
debian/control | 2 -
debian/upstream/signing-key.asc | 23 +++++++++++++++++
debian/watch | 1
specs/XI2proto.txt | 15 ++++++-----
7 files changed, 95 insertions(+), 13 deletions(-)
New commits:
commit ad41ab18969c1609326c3f117a93a631f1db3d1e
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Thu Apr 28 17:23:05 2016 +0200
Bump Standards-Version to 3.9.8 (no changes).
diff --git a/debian/changelog b/debian/changelog
index 71c1264..ae051e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ x11proto-input (2.3.2-1) UNRELEASED; urgency=medium
(Closes: #795981). Thanks, Eduard Sanou!
* Bump debhelper compat level to 9.
* Update Vcs fields to use https.
- * control: Bump Standards-Version to 3.9.7 (no changes).
+ * Bump Standards-Version to 3.9.8 (no changes).
* Let uscan verify tarball signatures.
-- Andreas Boll <andreas.boll....@gmail.com> Thu, 28 Apr 2016 17:10:10 +0200
diff --git a/debian/control b/debian/control
index 9866fd6..51fb4a1 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
quilt,
xutils-dev (>= 1:7.5+4),
asciidoc,
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/proto/x11proto-input.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/proto/x11proto-input.git
commit cbf8650ea0336d96cca1bf0ae42ec0995ed11345
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Thu Apr 28 17:13:06 2016 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 5b67ee3..fe5d600 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,56 @@
+commit 6946d497e3fe496818fa70de6702934bf70e44ec
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Apr 4 12:28:42 2016 +1000
+
+ inputproto 2.3.2
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 1dbdc297d915e4979a7823d6a569d9c7fed14617
+Author: Andreas Boll <andreas.boll....@gmail.com>
+Date: Fri Dec 11 10:49:33 2015 +0100
+
+ specs: Set TZ=UTC before calling asciidoc
+
+ Set TZ=UTC before calling asciidoc to make the embedded dates invariant
+ to timezones in order to make the package build reproducibly.
+
+ Fixes bug:
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795981
+
+ v2: Set TZ=UTC after $(AM_V_GEN) (fixes non-verbose build)
+
+ Suggested-by: Eduard Sanou <dh...@openmailbox.org>
+ Signed-off-by: Andreas Boll <andreas.boll....@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 7c7c2c18864d166391e49758d83e9cc601bbfb17
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Oct 27 14:22:58 2014 +1000
+
+ specs: rename EVENTMASK to EVTYPEMASK
+
+ EVENTMASK was used twice in the spec, once as the actual bitmask for
events,
+ once as the set of deviceid, mask length and mask.
+
+ The libXi public API uses XIEventMask for the latter data triplet, so leave
+ EVENTMASK, and rename the pure bitmask to EVTYPEMASK.
+
+ Reported-by: Gabriel Laskar <gabr...@lse.epita.fr>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Hans de Goede <hdego...@redhat.com>
+
+commit 81378a1e7139af9d476d90df8737c0c1a58670f3
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Aug 25 11:04:38 2014 +1000
+
+ specs: note the (unused) time field in XIPassiveGrabDevice
+
+ We don't actually use it either in libXi or in the server, it's a
copy/paste
+ error that never got noticed and removed.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
commit 343ff0938f592876b9d82c966f166bf45a78c3c8
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Fri May 30 11:25:39 2014 +1000
diff --git a/debian/changelog b/debian/changelog
index 0c61551..71c1264 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
-x11proto-input (2.3.1-2) UNRELEASED; urgency=medium
+x11proto-input (2.3.2-1) UNRELEASED; urgency=medium
- * Cherry-pick 1dbdc29 (specs: Set TZ=UTC before calling asciidoc) from
- upstream (Closes: #795981). Thanks, Eduard Sanou!
+ * New upstream release
+ - specs: Set TZ=UTC before calling asciidoc
+ (Closes: #795981). Thanks, Eduard Sanou!
* Bump debhelper compat level to 9.
* Update Vcs fields to use https.
* control: Bump Standards-Version to 3.9.7 (no changes).
* Let uscan verify tarball signatures.
- -- Andreas Boll <andreas.boll....@gmail.com> Fri, 01 Apr 2016 11:42:48 +0200
+ -- Andreas Boll <andreas.boll....@gmail.com> Thu, 28 Apr 2016 17:10:10 +0200
x11proto-input (2.3.1-1) unstable; urgency=medium
commit de9bfa6020ca43c4eda8045334704e04a77d4bfc
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Thu Apr 28 17:09:12 2016 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index 70345b6..0c61551 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11proto-input (2.3.1-2) UNRELEASED; urgency=medium
* Bump debhelper compat level to 9.
* Update Vcs fields to use https.
* control: Bump Standards-Version to 3.9.7 (no changes).
+ * Let uscan verify tarball signatures.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 01 Apr 2016 11:42:48 +0200
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..767d86a
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,23 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBD8b0wYRBACph9kRJmP+4+JGsCgFlFoy4vFO0DCG+jmkQN0n1wdInt/N/UtA
+sZToO72AUmfmYizA+IEbzBrx0UnUo3w3BDmHxUWf/akZiPUz9AA/YFY4xC3MY2OK
+VN2Jz6YSce4zJ5jd2ZRobHm4HuIf/8yqSCcsv7FNfrLaTNIFRs5gYYsqZwCgwmkp
+RSLRc8WAnHrTWNQDaEFM2rUEAKTjrTjMN8+KGd0BxNX7HiTSqQP++nXNwAYs1oWB
+Yt82YHj9SvRCqCzD1pzJQivYnlNoWDza1VeMnfdAvkdia8z4lYbO/RunXZJvra3Z
+VDm+izq+uwUAyvFuEYnNz09VSqwXKT6+XW0Xtz2vHq52r6DS6mK8cGJHZ5OhrRjq
+UEYxA/9STh+QfA98xtNoRcf52E/46r7IpCj440oRVc9lMfxQZrLGQNqp7sPdIhGQ
+CCo2NUII5hkhdAG71kpbfSXU4Sh32p1cU1KYCAkDFfb49bKuAs+Pff8v6FGZxTdd
+AinPZr4BbsYJatk818aTCnu0+s7L8jL5GPfeyuyEMKwzVBx2mLQpUGV0ZXIgSHV0
+dGVyZXIgKFdoby1UKSA8b2ZmaWNlQHdoby10Lm5ldD6IWQQTEQIAGQUCPxvTBgQL
+BwMCAxUCAwMWAgECHgECF4AACgkQ4jt+cLRn8L/0RACfWo3KTMUg+uPRqA6RXxk0
+4CWjXaMAoJeIxOpZLB3RBltPnSi7PyVQIkHFuQENBD8b0wgQBACTnqOYOWYVR8O1
+D73J6nbdAeZCbXrUkyXIuyqBOdKmX/0QJmSs7Wfsa+hPfDhj6ai0Gs2C8Qg/0Pzk
+86b4p9DLkf0M6RaYjUtCJBpS59xrsV6nz6xZzQa4RRdf1YJmw2tia1MMXzxbwQU2
+bKpYEm8NsGaBURMGd02EvsMN2wI2uwADBQP/e9MjVr/85XDzAlUBN8HwYW5szTyP
+8ZVcQOqOmNebkTWGLvkPrBdXmxpzrWjxPolO1WcWQjUL0bN/rbdqefT65iVHJHJZ
+/cpTtgGlCPhL5JTA50ltd0I13CABYWLFmswonXES/6tcglf4rr3Nri2sOrY5HggP
+ipEzOo5vdKOow/qIRgQYEQIABgUCPxvTCAAKCRDiO35wtGfwv68jAKCDvL2gkrg1
+4NfV7rNc057K1nL2GgCeKApWRgGVzaOkAp0P5tQulaDD6zM=
+=7uBX
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 05f82dd..17926be 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/proto/inputproto
version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
http://xorg.freedesktop.org/releases/individual/proto/ inputproto-(.*)\.tar\.gz
commit 6946d497e3fe496818fa70de6702934bf70e44ec
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Mon Apr 4 12:28:42 2016 +1000
inputproto 2.3.2
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 56115df..7480425 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([InputProto], [2.3.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [2.3.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_WITH_ASCIIDOC
commit 1dbdc297d915e4979a7823d6a569d9c7fed14617
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Fri Dec 11 10:49:33 2015 +0100
specs: Set TZ=UTC before calling asciidoc
Set TZ=UTC before calling asciidoc to make the embedded dates invariant
to timezones in order to make the package build reproducibly.
Fixes bug:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795981
v2: Set TZ=UTC after $(AM_V_GEN) (fixes non-verbose build)
Suggested-by: Eduard Sanou <dh...@openmailbox.org>
Signed-off-by: Andreas Boll <andreas.boll....@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/specs/Makefile.am b/specs/Makefile.am
index a83cf40..f2454bc 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -6,7 +6,7 @@ doc_DATA = XI2proto.html XIproto.html
dist_doc_DATA = XI2proto.txt XIproto.txt
%.html: %.txt
- $(AM_V_GEN)$(ASCIIDOC) -o $@ $<
+ $(AM_V_GEN)TZ=UTC $(ASCIIDOC) -o $@ $<
CLEANFILES = $(doc_DATA)
commit 7c7c2c18864d166391e49758d83e9cc601bbfb17
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Mon Oct 27 14:22:58 2014 +1000
specs: rename EVENTMASK to EVTYPEMASK
EVENTMASK was used twice in the spec, once as the actual bitmask for events,
once as the set of deviceid, mask length and mask.
The libXi public API uses XIEventMask for the latter data triplet, so leave
EVENTMASK, and rename the pure bitmask to EVTYPEMASK.
Reported-by: Gabriel Laskar <gabr...@lse.epita.fr>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
Reviewed-by: Hans de Goede <hdego...@redhat.com>
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index e3636ac..697dd89 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -672,9 +672,9 @@ Data types
device hierarchy. See Section "The Master/Slave device hierarchy"
for more information.
- EVENTMASK
- An EVENTMASK is a binary mask defined as (1 << event type).
- A SETofEVENTMASK is a binary OR of zero or more EVENTMASK.
+ EVTYPEMASK
+ An EVTYPEMASK is a binary mask defined as (1 << event type).
+ A SETofEVTYPEMASK is a binary OR of zero or more EVTYPEMASK.
FP1616
Fixed point decimal in 16.16 format as one INT16 and one CARD16.
@@ -971,7 +971,7 @@ XISelectEvents
EVENTMASK { deviceid: DEVICE,
mask_len: CARD16,
- mask: SETofEVENTMASK
+ mask: SETofEVTYPEMASK }
window
The window to select the events on.
@@ -1392,7 +1392,7 @@ XIGrabDevice
time: TIMESTAMP or CurrentTime
cursor: Cursor
mask_len: CARD16
- masks: SETofEVENTMASK
+ masks: SETofEVTYPEMASK
▶
status: Success, AlreadyGrabbed, Frozen, InvalidTime,
NotViewable
└───
@@ -1638,7 +1638,7 @@ XIPassiveGrabDevice
paired_device_mode: { Synchronous, Asynchronous }
num_modifiers: INT16
mask_len: CARD16
- masks: SETofEVENTMASK
+ masks: SETofEVTYPEMASK
modifiers: LISTofSETofMODIFIERMASK
▶
num_modifiers_return: INT16
commit 81378a1e7139af9d476d90df8737c0c1a58670f3
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Mon Aug 25 11:04:38 2014 +1000
specs: note the (unused) time field in XIPassiveGrabDevice
We don't actually use it either in libXi or in the server, it's a copy/paste
error that never got noticed and removed.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 2f81bef..e3636ac 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -1630,6 +1630,7 @@ XIPassiveGrabDevice
deviceid: DEVICE
detail: CARD32
grab_type: GRABTYPE
+ time: TIMESTAMP
grab_window: Window
cursor: Cursor
owner_events: Bool
@@ -1695,6 +1696,8 @@ on the specified input device.
Number of elements in modifiers_return
modifiers_return
XKB modifier state that could not be grabbed.
+ time
+ This field is unused.
If owner-events is False, input events generated from this device are
reported with respect to grab-window, and are only reported if
