Merge lp:~ubuntu-branches/ubuntu/natty/libxi/natty-201011191114 into lp:ubuntu/natty/libxi

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/libxi now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/libxi/natty-201011191114. A merge should be performed if necessary.

Unmerged revisions

25. By Cyril Brulebois on 2010-03-11

* Add udeb needed for the graphical installer: libxi6-udeb.
* Version/Bump some B-D to make sure the udeb gets its dependencies on
  the (recently-added) udebs rather than on the libraries:
   - libx11-dev
   - libxext-dev
* Add myself to Uploaders.

24. By Cyril Brulebois on 2010-03-03

[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
  good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
* Update patch from 2:1.3-2 to not crash if an app (like, say, anything
  using Qt3) calls libXi functions but the extension isn't available
  (closes: #568323). Thanks, Roman Mamedov!

[ Brice Goglin ]
* Remove Jamey Sharp and Josh Triplett from Uploaders, closes: #568276.

[ Cyril Brulebois ]
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
* Upload to unstable.

23. By Julien Cristau on 2010-01-06

* Initialize extension with the right number of events. This should fix
  issues when libXi announces more events than the X server will actually
  send for that extension, and thus smashes Xlib's event vector (closes:
  #515734, #515946). Patch by Peter Hutterer, analysis by Nathan Kidd.
* Upload to unstable.

22. By Julien Cristau on 2009-11-21

* Bump Standards-Version to 3.8.3.
* Add build-deps on xmlto and asciidoc to build the manpages.
* New upstream release.

21. By Timo Aaltonen on 2009-05-15

* 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++.

20. By Alberto Milone on 2009-05-08

[ 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).

19. By Timo Aaltonen on 2009-01-22

* 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.

18. By Timo Aaltonen on 2008-11-19

* Merge from debian unstable, remaining changes:
* 100_add_xinput.h.patch,
  101_fix_up_am_cflags.patch,
  102_input_properties.patch:
  - Add support for input-device properties.
* debian/control:
  - Build-depend on the new inputproto
  - libxi-dev Depends on the new inputproto, Replaces the old
  - Add Breaks for current gnome-control-center, gnome-settings-daemon
    and xinput because of the changed properties API.
* debian/libxi-dev.install:
  - Install XInput.h
* debian/rules:
  - Run autoreconf, and allow patching.
  - Bump the shlibs for libxi6

17. By Julien Cristau on 2008-11-17

New upstream release.

16. By Bryce Harrington on 2008-10-18

Rebuild due to x11proto-input fix in 283921