From 1f2871939d7e7ff4cbb5449a17204816da5d4f72 Mon Sep 17 00:00:00 2001
From: Christian Muck <christian.muck@bmw.de>
Date: Wed, 19 Sep 2012 15:04:56 +0200
Subject: Created bugfix branch v2.7.2 from v2.7.1

Signed-off-by: Christian Muck <christian.muck@bmw.de>
---
 CMakeLists.txt        | 4 ++--
 README.txt            | 2 +-
 ReleaseNotes.txt      | 5 ++++-
 doc/dlt-convert.1     | 2 +-
 doc/dlt-daemon.1      | 2 +-
 doc/dlt-receive.1     | 2 +-
 doc/dlt-system.1      | 2 +-
 doc/dlt-system.conf.5 | 2 +-
 doc/dlt.conf.5        | 2 +-
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74e1fc0..76c60cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,9 +24,9 @@ set( CMAKE_INSTALL_PREFIX "/usr" )
 # Set version parameters
 set( DLT_MAJOR_VERSION 2)
 set( DLT_MINOR_VERSION 7)
-set( DLT_PATCH_LEVEL 1)
+set( DLT_PATCH_LEVEL 2)
 set( DLT_VERSION ${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_LEVEL})
-set( DLT_VERSION_STATE STABLE )
+set( DLT_VERSION_STATE ALPHA )
 set( DLT_REVISION "")
 
 execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 
diff --git a/README.txt b/README.txt
index 5dfacaf..e327bd4 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
 DLT  - Automotive Diagnostic Log and Trace
 
-Version: 2.7.1 Stable
+Version: 2.7.2 Alpha
 
 This component provides a standardised log and trace interface, based on the
 standardised protocol specified in the AUTOSAR standard 4.0 DLT.
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 2fc2c24..027596e 100755
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,6 +1,6 @@
 DLT - Automotive Diagnostic Log and Trace
 
-Version: 2.7.1 Stable
+Version: 2.7.2 Alpha
 
 This component provides a standardised log and trace interface, based on the
 standardised protocol specified in the AUTOSAR standard 4.0 DLT.
@@ -40,6 +40,9 @@ Christian Muck (christian.muck@bmw.de)
 
 Changes in this release
 -----------------------
+2.7.2
+   *
+
 2.7.1
 
    * [GDLT-115]: Prevent return value from DLT macro API
diff --git a/doc/dlt-convert.1 b/doc/dlt-convert.1
index e63a0c8..287c0af 100644
--- a/doc/dlt-convert.1
+++ b/doc/dlt-convert.1
@@ -1,4 +1,4 @@
-.TH dlt-convert 1 "September 19, 2012" "version 2.7.1 Stable" "USER COMMANDS"
+.TH dlt-convert 1 "September 19, 2012" "version 2.7.2 Alpha" "USER COMMANDS"
 .SH NAME
 dlt-convert \- Convert DLT Logging files into ASCII
 .SH SYNOPSIS
diff --git a/doc/dlt-daemon.1 b/doc/dlt-daemon.1
index 762eb0a..01c3ded 100644
--- a/doc/dlt-daemon.1
+++ b/doc/dlt-daemon.1
@@ -1,4 +1,4 @@
-.TH dlt-daemon 1   "September 19, 2012" "version 2.7.1 Stable"  "USER COMMANDS"
+.TH dlt-daemon 1   "September 19, 2012" "version 2.7.2 Alpha"  "USER COMMANDS"
 .SH NAME
 dlt-daemon \- DLT daemon for logging and tracing purpose
 .SH SYNOPSIS
diff --git a/doc/dlt-receive.1 b/doc/dlt-receive.1
index 51d1876..66fb29f 100644
--- a/doc/dlt-receive.1
+++ b/doc/dlt-receive.1
@@ -1,4 +1,4 @@
-.TH dlt-receive 1   "September 19, 2012" "version 2.7.1 Stable"  "USER COMMANDS"
+.TH dlt-receive 1   "September 19, 2012" "version 2.7.2 Alpha"  "USER COMMANDS"
 .SH NAME
 dlt-receive \- Console based client for DLT Logging
 .SH SYNOPSIS
diff --git a/doc/dlt-system.1 b/doc/dlt-system.1
index fd88dcd..b526d51 100644
--- a/doc/dlt-system.1
+++ b/doc/dlt-system.1
@@ -1,4 +1,4 @@
-.TH dlt-system 1   "September 19, 2012" "version 2.7.1 Stable" "USER COMMANDS"
+.TH dlt-system 1   "September 19, 2012" "version 2.7.2 Alpha" "USER COMMANDS"
 .SH NAME
 dlt-system \- DLT system logging process
 .SH SYNOPSIS
diff --git a/doc/dlt-system.conf.5 b/doc/dlt-system.conf.5
index 31987e5..49fb87d 100644
--- a/doc/dlt-system.conf.5
+++ b/doc/dlt-system.conf.5
@@ -1,4 +1,4 @@
-.TH dlt-system.conf 5  "September 19, 2012" "version 2.7.1 Stable" "USER COMMANDS"
+.TH dlt-system.conf 5  "September 19, 2012" "version 2.7.2 Alpha" "USER COMMANDS"
 .SH NAME
 dlt-system.conf \- DLT system process configuration file
 .SH DESCRIPTION
diff --git a/doc/dlt.conf.5 b/doc/dlt.conf.5
index 7972167..4e903ec 100644
--- a/doc/dlt.conf.5
+++ b/doc/dlt.conf.5
@@ -1,4 +1,4 @@
-.TH dlt.conf 5 "September 19, 2012" "version 2.7.1 Stable" "USER COMMANDS"
+.TH dlt.conf 5 "September 19, 2012" "version 2.7.2 Alpha" "USER COMMANDS"
 .SH NAME
 dlt.conf \- DLT daemon configuration file
 .SH DESCRIPTION
-- 
cgit v1.2.1