ChangeLog | 8 ++++++++
XInput.h | 9 ++++++++-
debian/changelog | 15 +++++++++++++++
3 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit dea7501b34d2649286770a48de9fd4a4923a98e3
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri May 15 11:34:41 2009 +0300
Release 1.5.0-2ubuntu1
update the changelog.
diff --git a/debian/changelog b/debian/changelog
index 4b09ce5..dcb080c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11proto-input (1.5.0-2ubuntu1) karmic; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - Don't install XInput.h, it's in libxi-dev now.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 15 May 2009 11:34:14 +0300
+
x11proto-input (1.5.0-2) unstable; urgency=low
* Pull from upstream: Protect _XiDevicePresenceNotifyEvent declaration
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); \
}
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
