From 196acee784cee02c641685f0decb978cbb00754c Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Tue, 2 Apr 2013 19:52:16 +0100
Subject: [PATCH] libusbx 1.0.15-rc1

* Also fix missing header in release tarball
---
 AUTHORS               |  4 +++-
 ChangeLog             | 13 +++++++++++++
 libusb/version.h      |  4 ++--
 libusb/version_nano.h |  2 +-
 tests/Makefile.am     |  2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 8fd762ec..060a89e4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,6 +22,7 @@ Dave Camarillo
 David Engraf
 David Moore
 Davidlohr Bueso
+Federico Manzan
 Felipe Balbi
 Francesco Montorsi
 Graeme Gill
@@ -47,7 +48,8 @@ Toby Peterson
 Trygve Laugstøl
 Uri Lublin
 Vasily Khoruzhick
+Vegard Storheil Eriksen
 Vitali Lovich
 Xiaofan Chen
 Zoltán Kovács
-Роман Донченко
+Роман Донченко
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index c22883bc..6860ae56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,19 @@
 For detailed information about the changes below, please see the git log or
 visit: http://log.libusbx.org
 
+2013-04-02: v1.0.15-rc1
+* Improve tranfer cancellation and avoid short read failures on broken descriptors
+* Filter out 8-bit characters in libusb_get_string_descriptor_ascii()
+* Add WinCE support
+* Add library stress tests
+* Add FX3 firmware upload support for fxload
+* Add HID and kernel driver detach support capabilities detection
+* Add SuperSpeed detection on OS X
+* Fix issues with autoclaim, composite HID devices, interface autoclaim and
+  early abort in libusb_close() on Windows. Also add VS 2012 solution files.
+* Improve fd event handling on Linux
+* Other bug fixes and improvements
+
 2012-09-26: v1.0.14
 * Reverts the previous API change with regards to bMaxPower.
   If this doesn't matter to you, you are encouraged to keep using v1.0.13,
diff --git a/libusb/version.h b/libusb/version.h
index 1970a018..7911755b 100644
--- a/libusb/version.h
+++ b/libusb/version.h
@@ -7,12 +7,12 @@
 #define LIBUSB_MINOR 0
 #endif
 #ifndef LIBUSB_MICRO
-#define LIBUSB_MICRO 14
+#define LIBUSB_MICRO 15
 #endif
 #ifndef LIBUSB_NANO
 #define LIBUSB_NANO 0
 #endif
 /* LIBUSB_RC is the release candidate suffix. Should normally be empty. */
 #ifndef LIBUSB_RC
-#define LIBUSB_RC ""
+#define LIBUSB_RC "-rc1"
 #endif
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 26d7735c..afba352a 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10634
+#define LIBUSB_NANO 10635
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e5d6d756..bf53f3f3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,4 +3,4 @@ LDADD = ../libusb/libusb-1.0.la
 
 noinst_PROGRAMS = stress
 
-stress_SOURCES = stress.c testlib.c
+stress_SOURCES = stress.c libusbx_testlib.h testlib.c