diff -u libxi-1.2.0/debian/changelog libxi-1.2.0/debian/changelog
--- libxi-1.2.0/debian/changelog
+++ libxi-1.2.0/debian/changelog
@@ -1,3 +1,12 @@
+libxi (2:1.2.0-1ubuntu2) jaunty; urgency=low
+
+  [ Alberto Milone ]
+  * debian/patches/101_fix_devicepresence_declaration_cplusplus.diff:
+    - Use extern "C" in the declaration for DevicePresence (in 
+      XInput.h) so that it can be accessed from C++ (LP: #373711).
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 08 May 2009 15:54:37 +0200
+
 libxi (2:1.2.0-1ubuntu1) jaunty; urgency=low
 
   * Merge with Debian experimental, remaining changes:
diff -u libxi-1.2.0/debian/patches/series libxi-1.2.0/debian/patches/series
--- libxi-1.2.0/debian/patches/series
+++ libxi-1.2.0/debian/patches/series
@@ -1,0 +2 @@
+101_fix_devicepresence_declaration_cplusplus.diff
only in patch2:
unchanged:
--- libxi-1.2.0.orig/debian/patches/101_fix_devicepresence_declaration_cplusplus.diff
+++ libxi-1.2.0/debian/patches/101_fix_devicepresence_declaration_cplusplus.diff
@@ -0,0 +1,24 @@
+Index: libxi/include/X11/extensions/XInput.h
+===================================================================
+--- libxi-1.2.0.orig/include/X11/extensions/XInput.h	2009-05-08 15:25:01.000000000 +0200
++++ libxi-1.2.0/include/X11/extensions/XInput.h	2009-05-08 15:40:12.000000000 +0200
+@@ -156,9 +156,18 @@
+ #define NoExtensionEvent(d,type,_class) \
+     { _class =  ((XDevice *) d)->device_id << 8 | _noExtensionEvent;}
+ 
++
++/* We need the declaration for DevicePresence. */
++#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);                  \
+     }