[openobex-users] [PATCH 46/46] Release version 2.0

[Hendrik S. <po...@he...>]

---
 CMakeLists.txt |    4 ++--
 ChangeLog      |   18 ++++++++++++++++++
 configure.ac   |    2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

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..c6d3bee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+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 function to get free object space
+	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 even 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/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