~ubuntu-branches/ubuntu/natty/libxi/natty-201011191114

Viewing all changes in revision 21.

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-05-15 11:22:00 UTC
  • mfrom: (1.1.9 upstream) (0.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20090515112200-6jktycefsiq971sn
Tags: 2:1.2.1-2ubuntu1
* Merge with Debian experimental, remaining changes:
  - debian/control: libxi-dev Replaces x11proto-input-dev (<= 1.4.3-2)
  - copy XInput.h from inputproto 1.5.0, libxi-dev includes it.
    Upstream decided not to move it for 1.2.0, but we already had it so
    continue shipping it in libxi-dev.
  - 100_install_xinput.h.diff: Modify the Makefile.am to install
    XInput.h.
  - 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++.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: