From e237a1774640dcf77590fc06584925fa30f077b6 Mon Sep 17 00:00:00 2001 From: Tofe Date: Thu, 8 Mar 2012 18:34:35 +0100 Subject: [PATCH] Licensing (suite) --- qml/QuickNewsReader/content/view/Background.qml | 18 +++++++++ qml/QuickNewsReader/content/view/BusyIndicator.qml | 41 ++++++-------------- qtc_packaging/debian_fremantle/copyright | 2 +- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/qml/QuickNewsReader/content/view/Background.qml b/qml/QuickNewsReader/content/view/Background.qml index 4be2231..7f59f83 100644 --- a/qml/QuickNewsReader/content/view/Background.qml +++ b/qml/QuickNewsReader/content/view/Background.qml @@ -1,3 +1,21 @@ +/*** +** Copyright (C) 2012 Christophe CHAPUIS +** +** This package is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This package 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 General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this package; if not, write to the Free Software +** Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +** +***/ import QtQuick 1.0 Rectangle { diff --git a/qml/QuickNewsReader/content/view/BusyIndicator.qml b/qml/QuickNewsReader/content/view/BusyIndicator.qml index 933d5a2..6ac0e80 100644 --- a/qml/QuickNewsReader/content/view/BusyIndicator.qml +++ b/qml/QuickNewsReader/content/view/BusyIndicator.qml @@ -4,38 +4,21 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** Copyright (C) 2012 Christophe CHAPUIS ** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This package is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. ** -** 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. +** This package 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 General Public License for more details. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ +** You should have received a copy of the GNU General Public License +** along with this package; if not, write to the Free Software +** Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ** ****************************************************************************/ diff --git a/qtc_packaging/debian_fremantle/copyright b/qtc_packaging/debian_fremantle/copyright index 677ef26..2f48c5d 100644 --- a/qtc_packaging/debian_fremantle/copyright +++ b/qtc_packaging/debian_fremantle/copyright @@ -6,7 +6,7 @@ It was downloaded from Copyright: - Christophe CHAPUIS chris.chapuis _at_ gmail _dot_ com + Christophe CHAPUIS License: -- 1.7.9.5