From: Jakob Haufe Date: Wed, 9 Jun 2010 18:52:44 +0000 (+0200) Subject: Imported Debian patch 1.0-3 X-Git-Tag: debian/1.0-3 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f174fe28696db22c72a95bba546138aea2a0c631;p=minitube Imported Debian patch 1.0-3 --- diff --git a/debian/changelog b/debian/changelog index 63b243c..40f3aad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +minitube (1.0-3) unstable; urgency=low + + * Mention files with copyright by Nokia in debian/copyright. Thanks to Barry + deFreese for pointing it out. + + -- Jakob Haufe Wed, 09 Jun 2010 20:52:44 +0200 + minitube (1.0-2) unstable; urgency=low * Make phonon and gstreamer dependencies more strict diff --git a/debian/copyright b/debian/copyright index 5cb8316..c4d7f43 100644 --- a/debian/copyright +++ b/debian/copyright @@ -27,6 +27,179 @@ License: You should have received a copy of the GNU General Public License along with this program. If not, see . +Files with other copyright statement than: Copyright Flavio Tordnini, License GPL verion 3 +------------------------------------------------------------------------------------------ + + +src/flickcharm.cpp src/flickcharm.h + + Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + Contact: Qt Software Information (qt-info@nokia.com) + + This file is part of the Graphics Dojo project on Qt Labs. + + This file may be used under the terms of the GNU General Public + License version 2.0 or 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 GNU + General Public Licensing requirements will be met: + http://www.fsf.org/licensing/licenses/info/GPLv2.html and + http://www.gnu.org/copyleft/gpl.html. + + If you are unsure which license is appropriate for your use, please + contact the sales department at qt-sales@nokia.com. + + This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +src/minisplitter.cpp src/minisplitter.h + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + + Contact: Qt Software Information (qt-info@nokia.com) + + Commercial Usage + + Licensees holding valid Qt Commercial licenses may use this file in + accordance with the Qt Commercial License Agreement provided with the + Software or, alternatively, in accordance with the terms contained in + a written agreement between you and Nokia. + + GNU Lesser General Public License Usage + + Alternatively, 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. + + If you are unsure which license is appropriate for your use, please + contact the sales department at qt-sales@nokia.com. + + +src/searchlineedit.cpp src/searchlineedit.h src/urllineedit.cpp src/urllineedit.h + + Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + Contact: Nokia Corporation (qt-info@nokia.com) + + This file is part of the demonstration applications of the Qt Toolkit. + + $QT_BEGIN_LICENSE:LGPL$ + Commercial Usage + Licensees holding valid Qt Commercial licenses may use this file in + accordance with the Qt Commercial License Agreement provided with the + Software or, alternatively, in accordance with the terms contained in + a written agreement between you and Nokia. + + GNU Lesser General Public License Usage + Alternatively, 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. + + In addition, as a special exception, Nokia gives you certain + additional rights. These rights are described in the Nokia Qt LGPL + Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this + package. + + 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. + + If you are unsure which license is appropriate for your use, please + contact the sales department at http://www.qtsoftware.com/contact. + $QT_END_LICENSE$ + +src/iconloader/qticonloader.cpp src/iconloader/qticonloader.h + + Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + Contact: Qt Software Information (qt-info@nokia.com) + + This file is part of the QtGui module of the Qt Toolkit. + + Commercial Usage + Licensees holding valid Qt Commercial licenses may use this file in + accordance with the Qt Commercial License Agreement provided with the + Software or, alternatively, in accordance with the terms contained in + a written agreement between you and Nokia. + + GNU Lesser General Public License Usage + Alternatively, 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. + + In addition, as a special exception, Nokia gives you certain + additional rights. These rights are described in the Nokia Qt LGPL + Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this + package. + + 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. + + If you are unsure which license is appropriate for your use, please + contact the sales department at qt-sales@nokia.com. + +src/qtsingleapplication/*.{h,cpp} + + This file is part of a Qt Solutions component. + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + + Contact: Qt Software Information (qt-info@nokia.com) + + Commercial Usage + Licensees holding valid Qt Commercial licenses may use this file in + accordance with the Qt Solutions Commercial License Agreement provided + with the Software or, alternatively, in accordance with the terms + contained in a written agreement between you and Nokia. + + GNU Lesser General Public License Usage + Alternatively, 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. + + In addition, as a special exception, Nokia gives you certain + additional rights. These rights are described in the Nokia Qt LGPL + Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this + package. + + 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. + + Please note Third Party Software included with Qt Solutions may impose + additional restrictions and it is the user's responsibility to ensure + that they have met the licensing requirements of the GPL, LGPL, or Qt + Solutions Commercial license and the relevant license of the Third + Party Software they are using. + + If you are unsure which license is appropriate for your use, please + contact the sales department at qt-sales@nokia.com. + +------------------------------------------------------------------------------------------ + On Debian systems, the complete text of the GNU General Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. @@ -37,3 +210,5 @@ The Debian packaging is: and is licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'. + +