fix some more license headers

Change-Id: I5faa52551b78c8acd2a5e2f68e69402726c35257
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

7 files changed, 85 insertions, 42 deletions

diff --git a/installerbuilder/common/binaryformat.h b/installerbuilder/common/binaryformat.h
index 74c80ad66..e2a37c553 100644
--- a/installerbuilder/common/binaryformat.h
+++ b/installerbuilder/common/binaryformat.h
@@ -1,10 +1,11 @@
 /**************************************************************************
 **
-** This file is part of Installer Framework**
+** This file is part of Installer Framework
 **
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** Copyright (c) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** Contact:  Nokia Corporation qt-info@nokia.com**
 **
 ** GNU Lesser General Public License Usage
 **
@@ -16,13 +17,19 @@
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception version
-** 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
 **
-** If you are unsure which license is appropriate for your use, please contact
-** (qt-info@nokia.com).
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
+
 #ifndef BINARYFORMAT_H
 #define BINARYFORMAT_H
 
diff --git a/installerbuilder/common/binaryformatengine.h b/installerbuilder/common/binaryformatengine.h
index 7a1ca3ac5..7b7c4aa48 100644
--- a/installerbuilder/common/binaryformatengine.h
+++ b/installerbuilder/common/binaryformatengine.h
@@ -1,10 +1,11 @@
 /**************************************************************************
 **
-** This file is part of Installer Framework**
+** This file is part of Installer Framework
 **
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** Copyright (c) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** Contact:  Nokia Corporation qt-info@nokia.com**
 **
 ** GNU Lesser General Public License Usage
 **
@@ -16,13 +17,19 @@
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception version
-** 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
 **
-** If you are unsure which license is appropriate for your use, please contact
-** (qt-info@nokia.com).
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
+
 #ifndef BINARYFORMATENGINE_H
 #define BINARYFORMATENGINE_H
 
diff --git a/installerbuilder/common/binaryformatenginehandler.h b/installerbuilder/common/binaryformatenginehandler.h
index 744e5f123..399e4b98d 100644
--- a/installerbuilder/common/binaryformatenginehandler.h
+++ b/installerbuilder/common/binaryformatenginehandler.h
@@ -1,10 +1,11 @@
 /**************************************************************************
 **
-** This file is part of Installer Framework**
+** This file is part of Installer Framework
 **
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** Copyright (c) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** Contact:  Nokia Corporation qt-info@nokia.com**
 **
 ** GNU Lesser General Public License Usage
 **
@@ -16,13 +17,19 @@
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception version
-** 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
 **
-** If you are unsure which license is appropriate for your use, please contact
-** (qt-info@nokia.com).
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
+
 #ifndef BINARYFORMATENGINEHANDLER_H
 #define BINARYFORMATENGINEHANDLER_H
 
diff --git a/installerbuilder/common/errors.h b/installerbuilder/common/errors.h
index 04edbafee..c451dbf2f 100644
--- a/installerbuilder/common/errors.h
+++ b/installerbuilder/common/errors.h
@@ -1,10 +1,11 @@
 /**************************************************************************
 **
-** This file is part of Installer Framework**
+** This file is part of Installer Framework
 **
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** Copyright (c) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** Contact:  Nokia Corporation qt-info@nokia.com**
 **
 ** GNU Lesser General Public License Usage
 **
@@ -16,13 +17,19 @@
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception version
-** 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
 **
-** If you are unsure which license is appropriate for your use, please contact
-** (qt-info@nokia.com).
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
+
 #ifndef ERRORS_H
 #define ERRORS_H
 
diff --git a/installerbuilder/common/repository.h b/installerbuilder/common/repository.h
index c7db4c40e..c6d5ccd40 100644
--- a/installerbuilder/common/repository.h
+++ b/installerbuilder/common/repository.h
@@ -29,6 +29,7 @@
 ** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
+
 #ifndef REPOSITORY_H
 #define REPOSITORY_H
 
diff --git a/installerbuilder/common/utils.h b/installerbuilder/common/utils.h
index 378f005b3..6a4359e54 100644
--- a/installerbuilder/common/utils.h
+++ b/installerbuilder/common/utils.h
@@ -1,10 +1,11 @@
 /**************************************************************************
 **
-** This file is part of Installer Framework**
+** This file is part of Installer Framework
 **
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** Copyright (c) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** Contact:  Nokia Corporation qt-info@nokia.com**
 **
 ** GNU Lesser General Public License Usage
 **
@@ -16,13 +17,19 @@
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception version
-** 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
 **
-** If you are unsure which license is appropriate for your use, please contact
-** (qt-info@nokia.com).
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
+
 #ifndef QINSTALLER_UTILS_H
 #define QINSTALLER_UTILS_H
 
diff --git a/installerbuilder/common/zipjob.h b/installerbuilder/common/zipjob.h
index 0e23f6bb4..f10b80389 100644
--- a/installerbuilder/common/zipjob.h
+++ b/installerbuilder/common/zipjob.h
@@ -1,10 +1,11 @@
 /**************************************************************************
 **
-** This file is part of Installer Framework**
+** This file is part of Installer Framework
 **
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** Copyright (c) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** Contact:  Nokia Corporation qt-info@nokia.com**
 **
 ** GNU Lesser General Public License Usage
 **
@@ -16,13 +17,19 @@
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception version
-** 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
 **
-** If you are unsure which license is appropriate for your use, please contact
-** (qt-info@nokia.com).
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
+
 #ifndef ZIPJOB_H
 #define ZIPJOB_H