diff options
author | Lassi Marttala <lassi.lm.marttala@partner.bmw.com> | 2012-03-28 14:09:33 +0200 |
---|---|---|
committer | Christian Muck <christian.muck@bmw.de> | 2012-04-04 14:27:20 +0200 |
commit | b462ed03525f0278b2f9ca0a7f8103595463d24a (patch) | |
tree | 792060209de267ca48ea78063520884309b64e81 | |
parent | 39de48bad83695b0d827350b6ab2bd84f695dcb4 (diff) | |
download | dlt-daemon-b462ed03525f0278b2f9ca0a7f8103595463d24a.tar.gz dlt-daemon-b462ed03525f0278b2f9ca0a7f8103595463d24a.tar.bz2 dlt-daemon-b462ed03525f0278b2f9ca0a7f8103595463d24a.zip |
Change version number
Signed-off-by: Christian Muck <christian.muck@bmw.de>
-rwxr-xr-x | CMakeLists.txt | 6 | ||||
-rw-r--r-- | README.txt | 2 | ||||
-rwxr-xr-x | ReleaseNotes.txt | 6 | ||||
-rw-r--r-- | doc/dlt-daemon.1 | 2 | ||||
-rw-r--r-- | doc/dlt-receive.1 | 2 | ||||
-rw-r--r-- | doc/dlt-system.1 | 2 | ||||
-rw-r--r-- | doc/dlt-system.conf.5 | 2 | ||||
-rw-r--r-- | doc/dlt.conf.5 | 2 |
8 files changed, 14 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 05677bb..85a1ad8 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 5)
-set( DLT_PATCH_LEVEL 2)
+set( DLT_MINOR_VERSION 6)
+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 BETA )
set( DLT_REVISION "")
execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -1,6 +1,6 @@ DLT - Automotive Diagnostic Log and Trace -Version: 2.5.2 +Version: 2.6.0 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 54401f9..2697270 100755 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,6 +1,6 @@ DLT - Automotive Diagnostic Log and Trace
-Version: 2.5.2
+Version: 2.6.0
This component provides a standardised log and trace interface, based on the
standardised protocol specified in the AUTOSAR standard 4.0 DLT.
@@ -41,6 +41,10 @@ Christian Muck (christian.muck@bmw.de) Changes in this release
-----------------------
+2.6.0
+
+ *
+
2.5.2
* Change to Mozilla Public License Version 2.0
diff --git a/doc/dlt-daemon.1 b/doc/dlt-daemon.1 index b63c291..ce68edf 100644 --- a/doc/dlt-daemon.1 +++ b/doc/dlt-daemon.1 @@ -1,4 +1,4 @@ -.TH dlt-daemon 1 "March 2, 2012" "version 2.5.2" "USER COMMANDS" +.TH dlt-daemon 1 "March 2, 2012" "version 2.6.0" "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 31d3208..501ee6d 100644 --- a/doc/dlt-receive.1 +++ b/doc/dlt-receive.1 @@ -1,4 +1,4 @@ -.TH dlt-receive 1 "March 2, 2012" "version 2.5.2" "USER COMMANDS" +.TH dlt-receive 1 "March 2, 2012" "version 2.6.0" "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 20e5d1b..cb0e058 100644 --- a/doc/dlt-system.1 +++ b/doc/dlt-system.1 @@ -1,4 +1,4 @@ -.TH dlt-system 1 "March 2, 2012" "version 2.5.2" "USER COMMANDS" +.TH dlt-system 1 "March 2, 2012" "version 2.6.0" "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 576baeb..38c01ef 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.5.2" "USER COMMANDS" +.TH dlt-system.conf 5 "March 2, 2012" "version 2.6.0" "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 fcb9b5a..afa4b22 100644 --- a/doc/dlt.conf.5 +++ b/doc/dlt.conf.5 @@ -1,4 +1,4 @@ -.TH dlt.conf 5 "March 2, 2012" "version 2.5.2" "USER COMMANDS" +.TH dlt.conf 5 "March 2, 2012" "version 2.6.0" "USER COMMANDS" .SH NAME dlt.conf \- DLT daemon configuration file .SH DESCRIPTION |