ChangeLog | 385 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
XI.h | 11 +
XInput.h | 82 +++++++++++
XIproto.h | 143 +++++++++++++++++++-
configure.ac | 2
debian/changelog | 15 ++
debian/control | 2
debian/rules | 2
mkinstalldirs | 161 -----------------------
9 files changed, 634 insertions(+), 169 deletions(-)
New commits:
commit 5702f6337d3c80e876a7f42bbcc177602da4d5d5
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Feb 15 21:10:44 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 30fd48b..fef502b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-x11proto-input (1.5.0-2) UNRELEASED; urgency=low
+x11proto-input (1.5.0-2) unstable; urgency=low
* Pull from upstream: Protect _XiDevicePresenceNotifyEvent declaration
against C++ includes.
+ * Upload to unstable.
- -- Julien Cristau <jcris...@debian.org> Sun, 15 Feb 2009 21:09:42 +0100
+ -- Julien Cristau <jcris...@debian.org> Sun, 15 Feb 2009 21:10:05 +0100
x11proto-input (1.5.0-1) experimental; urgency=low
commit ff318f3410b883defb958cb83299cbe47d8fea72
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Feb 15 21:09:57 2009 +0100
Update changelogs
diff --git a/ChangeLog b/ChangeLog
index c04e4d6..6b53b3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+commit 60c449cbb1769569ed5e98c75f26bd15627bd146
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Dec 15 12:16:10 2008 +1000
+
+ Protect _XiDevicePresenceNotifyEvent declaration against C++ includes.
#19075
+
+ X.Org Bug 19075 <http://bugs.freedesktop.org/show_bug.cgi?id=19075>
+
commit d38e79ca3ddd6031ca4a335eb2faf99294a6731f
Author: Peter Hutterer <peter.hutte...@redhat.com>
Date: Wed Nov 26 21:37:06 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index 96f1427..30fd48b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11proto-input (1.5.0-2) UNRELEASED; urgency=low
+
+ * Pull from upstream: Protect _XiDevicePresenceNotifyEvent declaration
+ against C++ includes.
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 15 Feb 2009 21:09:42 +0100
+
x11proto-input (1.5.0-1) experimental; urgency=low
* New upstream release.
commit 60c449cbb1769569ed5e98c75f26bd15627bd146
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Mon Dec 15 12:16:10 2008 +1000
Protect _XiDevicePresenceNotifyEvent declaration against C++ includes.
#19075
X.Org Bug 19075 <http://bugs.freedesktop.org/show_bug.cgi?id=19075>
diff --git a/XInput.h b/XInput.h
index 702706d..3092e62 100644
--- a/XInput.h
+++ b/XInput.h
@@ -156,9 +156,16 @@ SOFTWARE.
#define NoExtensionEvent(d,type,_class) \
{ _class = ((XDevice *) d)->device_id << 8 | _noExtensionEvent;}
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+ extern int _XiGetDevicePresenceNotifyEvent(Display *);
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
#define DevicePresence(dpy, type, _class) \
{ \
- extern int _XiGetDevicePresenceNotifyEvent(Display *); \
type = _XiGetDevicePresenceNotifyEvent(dpy); \
_class = (0x10000 | _devicePresence); \
}
commit eb62b09673db50ddcb8a3dc40a34eb1bf30003ed
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Dec 19 15:27:38 2008 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index efa96e1..96f1427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11proto-input (1.5.0-1) UNRELEASED; urgency=low
+x11proto-input (1.5.0-1) experimental; urgency=low
* New upstream release.
* Drop unused build-dep on libtool.
- -- Julien Cristau <jcris...@debian.org> Fri, 19 Dec 2008 15:14:43 +0100
+ -- Julien Cristau <jcris...@debian.org> Fri, 19 Dec 2008 15:27:32 +0100
x11proto-input (1.4.4-1) unstable; urgency=low
commit 60d8756526778f0b80f20a3dcee6155a1dfd3fc8
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Dec 19 15:25:17 2008 +0100
add upstream changelog
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..c04e4d6
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,377 @@
+commit d38e79ca3ddd6031ca4a335eb2faf99294a6731f
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Wed Nov 26 21:37:06 2008 +1000
+
+ inputproto 1.5.0
+
+commit 5829370cafb112e488156e7ac1dd7902cfd1659a
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Mon Nov 17 10:58:31 2008 +1000
+
+ Remove Configure/QueryDeviceProperty.
+ (cherry picked from commit 18ef04f8a2026cca5d2d2b796ec2ea1c949bad36)
+
+ Removing Configure/QueryDevice property from XInput.h as well.
+ Not cherry-picked as XInput.h is moved to libXi in master.
+
+ Conflicts:
+
+ XIproto.h
+
+commit 6a4aefa04bb95c05d223027cebbe83c4117829f0
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Thu Sep 18 16:28:09 2008 +0930
+
+ Add XI_JOYSTICK type.
+ (cherry picked from commit c9454a8e84b2dce54bb346ff1aafb32e3c0ac5b9)
+
+commit 6af8447fab4a06d943398e6540e6b869d8a714ae
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Mon Nov 17 10:13:15 2008 +1000
+
+ Undef Atom after we're done so we don't pollute users of XIproto.h
+ (cherry picked from commit 36c8a6f3faf56a8f8ca31455812c9132b379b1b3)
+
+ Conflicts:
+
+ XIproto.h
+
+commit 72fb0941fff83f00fb039f865edcf5d25584757c
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Mon Nov 17 10:12:50 2008 +1000
+
+ Make sure Atoms are defined as CARD32.
+ (cherry picked from commit c919917e375aefaf473570c1b25b3c22231e858d)
+
+ Conflicts:
+
+ XIproto.h
+
+commit 6ee1ad8951ff811dc2618c9bd26cd42096ab2ecc
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Fri Aug 15 14:21:24 2008 +0930
+
+ Remove RCS tags, typo fix.
+ (cherry picked from commit c2d47b04c55cf72aef6c13a9e2cc4b41abfca673)
+
+commit d81ca85c4bcdcab208e4731a5d0f7d9bffbfab67
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Fri Oct 31 17:53:39 2008 +1030
+
+ PropertyNotify, move deviceid back to last byte.
+
+ This way, it can be type-cast to deviceKeyButtonPointer to extract the
+ deviceid, which is (aside from time) the only thing it has in common with
+ those anyway.
+ (cherry picked from commit f8064629496c6061bedb7a99b788fb9d3a170f11)
+
+commit e22b0ace88447a87c0b19d062a678880529b1b3b
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Mon Aug 25 11:34:47 2008 +0930
+
+ Add libXi's property interfaces.
+
+ XInput.h was removed from inputproto, hence this commit is not a
cherry-pick
+ but a copy of the changes to XInput.h in libXi.
+
+commit 0a87cb3aac72adbbb81c7ac7ac04551547bf8b56
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Fri Aug 15 14:50:23 2008 +0930
+
+ Protect against C++ includes.
+ (cherry picked from commit fabe087cebb11c6a2600e57c6f7a52fda2efea29)
+
+commit e507aaaa74eeb02896843eb1815b614adf47a24a
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Mon Aug 25 10:19:37 2008 +0930
+
+ Back out Device Properties from XI 2, push into XI 1.5.
+ (cherry picked from commit 7c9620d8232e5c05115746055a832363a528ac2d)
+
+ Conflicts:
+
+ XI.h
+ XIproto.h
+
+commit c109e2ddb9cab22f185a877ab7e48002d1087400
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Jul 29 09:10:09 2008 +0930
+
+ inputproto 1.4.4
+
+commit f41d153886c3519ebaf767f9c0d3281b6adce030
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Jul 29 08:58:53 2008 +0930
+
+ Add DeviceControlChanged define.
+
+ This value is used for the devchange field in the DevicePresenceNotify
event
+ when a device's control has been modified.
+ (cherry picked from commit 0daf8328cfa90b038753fc409c5eb05ba3fac6d5)
+
+commit 852568991b251e9366da167f1b746a0a1db6adf0
+Author: Adam Jackson <a...@redhat.com>
+Date: Mon Mar 10 09:31:51 2008 -0400
+
+ Typo fix.
+
+commit b5cbe2d93f6c0129b8f29da97778f6d1b15c38f9
+Author: Adam Jackson <a...@redhat.com>
+Date: Mon Mar 10 09:08:21 2008 -0400
+
+ C sucks: define XEventClass in terms of unsigned int, not CARD32.
+
+ Apparently pulling in Xmd.h here breaks qt, since they both define an
+ INT32 type (and incompatible ones even, since Xmd's is unsigned long on
+ ILP32 because whoever wrote Xmd.h is a C novice).
+
+commit 3edc1bf23b07ea47d7e1e32047e15c67333c663e
+Author: Adam Jackson <a...@redhat.com>
+Date: Wed Mar 5 22:06:19 2008 -0500
+
+ inputproto 1.4.3
+
+commit 096b20bf5492d248b5c8ff0c1c28e221d59db724
+Author: Jesse Barnes <jesse.bar...@intel.com>
+Date: Mon Jan 21 15:28:49 2008 -0800
+
+ Use Xmd.h instead of X.h to pull in CARD32 definition
+
+ On 64 bit hosts, CARD32 may be undefined unless we use Xmd.h to define it
for
+ us. Apparently X.h is no longer sufficient.
+
+commit 9359e625787761e6b3df15f29bbf842c67a9516d
+Author: James Cloos <cl...@jhcloos.com>
+Date: Thu Dec 6 16:39:02 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 4b22047f347d8fd65a36b2fc90e1a87dff8e93e3
+Author: Eamon Walsh <ewa...@tycho.nsa.gov>
+Date: Thu Sep 27 12:27:19 2007 -0400
+
+ XI.h needs X.h for CARD32 on 64-bit systems.
+
+commit f033750780b74d72056da93fd9a91140a978891b
+Merge: 369dd28... 96b0c13...
+Author: James Cloos <cl...@jhcloos.com>
+Date: Mon Sep 3 06:17:20 2007 -0400
+
+ Merge branch 'master' of
ssh://git.freedesktop.org/git/xorg/proto/inputproto
+
+commit 369dd283cfcf006e2cfe3496ebc5157839a3d04e
+Author: James Cloos <cl...@jhcloos.com>
+Date: Mon Sep 3 05:54:06 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 96b0c13a5a689b3a6dbc4249ca4ef364f778c003
+Author: Peter Hutterer <pe...@cs.unisa.edu.au>
+Date: Fri Aug 31 17:58:27 2007 +0930
+
+ Bump to 1.4.2.1
+
+ No source changes, the 1.4.2 tarball had a busted configure script.
+
+commit 310a93f8e194aa070b0f1d40c8fd5ae941908dbe
+Author: Peter Hutterer <pe...@cs.unisa.edu.au>
+Date: Thu Apr 26 11:06:18 2007 +0930
+
+ bump to 1.4.2
+
+commit c9bed7d4750c314002c16430a4dd75f95cc2f78d
+Author: Peter Hutterer <pe...@cs.unisa.edu.au>
+Date: Tue Apr 24 22:53:27 2007 +0930
+
+ Add flags to be used for DevicePrensence's devchange field.
+
+commit c608d82c6b5b87ddc8d14862f528bdd69f5f5b72
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Thu Feb 15 16:33:07 2007 +0200
+
+ bump to 1.4.1
+
+commit ad2edb61ffd8baf87b9ab249aa36b0c04a765f79
+Author: Peter Hutterer <pe...@cs.unisa.edu.au>
+Date: Tue Jan 9 13:32:39 2007 +1030
+
+ Fix typo in DevicePresence() macro
+
+commit a0be30da79e35e7d503c6eeb9021c2f63beb2176
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Sun Oct 22 16:40:11 2006 +0300
+
+ DeviceAbs{Area,Calib}: properly align 32-bit types
+ Decorate CARD32s and INT32s with B32.
+
+commit b1b3dbfd9b00d47c84c213bc6b7d61c5e8c80466
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Sun Oct 22 16:30:56 2006 +0300
+
+ DevicePresenceNotify: add deviceid field, with explanation
+ Add deviceid field, and an explanation of same in XInput.h.
+ deviceid is only used if a specific device changed, and control
+ is non-zero if a specific control on that device changed.
+
+commit 06ffd1e6b600d4e3f55ce7da69448a284ff5dac6
+Author: Zephaniah E. Hull <w...@agamemnon.b5>
+Date: Sat Oct 21 03:58:53 2006 -0400
+
+ DEVICE_TOUCHPAD -> DEVICE_ABS_CALIB.
+
+ As it's really calibration for absolute devices, add some stuff.
+
+ DEVICE_ABS_AREA
+
+ Defines the area of the screen that an absolute device covers if it is
sending
+ core events.
+
+commit 1fab95863efc2bbf9a5b836b3de31da4a956b4bd
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Fri Oct 20 00:33:13 2006 +0300
+
+ add DEVICE_ENABLE control, add core indication
+ Add DEVICE_ENABLE control, which allows specific devices to be
+ enabled or disabled at runtime.
+ Add 'iscore' flag to DEVICE_CORE, which indicates whether or not the
+ device is a virtual core device.
+
+commit 926251a486b57197d735a426887acad6fdfd7dc6
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Tue Jul 18 11:56:37 2006 -0400
+
+ add XExtensionKeyboard and XExtensionPointer classes
+ Add two new classes of device, XExtensionKeyboard, and XExtensionPointer.
+
+commit 7a4a2a3e733378abced0a184627adfda4ed387b9
+Author: Daniel Stone <daniel.st...@nokia.com>
+Date: Mon Jul 17 19:34:45 2006 -0400
+
+ add DevicePresenceNotify event, clean up
+ Add DevicePresenceNotify event, which indicates that something in the
device
+ list changed (Kristian Høgsberg, Red Hat).
+ Add a core event control, which toggles the sending or not of core events
by
+ an extended device.
+ Clean up some random detritus from the MetroLink merge.
+
+commit 6767671f502964d385aa41de3a45fb479c6330c0
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Fri Jul 14 18:56:18 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 4cc2697880ae61723094dacf78ffe77d81f6e0ee
+Author: Kevin E Martin <k...@kem.org>
+Date: Thu Dec 15 00:24:37 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 3ade2fe8443f572abeee73b4fa8e986e4a054017
+Author: Kevin E Martin <k...@kem.org>
+Date: Wed Oct 19 02:48:14 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 67498db2df7435d9d59eda4ac444c6560da839b3
+Author: Eric Anholt <anh...@freebsd.org>
+Date: Tue Aug 2 19:19:38 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 742a1eb222d662fc9247ab7c1bd337ffef01eafb
+Author: Kevin E Martin <k...@kem.org>
+Date: Fri Jul 29 21:22:55 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 9161a356397a07002e03cf1846d212c7154f4c52
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Sat May 21 04:04:21 2005 +0000
+
+ Set version to 1.3.
+
+commit 492f0a9e16bfe9cfb2c7b888b5b5e511db2bf83b
+Author: Adam Jackson <a...@nwnk.net>
+Date: Thu May 19 00:22:39 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit ec71e17293b90ff5eeaa97566751fc5c3955904a
+Author: Adam Jackson <a...@nwnk.net>
+Date: Thu May 19 00:10:18 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 242316c65e53d1bba244e4f35e5a93718b0ea8d0
+Author: Josh Triplett <j...@speakeasy.net>
+Date: Mon May 16 03:30:03 2005 +0000
+
+ Add COPYING file for Input.
+
+commit 5c5945a47990b7bc077bcfdbabb6e0003cbf1659
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Date: Mon May 9 18:20:04 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 518f527ab685d2d082796460113bb7a9ea9bfe15
+Author: Kevin E Martin <k...@kem.org>
+Date: Fri May 6 01:46:30 2005 +0000
+
+ Initial build system files for proto module.
+
+commit 4254b2967e3c5f256138f35de1ab49efff87220c
+Author: Egbert Eich <e...@suse.de>
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit ca910a158bdc060d17cf3c00f93c82c3a6ee6f05
+Author: Egbert Eich <e...@suse.de>
+Date: Sun Mar 14 08:31:35 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 08e413c25f385e51466ef3309d880c1f63bf0a73
+Author: Egbert Eich <e...@suse.de>
+Date: Wed Mar 3 12:10:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 1b98dbf2eab5a8ef74afda0c669c9fdfc6461cda
+Author: Egbert Eich <e...@suse.de>
+Date: Thu Feb 26 13:35:11 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit f276a601f272742ea8570fae4326c172cf4b8723
+Author: Egbert Eich <e...@suse.de>
+Date: Thu Feb 26 09:22:27 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 47d36cccfdf0e65848bb2e9595779501a76d6000
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Tue Nov 25 19:28:02 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 4383a95e0bbc2f09394deefc453c2edd1c813d0f
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Fri Nov 14 16:48:42 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 51468f1607f0b88576628c89e85d159afbb4628e
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Fri Nov 14 15:54:35 2003 +0000
+
+ R6.6 is the Xorg base-line
commit 977d3d6cf29ed2d884485e01c51fe3339b707131
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Dec 19 15:21:57 2008 +0100
Drop unused build-dep on libtool.
And remove one more generated file
diff --git a/debian/changelog b/debian/changelog
index 9cfc54a..efa96e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11proto-input (1.5.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Drop unused build-dep on libtool.
-- Julien Cristau <jcris...@debian.org> Fri, 19 Dec 2008 15:14:43 +0100
diff --git a/debian/control b/debian/control
index b349609..80ef51c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon
<dilin...@debian.org>, Drew Parsons <dpars...@debian.org>, Julien Cristau
<jcris...@debian.org>
-Build-Depends: debhelper (>= 5), automake, libtool, xutils-dev
+Build-Depends: debhelper (>= 5), automake, xutils-dev
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-input
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-input.git
diff --git a/debian/rules b/debian/rules
index 72a6933..8dcf7de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,7 @@ clean: xsfclean
rm -rf autom4te.cache */autom4te.cache
rm -rf obj-*
rm -f $$(find -name Makefile.in)
- rm -f configure install-sh missing aclocal.m4
+ rm -f configure install-sh missing aclocal.m4 mkinstalldirs
dh_clean
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100755
index ef7e16f..0000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,161 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2006-05-11.19
-
-# Original author: Noah Friedman <fried...@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-autom...@gnu.org> or send patches to
-# <automake-patc...@gnu.org>.
-
-nl='
-'
-IFS=" "" $nl"
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-autom...@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage"
- exit $?
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --version)
- echo "$0 $scriptversion"
- exit $?
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error. This is a problem when calling mkinstalldirs
-# from a parallel make. We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
- '')
- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- test -d ./-p && rmdir ./-p
- test -d ./--version && rmdir ./--version
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
- test ! -d ./--version; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- else
- # Clean up after NextStep and OpenStep mkdir.
- for d in ./-m ./-p ./--version "./$dirmode";
- do
- test -d $d && rmdir $d
- done
- fi
- ;;
-esac
-
-for file
-do
- case $file in
- /*) pathcomp=/ ;;
- *) pathcomp= ;;
- esac
- oIFS=$IFS
- IFS=/
- set fnord $file
- shift
- IFS=$oIFS
-
- for d
- do
- test "x$d" = x && continue
-
- pathcomp=$pathcomp$d
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
- lasterr=
- chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
- fi
- fi
-
- pathcomp=$pathcomp/
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
commit ddf87bf0c17b334e4113431430fc64384793f03a
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Dec 19 15:17:21 2008 +0100
update changelog
diff --git a/debian/changelog b/debian/changelog
index e2e8666..9cfc54a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-input (1.5.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcris...@debian.org> Fri, 19 Dec 2008 15:14:43 +0100
+
x11proto-input (1.4.4-1) unstable; urgency=low
[ Timo Aaltonen ]
commit d38e79ca3ddd6031ca4a335eb2faf99294a6731f
Author: Peter Hutterer <peter.hutte...@redhat.com>
Date: Wed Nov 26 21:37:06 2008 +1000
inputproto 1.5.0
diff --git a/configure.ac b/configure.ac
index b343465..56b9bc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.5.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
commit 5829370cafb112e488156e7ac1dd7902cfd1659a
Author: Peter Hutterer <peter.hutte...@redhat.com>
Date: Mon Nov 17 10:58:31 2008 +1000
Remove Configure/QueryDeviceProperty.
(cherry picked from commit 18ef04f8a2026cca5d2d2b796ec2ea1c949bad36)
Removing Configure/QueryDevice property from XInput.h as well.
Not cherry-picked as XInput.h is moved to libXi in master.
Conflicts:
XIproto.h
diff --git a/XI.h b/XI.h
index 878ba0f..7c8c111 100644
--- a/XI.h
+++ b/XI.h
@@ -108,9 +108,6 @@ SOFTWARE.
#define sz_xChangeDeviceControlReply 32
#define sz_xListDevicePropertiesReq 8
#define sz_xListDevicePropertiesReply 32
-#define sz_xQueryDevicePropertyReq 12
-#define sz_xQueryDevicePropertyReply 32
-#define sz_xConfigureDevicePropertyReq 12
#define sz_xChangeDevicePropertyReq 20
#define sz_xDeleteDevicePropertyReq 12
#define sz_xGetDevicePropertyReq 24
diff --git a/XInput.h b/XInput.h
index 34fbb33..702706d 100644
--- a/XInput.h
+++ b/XInput.h
@@ -1244,23 +1244,6 @@ extern void XChangeDeviceProperty(
int /* nelements */
);
-extern XIPropertyInfo* XQueryDeviceProperty(
- Display* /* dpy */,
- XDevice* /* dev */,
- Atom /* property */
-);
-
-extern void
-XConfigureDeviceProperty(
- Display* /* dpy */,
- XDevice* /* dev */,
- Atom /* property */,
- Bool /* pending */,
- Bool /* range */,
- int /* num_values */,
- long* /* values */
-);
-
extern void
XDeleteDeviceProperty(
Display* /* dpy */,
@@ -1276,7 +1259,6 @@ XGetDeviceProperty(
long /* offset*/,
long /* length*/,
Bool /* delete*/,
- Bool /* pending*/,
Atom /* req_type*/,
Atom* /* actual_type*/,
int* /* actual_format*/,
diff --git a/XIproto.h b/XIproto.h
index c84fe39..eef3ee8 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -159,11 +159,9 @@ struct tmask
#define X_ChangeDeviceControl 35
/* XI 1.5 */
#define X_ListDeviceProperties 36
-#define X_QueryDeviceProperty 37
-#define X_ConfigureDeviceProperty 38
-#define X_ChangeDeviceProperty 39
-#define X_DeleteDeviceProperty 40
-#define X_GetDeviceProperty 41
+#define X_ChangeDeviceProperty 37
+#define X_DeleteDeviceProperty 38
+#define X_GetDeviceProperty 39
/*********************************************************
*
@@ -1454,55 +1452,6 @@ typedef struct {
/*********************************************************
*
- * QueryDeviceProperty.
- *
- */
-
-typedef struct {
- CARD8 reqType; /* input extension major opcode */
- CARD8 ReqType; /* always X_QueryDeviceProperty */
- CARD16 length B16;
- Atom property B32;
- CARD8 deviceid;
- CARD8 pad0;
- CARD16 pad1 B16;
-} xQueryDevicePropertyReq;
-
-typedef struct {
- CARD8 repType; /* X_Reply */
- CARD8 RepType; /* always X_QueryDeviceProperty */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- BOOL pending;
- BOOL range;
- BOOL immutable;
- BOOL fromClient; /* TRUE if allocated by client */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xQueryDevicePropertyReply;
-
-/*********************************************************
- *
- * ConfigureDeviceProperty.
- *
- */
-
-typedef struct {
- CARD8 reqType; /* input extension major opcode */
- CARD8 ReqType; /* always X_ConfigureDeviceProperty */
- CARD16 length B16;
- Atom property B32;
- CARD8 deviceid;
- BOOL pending;
- BOOL range;
- CARD8 pad;
-} xConfigureDevicePropertyReq;
-
-/*********************************************************
- *
* ChangeDeviceProperty.
*
*/
@@ -1556,8 +1505,7 @@ typedef struct {
#else
BOOL delete;
#endif
- BOOL pending;
- CARD8 pad;
+ CARD16 pad;
} xGetDevicePropertyReq;
typedef struct {
commit 6a4aefa04bb95c05d223027cebbe83c4117829f0
Author: Peter Hutterer <peter.hutte...@redhat.com>
Date: Thu Sep 18 16:28:09 2008 +0930
Add XI_JOYSTICK type.
(cherry picked from commit c9454a8e84b2dce54bb346ff1aafb32e3c0ac5b9)
diff --git a/XI.h b/XI.h
index 822d5c1..878ba0f 100644
--- a/XI.h
+++ b/XI.h
@@ -136,6 +136,7 @@ SOFTWARE.
#define XI_EYETRACKER "EYETRACKER"
#define XI_CURSORKEYS "CURSORKEYS"
#define XI_FOOTMOUSE "FOOTMOUSE"
+#define XI_JOYSTICK "JOYSTICK"
#define Dont_Check 0
#define XInput_Initial_Release 1
commit 6af8447fab4a06d943398e6540e6b869d8a714ae
Author: Peter Hutterer <peter.hutte...@redhat.com>
Date: Mon Nov 17 10:13:15 2008 +1000
Undef Atom after we're done so we don't pollute users of XIproto.h
(cherry picked from commit 36c8a6f3faf56a8f8ca31455812c9132b379b1b3)
Conflicts:
XIproto.h
diff --git a/XIproto.h b/XIproto.h
index 410347f..c84fe39 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -1799,5 +1799,6 @@ typedef struct
#undef Window
#undef Time
#undef KeyCode
+#undef Atom
#endif
commit 72fb0941fff83f00fb039f865edcf5d25584757c
Author: Peter Hutterer <peter.hutte...@redhat.com>
Date: Mon Nov 17 10:12:50 2008 +1000
Make sure Atoms are defined as CARD32.
(cherry picked from commit c919917e375aefaf473570c1b25b3c22231e858d)
Conflicts:
XIproto.h
diff --git a/XIproto.h b/XIproto.h
index 6870ef0..410347f 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -54,6 +54,7 @@ SOFTWARE.
#define Window CARD32
#define Time CARD32
#define KeyCode CARD8
+#define Atom CARD32
/*********************************************************
*
commit 6ee1ad8951ff811dc2618c9bd26cd42096ab2ecc
Author: Peter Hutterer <peter.hutte...@redhat.com>
Date: Fri Aug 15 14:21:24 2008 +0930
Remove RCS tags, typo fix.
(cherry picked from commit c2d47b04c55cf72aef6c13a9e2cc4b41abfca673)
diff --git a/XIproto.h b/XIproto.h
index 67c4755..6870ef0 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -1,5 +1,3 @@
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
