[SCM] faac/master: debian/copyright: cleanups

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a089f297f05e136dd2f0bba38d3c37669e2c4cba
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 22 14:58:56 2013 +0200

    debian/copyright: cleanups

diff --git a/debian/copyright b/debian/copyright
index 849af46..04e9a03 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,17 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: FAAC
 Upstream-Contact: Menno Bakker <menno at audiocoding.com>
 Source: http://www.audiocoding.com/
+Disclaimer: This package contains software that has been originally
+ developed in the course of development of the MPEG-2 NBC/MPEG-4 Audio
+ standard ISO/IEC 13818-7, 14496-1,2 and 3. This software module is an
+ implementation of a part of one or more MPEG-2 NBC/MPEG-4 Audio tools
+ as specified by the MPEG-2 NBC/MPEG-4 Audio standard.  While the
+ resulting programs and binaries result in redistributable software, the
+ effects on application packages derived from this library remain
+ unclear. Therefore, the Debian 'non-free' section is an adequate place
+ until the licenses for the problematic parts have been clarified by
+ relicensing or reimplementation.
 
 Files: *
 Copyright: © 1999-2001, Menno Bakker
@@ -74,33 +84,25 @@ Files: libfaac/channels.c
        libfaac/tns.c
 Copyright: © 1996-1997
 License: other
- This software module was originally developed by
- .
- FirstName LastName (CompanyName)
- .
- and edited by
- .
- FirstName LastName (CompanyName)
- FirstName LastName (CompanyName)
- .
- in the course of development of the MPEG-2 NBC/MPEG-4 Audio standard
- ISO/IEC 13818-7, 14496-1,2 and 3. This software module is an
- implementation of a part of one or more MPEG-2 NBC/MPEG-4 Audio tools
- as specified by the MPEG-2 NBC/MPEG-4 Audio standard. ISO/IEC gives
- users of the MPEG-2 NBC/MPEG-4 Audio standards free license to this
- software module or modifications thereof for use in hardware or
- software products claiming conformance to the MPEG-2 NBC/ MPEG-4 Audio
- standards. Those intending to use this software module in hardware or
- software products are advised that this 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-2
- NBC/MPEG-4 Audio conforming products. The original developer 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 party from using the
- code for non MPEG-2 NBC/MPEG-4 Audio conforming products. This
- copyright notice must be included in all copies or derivative works.
+ This software module was originally developed in the course of
+ development of the MPEG-2 NBC/MPEG-4 Audio standard ISO/IEC 13818-7,
+ 14496-1,2 and 3. This software module is an implementation of a part of
+ one or more MPEG-2 NBC/MPEG-4 Audio tools as specified by the MPEG-2
+ NBC/MPEG-4 Audio standard. ISO/IEC gives users of the MPEG-2 NBC/MPEG-4
+ Audio standards free license to this software module or modifications
+ thereof for use in hardware or software products claiming conformance
+ to the MPEG-2 NBC/ MPEG-4 Audio standards. Those intending to use this
+ software module in hardware or software products are advised that this
+ 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-2 NBC/MPEG-4 Audio conforming products. The
+ original developer 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 party from using the code for non MPEG-2 NBC/MPEG-4 Audio
+ conforming products. This copyright notice must be included in all
+ copies or derivative works.
 
 Files: libfaac/kiss_fft/*
 Copyright: © 2003-2004, Mark Borgerding
@@ -148,3 +150,4 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+

-- 
faac packaging