rev 13949 - trunk/packages/qt4-x11/debian
Fathi Boudra
fabo at alioth.debian.org
Tue Mar 3 17:44:10 UTC 2009
Author: fabo
Date: 2009-03-03 17:44:10 +0000 (Tue, 03 Mar 2009)
New Revision: 13949
Modified:
trunk/packages/qt4-x11/debian/TODO.Debian
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/copyright
trunk/packages/qt4-x11/debian/rules
Log:
Close bug: knode 4.2.x crash. (Closes: #516740)
Update copyright:
- Add LGPL license support.
- Add a sentence about QPL license dropped from Qt 4.4.0.
(Closes: #508190, #500905)
Install LGPL_EXCEPTION.txt
Update TODO.Debian
Modified: trunk/packages/qt4-x11/debian/TODO.Debian
===================================================================
--- trunk/packages/qt4-x11/debian/TODO.Debian 2009-03-03 16:53:33 UTC (rev 13948)
+++ trunk/packages/qt4-x11/debian/TODO.Debian 2009-03-03 17:44:10 UTC (rev 13949)
@@ -1,11 +1,7 @@
+++ TODO:
* Review bug reports.
- * Update debian/copyright.
* Use pkgkde-symbolshelper. Add pkg-kde-tools (>= 0.3.1) b-d.
- * Merge Ubuntu changes ? (IMHO, no)
- - Fix binary-post-install/libqt4-dev:: to install qt.tags to libqt4-dev
- - Add missing depends to libqt4-dev based on Qt build dependencies
* what to do with phonon and webkit ?
- webkit links against phonon.
* TT changed the build key generation and added backwards compatibility.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2009-03-03 16:53:33 UTC (rev 13948)
+++ trunk/packages/qt4-x11/debian/changelog 2009-03-03 17:44:10 UTC (rev 13949)
@@ -1,6 +1,11 @@
qt4-x11 (4.5.0-1) UNRELEASED; urgency=low
- * New upstream released.
+ * New upstream released:
+ - Fix knode 4.2.x crash. (Closes: #516740)
+ * Update copyright:
+ - Add LGPL license support.
+ - Add a sentence about QPL license dropped from Qt 4.4.0.
+ (Closes: #508190, #500905)
* Remove patches:
- 20_fix_ftbfs_callgrindChildExitCode.diff - Merged upstream.
- 21_fix_ppc_build.diff - Reverted upstream.
Modified: trunk/packages/qt4-x11/debian/copyright
===================================================================
--- trunk/packages/qt4-x11/debian/copyright 2009-03-03 16:53:33 UTC (rev 13948)
+++ trunk/packages/qt4-x11/debian/copyright 2009-03-03 17:44:10 UTC (rev 13949)
@@ -10,369 +10,60 @@
Copyright:
- © 2008 Nokia Corporation and/or its subsidiary(-ies).
+ © 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
© 1994-2008 Trolltech ASA.
License:
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 or version 3
- as published by the Free Software Foundation.
+ 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.
- 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 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.
- 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.
+ 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.
+
On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL-2' and
-`/usr/share/common-licenses/GPL-3'.
+can be found in `/usr/share/common-licenses/LGPL-2.2`,
+`/usr/share/common-licenses/GPL-2` and `/usr/share/common-licenses/GPL-3`.
+Since Qt 4.5.0, Qt allows for LGPL copying.
+
Since Qt 4.4.3, copyright of Qt has been transferred to Nokia Corporation.
+Since Qt 4.4.0, Qt isn't licensed under the QPL anymore.
+
Since Qt 4.3.4, Qt is triple licensed under the QPL, GPL 2 and GPL 3.
Since Qt 4.3.1, a Trolltech GPL exception was added to allow linking
against non-GPL libraries and applications:
-Nokia Corporation Qt GPL Exception version 1.3
-==============================================
+Nokia Qt LGPL Exception version 1.0
-Additional rights granted beyond the GPL (the "Exception").
-
-As a special exception to the terms and conditions of GPL version 2.0 or GPL
-version 3.0, Nokia Corporation hereby grants you the rights described below,
-provided you agree to the terms and conditions in this Exception, including its
-obligations and restrictions on use.
-
-Nothing in this Exception gives you or anyone else the right to change the
-licensing terms of the Qt Open Source Edition.
-
-Below, "Licensed Software" shall refer to the software licensed under the GPL
-version 2.0 or GPL version 3.0 and this exception.
-
-1) The right to use open source licenses not compatible with the GNU
-General Public License version 2.0 or GNU General Public License version
-3.0: You may link software (hereafter referred to as "Your Software")
-against the Licensed Software and/or distribute binaries of Your Software
-linked against the Licensed Software, provided that:
-
-A) Your Software is licensed under one of the following licenses:
-
-
-License name Version(s)/Copyright Date
-Academic Free License 2.0, 2.1, 3.0
-Apache Software License 1.0 or 1.1
-Apache License 2.0
-Apple Public Source License 2.0
-Artistic license (as set forth in the addendum file)
-BSD license "July 22 1999"
-Common Development and Distribution
- License (CDDL) 1.0
-Common Public License 1.0
-Eclipse Public License 1.0
-GNU Library or "Lesser"
-General Public License (LGPL) 2.0, 2.1, 3.0
-Jabber Open Source License 1.0
-MIT License (as set forth in the addendum file)
-Mozilla Public License (MPL) 1.0 or 1.1
-Open Software License 2.0, 3.0
-OpenSSL license (with original
-SSLeay license) "2003" ("1998")
-PHP License 3.0
-Python license (CNRI Python License) (as set forth in the addendum file)
-Python Software Foundation License 2.1.1
-Q Public License 1.0
-Sleepycat License "1999"
-W3C License "2001"
-X11 License X11R6.6
-Zlib/libpng License (as set forth in the addendum file)
-Zope Public License 2.0, 2.1
-
-
-(Licenses without a specific version number or date are reproduced
-in the file GPL_Exception_Addendum.txt in your source package).
-
-and
-
-B) You must, on request, make a complete package including the complete
-source code of Your Software (as defined in the GNU General Public License
-version 2, section 3, but excluding anything excluded by the special
-exception in the same section) available to Nokia Corporation under the
-same license as that granted to other recipients of the source code of Your
-Software.
-
-and
-
-C) Your or any other contributor's rights to:
-
- i) distribute the source code of Your Software to anyone for any purpose;
-
- and
-
- ii) publicly discuss the development project for Your Software and its
- goals in any form and in any forum are not prohibited by any legal
- instrument, including but not limited to contracts, non-disclosure
- agreements, and employee contracts.
-
-
-2) The right to link non-open source applications with pre-installed versions of
-the Licensed Software: You may link applications with binary pre-installed
-versions of the Licensed Software, provided that such applications have been
-developed and are deployed in accordance with the terms and conditions of the Qt
-Commercial License Agreement.
-
-Addendum to the Nokia Corporation GPL Exception version 1.3
-===========================================================
-
-
---------------------------------------------------------------------------
-
- The "Artistic License"
-
- Preamble
-
-The intent of this document is to state the conditions under which a
-Package may be copied, such that the Copyright Holder maintains some
-semblance of artistic control over the development of the package,
-while giving the users of the package the right to use and distribute
-the Package in a more-or-less customary fashion, plus the right to make
-reasonable modifications.
-
-Definitions:
-
- "Package" refers to the collection of files distributed by the
- Copyright Holder, and derivatives of that collection of files
- created through textual modification.
-
- "Standard Version" refers to such a Package if it has not been
- modified, or has been modified in accordance with the wishes
- of the Copyright Holder as specified below.
-
- "Copyright Holder" is whoever is named in the copyright or
- copyrights for the package.
-
- "You" is you, if you're thinking about copying or distributing
- this Package.
-
- "Reasonable copying fee" is whatever you can justify on the
- basis of media cost, duplication charges, time of people involved,
- and so on. (You will not be required to justify it to the
- Copyright Holder, but only to the computing community at large
- as a market that must bear the fee.)
-
- "Freely Available" means that no fee is charged for the item
- itself, though there may be fees involved in handling the item.
- It also means that recipients of the item may redistribute it
- under the same conditions they received it.
-
-1. You may make and give away verbatim copies of the source form of the
-Standard Version of this Package without restriction, provided that you
-duplicate all of the original copyright notices and associated disclaimers.
-
-2. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder. A Package
-modified in such a way shall still be considered the Standard Version.
-
-3. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of the
-following:
-
- a) place your modifications in the Public Domain or otherwise make them
- Freely Available, such as by posting said modifications to Usenet or
- an equivalent medium, or placing the modifications on a major archive
- site such as uunet.uu.net, or by allowing the Copyright Holder to include
- your modifications in the Standard Version of the Package.
-
- b) use the modified Package only within your corporation or organization.
-
- c) rename any non-standard executables so the names do not conflict
- with standard executables, which must also be provided, and provide
- a separate manual page for each non-standard executable that clearly
- documents how it differs from the Standard Version.
-
- d) make other distribution arrangements with the Copyright Holder.
-
-4. You may distribute the programs of this Package in object code or
-executable form, provided that you do at least ONE of the following:
-
- a) distribute a Standard Version of the executables and library files,
- together with instructions (in the manual page or equivalent) on where
- to get the Standard Version.
-
- b) accompany the distribution with the machine-readable source of
- the Package with your modifications.
-
- c) give non-standard executables non-standard names, and clearly
- document the differences in manual pages (or equivalent), together
- with instructions on where to get the Standard Version.
-
- d) make other distribution arrangements with the Copyright Holder.
-
-5. You may charge a reasonable copying fee for any distribution of this
-Package. You may charge any fee you choose for support of this
-Package. You may not charge a fee for this Package itself. However,
-you may distribute this Package in aggregate with other (possibly
-commercial) programs as part of a larger (possibly commercial) software
-distribution provided that you do not advertise this Package as a
-product of your own. You may embed this Package's interpreter within
-an executable of yours (by linking); this shall be construed as a mere
-form of aggregation, provided that the complete Standard Version of the
-interpreter is so embedded.
-
-6. The scripts and library files supplied as input to or produced as
-output from the programs of this Package do not automatically fall
-under the copyright of this Package, but belong to whoever generated
-them, and may be sold commercially, and may be aggregated with this
-Package. If such scripts or library files are aggregated with this
-Package via the so-called "undump" or "unexec" methods of producing a
-binary executable image, then distribution of such an image shall
-neither be construed as a distribution of this Package nor shall it
-fall under the restrictions of Paragraphs 3 and 4, provided that you do
-not represent such an executable image as a Standard Version of this
-Package.
-
-7. C subroutines (or comparably compiled subroutines in other
-languages) supplied by you and linked into this Package in order to
-emulate subroutines and variables of the language defined by this
-Package shall not be considered part of this Package, but are the
-equivalent of input as in Paragraph 6, provided these subroutines do
-not change the language in any way that would cause it to fail the
-regression tests for the language.
-
-8. Aggregation of this Package with a commercial distribution is always
-permitted provided that the use of this Package is embedded; that is,
-when no overt attempt is made to make this Package's interfaces visible
-to the end user of the commercial distribution. Such use shall not be
-construed as a distribution of this Package.
-
-9. The name of the Copyright Holder may not be used to endorse or promote
-products derived from this software without specific prior written permission.
-
-10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
- The End
-
---------------------------------------------------------------------------
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
---------------------------------------------------------------------------
-
-Python License (CNRI Python License)
-
-CNRI OPEN SOURCE LICENSE AGREEMENT
-
-IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
-
-BY CLICKING ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING, INSTALLING OR
-OTHERWISE USING PYTHON 1.6, beta 1 SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
-THE TERMS AND CONDITIONS OF THIS LICENSE AGREEMENT.
-
-1. This LICENSE AGREEMENT is between the Corporation for National Research
-Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191
-("CNRI"), and the Individual or Organization ("Licensee") accessing and
-otherwise using Python 1.6, beta 1 software in source or binary form and its
-associated documentation, as released at the www.python.org Internet site on
-August 4, 2000 ("Python 1.6b1").
-
-2. Subject to the terms and conditions of this License Agreement, CNRI hereby
-grants Licensee a non-exclusive, royalty-free, world-wide license to reproduce,
-analyze, test, perform and/or display publicly, prepare derivative works,
-distribute, and otherwise use Python 1.6b1 alone or in any derivative version,
-provided, however, that CNRIs License Agreement is retained in Python 1.6b1,
-alone or in any derivative version prepared by Licensee.
-
-Alternately, in lieu of CNRIs License Agreement, Licensee may substitute the
-following text (omitting the quotes): "Python 1.6, beta 1, is made available
-subject to the terms and conditions in CNRIs License Agreement. This Agreement
-may be located on the Internet using the following unique, persistent identifier
-(known as a handle): 1895.22/1011. This Agreement may also be obtained from a
-proxy server on the Internet using the URL:http://hdl.handle.net/1895.22/1011".
-
-3. In the event Licensee prepares a derivative work that is based on or
-incorporates Python 1.6b1or any part thereof, and wants to make the derivative
-work available to the public as provided herein, then Licensee hereby agrees to
-indicate in any such work the nature of the modifications made to Python 1.6b1.
-
-4. CNRI is making Python 1.6b1 available to Licensee on an "AS IS" basis. CNRI
-MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE,
-BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY
-OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
-PYTHON 1.6b1WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE FOR
-ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF USING,
-MODIFYING OR DISTRIBUTING PYTHON 1.6b1, OR ANY DERIVATIVE THEREOF, EVEN IF
-ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material breach of
-its terms and conditions.
-
-7. This License Agreement shall be governed by and interpreted in all respects
-by the law of the State of Virginia, excluding conflict of law
-provisions. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between CNRI and
-Licensee. This License Agreement does not grant permission to use CNRI
-trademarks or trade name in a trademark sense to endorse or promote products or
-services of Licensee, or any third party.
-
-8. By clicking on the "ACCEPT" button where indicated, or by copying, installing
-or otherwise using Python 1.6b1, Licensee agrees to be bound by the terms and
-conditions of this License Agreement.
-
-
-
-ACCEPT
-
---------------------------------------------------------------------------
-
-The zlib/libpng License
-
-Copyright (c) <year> <copyright holders>
-
-This software is provided 'as-is', without any express or implied warranty. In
-no event will the authors be held liable for any damages arising from the use
-of this software.
-
-Permission is granted to anyone to use this software for any purpose, including
-commercial applications, and to alter it and redistribute it freely, subject to
-the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software in a
- product, an acknowledgment in the product documentation would be
- appreciated but is not required.
-
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-
- 3. This notice may not be removed or altered from any source distribution.
-
---------------------------------------------------------------------------
-
+As a special exception to the GNU Lesser General Public License
+version 2.1, the object code form of a "work that uses the Library"
+may incorporate material from a header file that is part of the
+Library. You may distribute such object code under terms of your
+choice, provided that the incorporated material (i) does not exceed
+more than 5% of the total size of the Library; and (ii) is limited to
+numerical parameters, data structure layouts, accessors, macros,
+inline functions and templates.
Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules 2009-03-03 16:53:33 UTC (rev 13948)
+++ trunk/packages/qt4-x11/debian/rules 2009-03-03 17:44:10 UTC (rev 13949)
@@ -38,7 +38,7 @@
# Disable for rc
DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
-DEB_INSTALL_DOCS_ALL := GPL_EXCEPTION_ADDENDUM.TXT
+DEB_INSTALL_DOCS_ALL := LGPL_EXCEPTION.txt
ibase_architectures := i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(ibase_architectures)))
More information about the pkg-kde-commits
mailing list