summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Muck <christian.muck@bmw.de>2012-04-13 08:54:49 +0200
committerChristian Muck <christian.muck@bmw.de>2012-04-13 08:54:49 +0200
commit0cb9e4d37a31cf0c1ac26c1de0ff845d1abd71d3 (patch)
tree9b52d203050148c77c517f9a22b67ee5ff557c82
parent83d7663994de26fd401f1cb6fc1a813d73dbbf82 (diff)
downloadDLT-daemon-0cb9e4d37a31cf0c1ac26c1de0ff845d1abd71d3.tar.gz
After stable release v2.6.0 - updated the version information to v2.7.0 ALPHA - bugfixes for version v2.6.0 should be done in the bugfix branch v2.6.1
Signed-off-by: Christian Muck <christian.muck@bmw.de>
-rwxr-xr-xCMakeLists.txt4
-rw-r--r--README.txt2
-rw-r--r--doc/dlt-convert.12
-rw-r--r--doc/dlt-daemon.12
-rw-r--r--doc/dlt-receive.12
-rw-r--r--doc/dlt-system.12
-rw-r--r--doc/dlt-system.conf.52
-rw-r--r--doc/dlt.conf.52
8 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67a4d77..fc2d7a0 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,10 +22,10 @@ set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
# Set version parameters
set( DLT_MAJOR_VERSION 2)
-set( DLT_MINOR_VERSION 6)
+set( DLT_MINOR_VERSION 7)
set( DLT_PATCH_LEVEL 0)
set( DLT_VERSION ${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_LEVEL})
-set( DLT_VERSION_STATE RELEASE )
+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 16dbeb8..22ebfdf 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
DLT - Automotive Diagnostic Log and Trace
-Version: 2.6.0
+Version: 2.7.0 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/doc/dlt-convert.1 b/doc/dlt-convert.1
index e61fe76..5ae5db9 100644
--- a/doc/dlt-convert.1
+++ b/doc/dlt-convert.1
@@ -1,4 +1,4 @@
-.TH dlt-convert 1 "March 2, 2012" "version 2.6.0" "USER COMMANDS"
+.TH dlt-convert 1 "March 2, 2012" "version 2.7.0 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 ce68edf..34edfc6 100644
--- a/doc/dlt-daemon.1
+++ b/doc/dlt-daemon.1
@@ -1,4 +1,4 @@
-.TH dlt-daemon 1 "March 2, 2012" "version 2.6.0" "USER COMMANDS"
+.TH dlt-daemon 1 "March 2, 2012" "version 2.7.0 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 501ee6d..8d08ac4 100644
--- a/doc/dlt-receive.1
+++ b/doc/dlt-receive.1
@@ -1,4 +1,4 @@
-.TH dlt-receive 1 "March 2, 2012" "version 2.6.0" "USER COMMANDS"
+.TH dlt-receive 1 "March 2, 2012" "version 2.7.0 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 cb0e058..2291b9e 100644
--- a/doc/dlt-system.1
+++ b/doc/dlt-system.1
@@ -1,4 +1,4 @@
-.TH dlt-system 1 "March 2, 2012" "version 2.6.0" "USER COMMANDS"
+.TH dlt-system 1 "March 2, 2012" "version 2.7.0 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 38c01ef..c8319aa 100644
--- a/doc/dlt-system.conf.5
+++ b/doc/dlt-system.conf.5
@@ -1,4 +1,4 @@
-.TH dlt-system.conf 5 "March 2, 2012" "version 2.6.0" "USER COMMANDS"
+.TH dlt-system.conf 5 "March 2, 2012" "version 2.7.0 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 afa4b22..ea55116 100644
--- a/doc/dlt.conf.5
+++ b/doc/dlt.conf.5
@@ -1,4 +1,4 @@
-.TH dlt.conf 5 "March 2, 2012" "version 2.6.0" "USER COMMANDS"
+.TH dlt.conf 5 "March 2, 2012" "version 2.7.0 ALPHA" "USER COMMANDS"
.SH NAME
dlt.conf \- DLT daemon configuration file
.SH DESCRIPTION