GDLT-38, Update licenses in CMakeLists

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03f26e7..58a4cf4 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,17 @@
 #######\r
 # Dlt - Diagnostic Log and Trace\r
 # @licence make begin@\r
- #\r
- # Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>\r
- # \r
- # Contributions are licensed to the GENIVI Alliance under one or more\r
- # Contribution License Agreements.\r
- # \r
- # This Source Code Form is subject to the terms of the\r
- # Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with\r
- # this file, You can obtain one at http://mozilla.org/MPL/2.0/.\r
- #\r
- # @licence end@\r
+#\r
+# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>\r
+# \r
+# Contributions are licensed to the GENIVI Alliance under one or more\r
+# Contribution License Agreements.\r
+# \r
+# This Source Code Form is subject to the terms of the\r
+# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with\r
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.\r
+#\r
+# @licence end@\r
 ########\r
 \r
 cmake_minimum_required( VERSION 2.6 )\r
@@ -61,7 +61,7 @@ option(WITH_DLTTEST                     "Set to ON to build with modifications to test Uuser-Dae
 \r
 # RPM settings\r
 set( GENIVI_RPM_RELEASE "1")#${DLT_REVISION}")\r
-set( LICENSE "LGPL v2.1 with special exception" )\r
+set( LICENSE "Mozilla Public License Version 2.0s" )\r
 \r
 # Build, project and include settings\r
 find_package(Threads REQUIRED)\r

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 062fed1..b95fd58 100755 (executable)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,38 +1,16 @@
 #######
 # Dlt - Diagnostic Log and Trace
 # @licence make begin@
- #
- # Copyright (C) 2011, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>
- # 
- # This program is free software; you can redistribute it and/or modify it under the terms of the 
- # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
- # This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even 
- # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General 
- # Public License, version 2.1, for more details.
- # 
- # You should have received a copy of the GNU Lesser General Public License, version 2.1, along 
- # with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
- # 
- # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may 
- # also be applicable to programs even in cases in which the program is not a library in the technical sense.
- # 
- # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may 
- # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to 
- # license your linked modules under the GNU Lesser General Public License, version 2.1, you 
- # may use the program under the following exception.
- # 
- # As a special exception, the copyright holders of DLT give you permission to combine DLT 
- # with software programs or libraries that are released under any license unless such a combination is not
- # permitted by the license of such a software program or library. You may copy and distribute such a 
- # system following the terms of the GNU Lesser General Public License, version 2.1, including this
- # special exception, for DLT and the licenses of the other code concerned.
- # 
- # Note that people who make modified versions of DLT are not obligated to grant this special exception 
- # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, 
- # version 2.1, gives permission to release a modified version without this exception; this exception 
- # also makes it possible to release a modified version which carries forward this exception.
- #
- # @licence end@
+#
+# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>
+# 
+# Contributions are licensed to the GENIVI Alliance under one or more
+# Contribution License Agreements.
+# 
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# @licence end@
 ########
 
 if(WITH_DOC)

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 26b97e9..aa7fd66 100755 (executable)
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,38 +1,17 @@
 #######
 # Dlt - Diagnostic Log and Trace
 # @licence make begin@
- #
- # Copyright (C) 2011, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>
- # 
- # This program is free software; you can redistribute it and/or modify it under the terms of the 
- # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
- # This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even 
- # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General 
- # Public License, version 2.1, for more details.
- # 
- # You should have received a copy of the GNU Lesser General Public License, version 2.1, along 
- # with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
- # 
- # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may 
- # also be applicable to programs even in cases in which the program is not a library in the technical sense.
- # 
- # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may 
- # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to 
- # license your linked modules under the GNU Lesser General Public License, version 2.1, you 
- # may use the program under the following exception.
- # 
- # As a special exception, the copyright holders of DLT give you permission to combine DLT 
- # with software programs or libraries that are released under any license unless such a combination is not
- # permitted by the license of such a software program or library. You may copy and distribute such a 
- # system following the terms of the GNU Lesser General Public License, version 2.1, including this
- # special exception, for DLT and the licenses of the other code concerned.
- # 
- # Note that people who make modified versions of DLT are not obligated to grant this special exception 
- # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, 
- # version 2.1, gives permission to release a modified version without this exception; this exception 
- # also makes it possible to release a modified version which carries forward this exception.
- #
- # @licence end@
+#
+# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>
+# 
+# Contributions are licensed to the GENIVI Alliance under one or more
+# Contribution License Agreements.
+# 
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# @licence end@
 ########
 
 ADD_SUBDIRECTORY( dlt )

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1a824ce..8d126f8 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,38 +1,17 @@
 #######
 # Dlt - Diagnostic Log and Trace
 # @licence make begin@
- #
- # Copyright (C) 2011, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>
- # 
- # This program is free software; you can redistribute it and/or modify it under the terms of the 
- # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
- # This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even 
- # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General 
- # Public License, version 2.1, for more details.
- # 
- # You should have received a copy of the GNU Lesser General Public License, version 2.1, along 
- # with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
- # 
- # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may 
- # also be applicable to programs even in cases in which the program is not a library in the technical sense.
- # 
- # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may 
- # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to 
- # license your linked modules under the GNU Lesser General Public License, version 2.1, you 
- # may use the program under the following exception.
- # 
- # As a special exception, the copyright holders of DLT give you permission to combine DLT 
- # with software programs or libraries that are released under any license unless such a combination is not
- # permitted by the license of such a software program or library. You may copy and distribute such a 
- # system following the terms of the GNU Lesser General Public License, version 2.1, including this
- # special exception, for DLT and the licenses of the other code concerned.
- # 
- # Note that people who make modified versions of DLT are not obligated to grant this special exception 
- # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, 
- # version 2.1, gives permission to release a modified version without this exception; this exception 
- # also makes it possible to release a modified version which carries forward this exception.
- #
- # @licence end@
+#
+# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>
+# 
+# Contributions are licensed to the GENIVI Alliance under one or more
+# Contribution License Agreements.
+# 
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# @licence end@
 ########
 
 ADD_SUBDIRECTORY( lib )

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index e071d8a..0a2c5e0 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -1,38 +1,17 @@
 #######
 # Dlt - Diagnostic Log and Trace
 # @licence make begin@
- #
- # Copyright (C) 2011, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>
- # 
- # This program is free software; you can redistribute it and/or modify it under the terms of the 
- # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
- # This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even 
- # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General 
- # Public License, version 2.1, for more details.
- # 
- # You should have received a copy of the GNU Lesser General Public License, version 2.1, along 
- # with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
- # 
- # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may 
- # also be applicable to programs even in cases in which the program is not a library in the technical sense.
- # 
- # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may 
- # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to 
- # license your linked modules under the GNU Lesser General Public License, version 2.1, you 
- # may use the program under the following exception.
- # 
- # As a special exception, the copyright holders of DLT give you permission to combine DLT 
- # with software programs or libraries that are released under any license unless such a combination is not
- # permitted by the license of such a software program or library. You may copy and distribute such a 
- # system following the terms of the GNU Lesser General Public License, version 2.1, including this
- # special exception, for DLT and the licenses of the other code concerned.
- # 
- # Note that people who make modified versions of DLT are not obligated to grant this special exception 
- # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, 
- # version 2.1, gives permission to release a modified version without this exception; this exception 
- # also makes it possible to release a modified version which carries forward this exception.
- #
- # @licence end@
+#
+# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>
+# 
+# Contributions are licensed to the GENIVI Alliance under one or more
+# Contribution License Agreements.
+# 
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# @licence end@
 ########
 
 if(WITH_SYSTEMD)

diff --git a/testscripts/CMakeLists.txt b/testscripts/CMakeLists.txt
index a5ace1f..63d9e81 100755 (executable)
--- a/testscripts/CMakeLists.txt
+++ b/testscripts/CMakeLists.txt
@@ -1,38 +1,17 @@
 #######
 # Dlt - Diagnostic Log and Trace
 # @licence make begin@
- #
- # Copyright (C) 2011, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>
- # 
- # This program is free software; you can redistribute it and/or modify it under the terms of the 
- # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
- # This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even 
- # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General 
- # Public License, version 2.1, for more details.
- # 
- # You should have received a copy of the GNU Lesser General Public License, version 2.1, along 
- # with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
- # 
- # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may 
- # also be applicable to programs even in cases in which the program is not a library in the technical sense.
- # 
- # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may 
- # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to 
- # license your linked modules under the GNU Lesser General Public License, version 2.1, you 
- # may use the program under the following exception.
- # 
- # As a special exception, the copyright holders of DLT give you permission to combine DLT 
- # with software programs or libraries that are released under any license unless such a combination is not
- # permitted by the license of such a software program or library. You may copy and distribute such a 
- # system following the terms of the GNU Lesser General Public License, version 2.1, including this
- # special exception, for DLT and the licenses of the other code concerned.
- # 
- # Note that people who make modified versions of DLT are not obligated to grant this special exception 
- # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, 
- # version 2.1, gives permission to release a modified version without this exception; this exception 
- # also makes it possible to release a modified version which carries forward this exception.
- #
- # @licence end@
+#
+# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>
+# 
+# Contributions are licensed to the GENIVI Alliance under one or more
+# Contribution License Agreements.
+# 
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# @licence end@
 ########
 
 if(WITH_TESTSCRIPTS)