[SCM] gpac/master: Update debian/copyright.

Fri Feb 3 22:55:13 UTC 2012

The following commit has been merged in the master branch:
commit b0af80cbe3d0f7739b7025b48962179b5c5ead67
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Feb 3 23:55:11 2012 +0100

    Update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 3031ad1..28077d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174&view=markup
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=204
 Upstream-Name: gpac
 Upstream-Contact: jeanlf at users.sourceforge.net
 Source: http://gpac.sourceforge.net
@@ -19,7 +19,8 @@ Copyright: © 2002, John Labenski
 License: wxWidgets
 
 Files: debian/*
-Copyright: © 2009-2011, Andres Mejia <amejia at debian.org>
+Copyright: © 2012, Alessio Treglia <alessio at debian.org>
+           © 2009-2011, Andres Mejia <amejia at debian.org>
            © 2009-2011, Reinhard Tartler <siretart at tauware.de>
 License: LGPL-2+
 
@@ -229,28 +230,7 @@ Files: gui/mpegu-core.js
        modules/widgetman/widget*
 Copyright: © 2009, Jean Le Feuvre
            © 2009, Telecom ParisTech
-License: other
- This software module was originally developed by TelecomParisTech in the
- course of the development of MPEG-U Widgets (ISO/IEC 23007-1) standard.
- .
- This software module is an implementation of a part of one or
- more MPEG-U Widgets (ISO/IEC 23007-1) tools as specified by the MPEG-U Widgets
- (ISO/IEC 23007-1) standard. ISO/IEC gives users of the MPEG-U Widgets
- (ISO/IEC 23007-1) free license to this software module or modifications
- thereof for use in hardware or software products claiming conformance to
- the MPEG-U Widgets (ISO/IEC 23007-1). Those intending to use this software
- module in hardware or software products are advised that its use may
- infringe existing patents.
- The original developer of this software module and his/her company, the
- subsequent editors and their companies, and ISO/IEC have no liability
- for use of this software module or modifications thereof in an implementation.
- Copyright is not released for non MPEG-U Widgets (ISO/IEC 23007-1) conforming
- products.
- Telecom ParisTech retains full right to use the code for his/her own purpose,
- assign or donate the code to a third party and to inhibit third parties from
- using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products.
- .
- This copyright notice must be included in all copies or derivative works.
+License: other-1
 
 Files: include/gpac/internal/avilib.h
        src/media_tools/avilib.c
@@ -340,81 +320,7 @@ License: Zlib
 
 Files: modules/xvid_dec/xvid_wce/Rules.h
 Copyright: © Lonely Cat Games
-License: other
- SmartMovie - License agreement.
- .
- ***IMPORTANT-READ CAREFULLY***
- This End User License Agreement ("EULA") is a legal agreement between you
- (either an individual or a single entity) and LONELY CAT GAMES ("Manufacturer")
- the manufacturer of SmartMovie ("SOFTWARE"). By installing, copying or
- otherwise using the SOFTWARE, you agree to be bound by the terms of this EULA.
- If you do not agree to the terms of this EULA, the Manufacturer is unwilling to
- license the SOFTWARE to you. In such event, you may not use or copy the
- SOFTWARE and you should contact manufacturer.
- .
- ***LICENSE***
- LONELY CAT GAMES grants you, and you accept, a non-exclusive license to use the
- SOFTWARE on one mobile device according to the following terms:
- .
- ***SOFTWARE LICENSE***
- The SOFTWARE is protected by copyright laws and international copyright
- treaties, as well as other intellectual property laws and treaties.
- The SOFTWARE is licensed, not sold.
- .
- ***GRANT OF LICENSE***
- You may use the SOFTWARE only in conjunction with one device.
- You may make copies of the SOFTWARE only for backup and archival purposes.
- You are expressly prohibited from sublicensing, assigning, renting, loaning,
- copying, or otherwise transferring the SOFTWARE or documentation to anyone,
- except as specifically provided in this Agreement. You may not alter, modify,
- adapt, create a derivative work, merge, translate, decompile, disassemble, or
- reverse engineer the SOFTWARE. Any attempt to do any of the foregoing shall
- automatically terminate your license.
- You may permanently transfer this license to another user but only if you
- transfer all disks and documentation, you cease to use and destroy you own
- working copy of the SOFTWARE, and the recipient specifically agrees to all of
- the terms of this Agreement.
- This license and your right to use the SOFTWARE automatically terminate if you
- fail to comply with any provision of this license agreement. Upon termination
- you will destroy all documentation, disks, and working copies of the SOFTWARE.
- .
- ***LIMITED WARRANTY***
- LONELY CAT GAMES warrants that the SOFTWARE will substantially conform to
- published specifications and to the documentation, provided it is used with
- compatible computer hardware and operating systems.
- LONELY CAT GAMES also warrants that the original installation file is free from
- defects immaterial and workmanship.
- EXCEPT AS SPECIFICALLY PROVIDED ABOVE, LONELY CAT GAMES MAKES NO OTHER WARRANTY
- OR REPRESENTATION, EITHER EXPRESS OR IMPLIED, WITH RESPECT TO THE SOFTWARE,
- DISKETTES OR DOCUMENTATION, INCLUDING THEIR QUALITY, MERCHANTABILITY, OR
- FITNESS FOR A PARTICULAR PURPOSE.
- LONELY CAT GAMES DOES NOT WARRANT THAT THE SOFTWARE'S FUNCTIONS WILL MEET YOUR
- REQUIREMENTS OR THAT ITS OPERATION WILL BE UNINTERRUPTED OR ERROR FREE.
- IN NO EVENT WILL LONELY CAT GAMES OR ANYONE ELSE INVOLVED IN THE CREATION,
- PRODUCTION, OR DELIVERY OF THIS SOFTWARE BE LIABLE FOR DIRECT, INDIRECT,
- SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF USE OR INABILITY
- TO USE THE SOFTWARE OR DOCUMENTATION. EVEN IF LONELY CAT GAMES HAS BEEN ADVISED
- OF THE POSSIBILITY TO SUCH DAMAGES.
- LONELY CAT GAMES is not responsible for any costs including, but not limited
- to, those incurred as a result of lost of profits or revenue, loss of time,
- data, or use of the software, the costs or recovering such software or data,
- the costs of substitute software, claims by third parties, or other similar
- costs. IN NO CASE WILL LONELY CAT GAMES LIABILITY EXCEED THE AMOUNT OF THE
- RETAIL LICENSE FEE.
- THE WARRANTIES AND REMEDIES SET FORTH ABOVE ARE EXCLUSIVE AND IN LIEU OF ALL
- OTHERS, ORAL OR WRITTEN, EXPRESS OR IMPLIED.
- The warranties provided give you specific legal rights. You may have other
- rights which vary from state to state. Some states do not allow the exclusion
- or limitation of implied warranties or of incidental or consequential damages,
- so some of the above may not apply to you.
- .
- ***GENERAL***
- This Agreement is the entire agreement between you and LONELY CAT GAMES
- relative to the SOFTWARE and supersedes all prior written statements, proposals
- or agreements relative to its subject matter. LONELY CAT GAMES owns all title
- to the SOFTWARE and documentation, all rights not expressly granted are
- retained, and no rights under federal copyright or other applicable laws are
- waived.
+License: other-2
 
 Files: src/media_tools/mpeg2_ps.*
 Copyright: © 2004, Cisco Systems Inc.
@@ -427,8 +333,7 @@ License: LGPL-2+
 Files: src/mcrypt/des.c
        src/mcrypt/tripledes.c
 Copyright: N/A
-License: public domain
-Comment:
+License: public-domain
  Disclaimer in the source files stating that this code is in the public domain
  is repeated below.
  .
@@ -441,10 +346,7 @@ License: LGPL-2+
 
 Files: src/mcrpyt/rijndael-*
 Copyright: © 1999, Mike Scott
-License: other
- Permission for free direct or derivative use is granted subject
- to compliance with any conditions that the originators of the
- algorithm place on its exploitation.
+License: other-3
 
 Files: src/mcrypt/sha1.c
 Copyright: © 2003-2006, Christophe Devine
@@ -452,8 +354,7 @@ License: LGPL-2.1+
 
 Files: src/utils/dlmalloc.c
 Copyright: N/A
-License: public domain
-Comment:
+License: public-domain
  The statement about this code being in the public domain is written verbatim
  below.
  .
@@ -1392,12 +1293,12 @@ License: GPL-1+
  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.
- .
+Comment:
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the complete text of the GNU General
- Public License version 1 can be found in `/usr/share/common-licenses/GPL-1'.
+ On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in `/usr/share/common-licenses/GPL-1'.
 
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
@@ -1409,12 +1310,29 @@ License: GPL-2+
  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.
+Comment:
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
+ On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+
+License: GPL-3+
+ This program 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 3 of the License, or
+ (at your option) any later version.
+ .
+ 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 General Public License for more details.
+Comment:
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
 License: LGPL-2+
  This library is free software; you can redistribute it and/or
@@ -1450,6 +1368,110 @@ License: LGPL-2.1+
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
+License: other-1
+ This software module was originally developed by TelecomParisTech in the
+ course of the development of MPEG-U Widgets (ISO/IEC 23007-1) standard.
+ .
+ This software module is an implementation of a part of one or
+ more MPEG-U Widgets (ISO/IEC 23007-1) tools as specified by the MPEG-U Widgets
+ (ISO/IEC 23007-1) standard. ISO/IEC gives users of the MPEG-U Widgets
+ (ISO/IEC 23007-1) free license to this software module or modifications
+ thereof for use in hardware or software products claiming conformance to
+ the MPEG-U Widgets (ISO/IEC 23007-1). Those intending to use this software
+ module in hardware or software products are advised that its use may
+ infringe existing patents.
+ The original developer of this software module and his/her company, the
+ subsequent editors and their companies, and ISO/IEC have no liability
+ for use of this software module or modifications thereof in an implementation.
+ Copyright is not released for non MPEG-U Widgets (ISO/IEC 23007-1) conforming
+ products.
+ Telecom ParisTech retains full right to use the code for his/her own purpose,
+ assign or donate the code to a third party and to inhibit third parties from
+ using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products.
+ .
+ This copyright notice must be included in all copies or derivative works.
+
+License: other-2
+ SmartMovie - License agreement.
+ .
+ ***IMPORTANT-READ CAREFULLY***
+ This End User License Agreement ("EULA") is a legal agreement between you
+ (either an individual or a single entity) and LONELY CAT GAMES ("Manufacturer")
+ the manufacturer of SmartMovie ("SOFTWARE"). By installing, copying or
+ otherwise using the SOFTWARE, you agree to be bound by the terms of this EULA.
+ If you do not agree to the terms of this EULA, the Manufacturer is unwilling to
+ license the SOFTWARE to you. In such event, you may not use or copy the
+ SOFTWARE and you should contact manufacturer.
+ .
+ ***LICENSE***
+ LONELY CAT GAMES grants you, and you accept, a non-exclusive license to use the
+ SOFTWARE on one mobile device according to the following terms:
+ .
+ ***SOFTWARE LICENSE***
+ The SOFTWARE is protected by copyright laws and international copyright
+ treaties, as well as other intellectual property laws and treaties.
+ The SOFTWARE is licensed, not sold.
+ .
+ ***GRANT OF LICENSE***
+ You may use the SOFTWARE only in conjunction with one device.
+ You may make copies of the SOFTWARE only for backup and archival purposes.
+ You are expressly prohibited from sublicensing, assigning, renting, loaning,
+ copying, or otherwise transferring the SOFTWARE or documentation to anyone,
+ except as specifically provided in this Agreement. You may not alter, modify,
+ adapt, create a derivative work, merge, translate, decompile, disassemble, or
+ reverse engineer the SOFTWARE. Any attempt to do any of the foregoing shall
+ automatically terminate your license.
+ You may permanently transfer this license to another user but only if you
+ transfer all disks and documentation, you cease to use and destroy you own
+ working copy of the SOFTWARE, and the recipient specifically agrees to all of
+ the terms of this Agreement.
+ This license and your right to use the SOFTWARE automatically terminate if you
+ fail to comply with any provision of this license agreement. Upon termination
+ you will destroy all documentation, disks, and working copies of the SOFTWARE.
+ .
+ ***LIMITED WARRANTY***
+ LONELY CAT GAMES warrants that the SOFTWARE will substantially conform to
+ published specifications and to the documentation, provided it is used with
+ compatible computer hardware and operating systems.
+ LONELY CAT GAMES also warrants that the original installation file is free from
+ defects immaterial and workmanship.
+ EXCEPT AS SPECIFICALLY PROVIDED ABOVE, LONELY CAT GAMES MAKES NO OTHER WARRANTY
+ OR REPRESENTATION, EITHER EXPRESS OR IMPLIED, WITH RESPECT TO THE SOFTWARE,
+ DISKETTES OR DOCUMENTATION, INCLUDING THEIR QUALITY, MERCHANTABILITY, OR
+ FITNESS FOR A PARTICULAR PURPOSE.
+ LONELY CAT GAMES DOES NOT WARRANT THAT THE SOFTWARE'S FUNCTIONS WILL MEET YOUR
+ REQUIREMENTS OR THAT ITS OPERATION WILL BE UNINTERRUPTED OR ERROR FREE.
+ IN NO EVENT WILL LONELY CAT GAMES OR ANYONE ELSE INVOLVED IN THE CREATION,
+ PRODUCTION, OR DELIVERY OF THIS SOFTWARE BE LIABLE FOR DIRECT, INDIRECT,
+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF USE OR INABILITY
+ TO USE THE SOFTWARE OR DOCUMENTATION. EVEN IF LONELY CAT GAMES HAS BEEN ADVISED
+ OF THE POSSIBILITY TO SUCH DAMAGES.
+ LONELY CAT GAMES is not responsible for any costs including, but not limited
+ to, those incurred as a result of lost of profits or revenue, loss of time,
+ data, or use of the software, the costs or recovering such software or data,
+ the costs of substitute software, claims by third parties, or other similar
+ costs. IN NO CASE WILL LONELY CAT GAMES LIABILITY EXCEED THE AMOUNT OF THE
+ RETAIL LICENSE FEE.
+ THE WARRANTIES AND REMEDIES SET FORTH ABOVE ARE EXCLUSIVE AND IN LIEU OF ALL
+ OTHERS, ORAL OR WRITTEN, EXPRESS OR IMPLIED.
+ The warranties provided give you specific legal rights. You may have other
+ rights which vary from state to state. Some states do not allow the exclusion
+ or limitation of implied warranties or of incidental or consequential damages,
+ so some of the above may not apply to you.
+ .
+ ***GENERAL***
+ This Agreement is the entire agreement between you and LONELY CAT GAMES
+ relative to the SOFTWARE and supersedes all prior written statements, proposals
+ or agreements relative to its subject matter. LONELY CAT GAMES owns all title
+ to the SOFTWARE and documentation, all rights not expressly granted are
+ retained, and no rights under federal copyright or other applicable laws are
+ waived.
+
+License: other-3
+ Permission for free direct or derivative use is granted subject
+ to compliance with any conditions that the originators of the
+ algorithm place on its exploitation.
+
 License: wxWidgets
  The wxWindows Library Licence
  .

-- 
gpac packaging

