Merge branch 'master' into develop

5 files changed, 28 insertions, 16 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c192ef..38f8a67 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,14 +55,15 @@ SET( PRINT_PATCH_LEVEL ${${PROJECT_NAME}_PATCH_LEVEL})
 SET( PRINT_VERSION ${GENIVI_PROJECT_VERSION})

 SET( PRINT_VERSION_STATE ${${PROJECT_NAME}_VERSION_STATE})

 

-IF(NOT DEFINED PRINT_REVISION)

+IF(NOT DEFINED DLT_REVISION)

 	execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 

-	OUTPUT_VARIABLE PRINT_REVISION 

+	OUTPUT_VARIABLE DLT_REVISION 

 	OUTPUT_STRIP_TRAILING_WHITESPACE)

-ENDIF(NOT DEFINED PRINT_REVISION)

+        STRING(REPLACE "-" "_" DLT_REVISION ${DLT_REVISION})

+ENDIF(NOT DEFINED DLT_REVISION)

 

 ##################### RPM SPEC CONFIG ########################

-SET( GENIVI_RPM_RELEASE "1${PRINT_REVISION}")

+SET( GENIVI_RPM_RELEASE "1${DLT_REVISION}")

 SET( LICENSE "LGPL v2.1 with special exception" )

 

 #########################################################

@@ -188,7 +189,7 @@ OPTION(ENABLE_BUILD_DOC "Set to ON to build Documentation" OFF)
 

 MESSAGE( STATUS )

 MESSAGE( STATUS "-------------------------------------------------------------------------------" )

-MESSAGE( STATUS "Build for Version ${PRINT_VERSION} build ${PRINT_REVISION}")

+MESSAGE( STATUS "Build for Version ${PRINT_VERSION} build ${DLT_REVISION}")

 MESSAGE( STATUS "VERSION_STATE ${PRINT_VERSION_STATE}")

 MESSAGE( STATUS "BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}" )

 MESSAGE( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )

diff --git a/debian/README.source b/debian/README.source
index 6ac6a6d..9801839 100755
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,9 +1,13 @@
-dlt-daemon for Debian
----------------------
-
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
-
-
-
-
+License
+-------
+See file: LICENSE.txt
+The full LGPL license: LGPL.txt
+
+Compiling in Linux:
+-------------------
+- create directory build
+- change into directory build
+- cmake ..
+- make
+- optional: sudo make install
+- optional: sudo ldconfig
diff --git a/debian/changelog b/debian/changelog
index 9b94b76..0a93d16 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dlt-daemon (2.3.0-1ubuntu1) natty; urgency=low
+
+  * Packaging for Ubuntu Natty
+  * ARM OMAP 3 package version
+  * Cassini release of DLT-daemon
+
+ -- jeremiah <jeremiah.foster@pelagicore.com>  Thu, 29 Sep 2011 17:49:15 +0200
+
 dlt-daemon (2.2.0-1) unstable; urgency=low
 
   * Initial GENIVI release for x86
diff --git a/debian/control b/debian/control
index 23d00e7..a96157d 100755
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: dlt-daemon
 Section: autmotive
 Priority: extra
 Maintainer: dlt_maintainer@genivi.org 
+XSBC-Original-Maintainer: alexander.wenzel@bmw.de
 Uploaders: jeremiah.foster@pelagicore.com
 Build-Depends: debhelper (>= 7.0.50~), cmake
 Standards-Version: 3.9.1
diff --git a/debian/docs b/debian/docs
index 8775bfb..60baa72 100755
--- a/debian/docs
+++ b/debian/docs
@@ -1,8 +1,6 @@
 INSTALL.txt
 LGPL.txt
 LICENSE.txt
-README
-README.txt
 README.txt
 ReleaseNotes.txt
 TODO