From 5c0ce1ed03b38eb8006d647f06c265c86a2b3f59 Mon Sep 17 00:00:00 2001
From: Maxim Uvarov <maxim.uvarov@linaro.org>
Date: Fri, 8 May 2015 13:37:02 +0300
Subject: update version number from v1.0.4 to v1.1.0.0

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
---
 debian/changelog          | 30 ++++++++++++++++++++++++++++++
 include/odp/api/version.h |  4 ++--
 scripts/odp_version.sh    |  5 ++++-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c6c0ec807..97d6da948 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+opendataplane (1.1.0.0-1) unstable; urgency=low
+   * API:
+       - style: moved pool type first in pool_param
+       - style: pool_param doxygen comments
+       - api: packet: removed odp_packet_user_u64
+       - api: packet: rename user_data to user_area
+       - api: pktio: Clarify doc on default pool usage on odp_pktio_open
+       - timer: Add missing platform handles to u64 conversion functions
+       - api/linux-generic/example/validation: remove odp_pmr_create_range() function definition
+       - api: packet: relax return code to use non-zero for true
+       - api: packet/pool: proposed APIs for packet user metadata
+
+   * test:
+       * validation:
+           - validation: packet: add user metadata tests
+           - test: pktio: add missing atomic init
+           - test: use CU_ASSERT_FATAL in case odp_buffer_alloc failed to avoid segfaults
+           - validation: pktio: fix polling tests
+           - validation: tests for module odp_ver_abt_log_dbg
+           - validation: rename executable to match modules
+   * general:
+       - linux-generic/odp_impl: add implementation version details
+       - linux-generic: support running with restricted cpu set
+       - linux-generic: packet: add user metadata support
+       - linux-generic: pool: add user metadata support
+       - linux-generic: buffer: restructure user mdatadata fields
+       - linux-generic: use inttypes defines to print (u)int32_t values
+
+ -- Maxim Uvarov <maxim.uvarov@linaro.org>  Fri, 08 May 2015 13:35:16 +0300
+
 opendataplane (1.0.4-1) unstable; urgency=low
 
    * test:
diff --git a/include/odp/api/version.h b/include/odp/api/version.h
index 027095db0..5d1abfaa0 100644
--- a/include/odp/api/version.h
+++ b/include/odp/api/version.h
@@ -37,7 +37,7 @@ extern "C" {
  * Introduction of major new features or changes. APIs with different major
  * versions are likely not backward compatible.
  */
-#define ODP_VERSION_API_MAJOR 0
+#define ODP_VERSION_API_MAJOR 1
 
 /**
  * ODP API minor version
@@ -46,7 +46,7 @@ extern "C" {
  * to the API. For an API with common generation and major version, but with
  * different minor numbers the two versions are backward compatible.
  */
-#define ODP_VERSION_API_MINOR 4
+#define ODP_VERSION_API_MINOR 0
 
 /**
  * Returns ODP API version string
diff --git a/scripts/odp_version.sh b/scripts/odp_version.sh
index d71d2f73f..2487b7f46 100755
--- a/scripts/odp_version.sh
+++ b/scripts/odp_version.sh
@@ -6,4 +6,7 @@ GEN=`grep "define ODP_VERSION_API_GENERATION"	${VFILE} | cut -d ' ' -f 3`
 MAJ=`grep "define ODP_VERSION_API_MAJOR"	${VFILE} | cut -d ' ' -f 3`
 MIN=`grep "define ODP_VERSION_API_MINOR"	${VFILE} | cut -d ' ' -f 3`
 
-echo -n $GEN.$MAJ.$MIN
+IMPL_FILE="platform/linux-generic/odp_impl.c"
+IMPL=`grep "define ODP_VERSION_IMPL "		${IMPL_FILE} | cut -d ' ' -f 3`
+
+echo -n $GEN.$MAJ.$MIN.$IMPL
-- 
cgit v1.2.3