---
 CMakeLists.txt |    4 ++--
 ChangeLog      |   17 +++++++++++++++++
 UPGRADING.txt  |   28 ++++++++++++++++++++++++++++
 configure.ac   |    2 +-
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 UPGRADING.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe1d8d5..6a98870 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,8 @@ project ( openobex C )
 #
 # The project version
 #
-set ( VERSION_MAJOR 1 )
-set ( VERSION_MINOR 6 )
+set ( VERSION_MAJOR 2 )
+set ( VERSION_MINOR 0 )
 set ( VERSION_PATCH 0 )
 set ( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}" )
 if ( VERSION_PATCH GREATER 0 )
diff --git a/ChangeLog b/ChangeLog
index fccdd41..517d347 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+ver 2.0:
+       Add support for Obex-over-L2CAP (experimental)
+       Add support for Single Response Mode (experimental)
+       Add manpages for the example applications
+       Add udev helper (Linux only)
+       Extend USB support with support for libusb-1.x and updated CDC spec
+       Add new custom transport read() callback
+       Add flag OBEX_FL_CLOEXEC to better support multi-threading
+       Add flag OBEX_FL_NONBLOCK to create non-blocking sockets
+       Add new definitions from OBEX 1.3 errata: ACTION command and headers
+       Updated discovery API
+       Add support for discovery of IrDA devices
+       Add a new stricter event callback
+       Remove deprecated functions and definitions
+       Add support for compiling with gcc-4.6 and Microsoft Visual C++ 10
+       Lots of internal fixes, cleanups and improvements
+
 ver 1.5:
        Revert USB changes that broke the ABI.
        Add more documentation and update manual pages.
diff --git a/UPGRADING.txt b/UPGRADING.txt
new file mode 100644
index 0000000..bf3cbc2
--- /dev/null
+++ b/UPGRADING.txt
@@ -0,0 +1,28 @@
+Upgrade guide from previous version of openobex
+===============================================
+
+
+version 1.5 -> 2.0
+------------------
+
+This version introduces a stricter event callback:
+       obex_event_t -> obex_event_cb_t
+The old version is still supported but you must add -DOPENOBEX_DEPRECATED to
+your compile setting. Using the new version requires to also use different
+functions that had obex_event_t as argument:
+       OBEX_Init() -> OBEX_New()
+       OBEX_SetUserCallback() -> OBEX_SetEventCb()
+       OBEX_ServerAccept() -> OBEX_Accept() + OBEX_SetEventCb()
+
+OBEX_HandleInput() is now a wrapper around its new name: OBEX_Work(). Note that
+when switch to OBEX_Work() directly, that the timeout value changed from 
seconds
+to milliseconds. To get more non-blocking behaviour, check out the new
+OBEX_FL_NONBLOCK flag for OBEX_New().
+
+Some liked more control over when to OBEX_HandleInput() by using select in
+combination with OBEX_GetFD() themselves and waiting for incoming data.
+This still works but you have to use OBEX_GetDataDirection() to find out
+about the current data direction and thus when to ideally call OBEX_Work().
+
+The function OBEX_UnicodeToAscii() and its counterpart OBEX_AsciiToUnicode() 
are
+gone. Please use the more complete functionality from your toolkit.
diff --git a/configure.ac b/configure.ac
index 91909f3..b14b10c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
 AC_INIT()
 
-AM_INIT_AUTOMAKE(openobex, 1.5)
+AM_INIT_AUTOMAKE(openobex, 2.0)
 AM_CONFIG_HEADER(config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-- 
1.7.5.4


------------------------------------------------------------------------------
Got Input?   Slashdot Needs You.
Take our quick survey online.  Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Openobex-users mailing list
Openobex-users@lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/openobex-users

Reply via email to