[SCM] faac packaging branch, master, updated. debian/1.28-0fab2-3-gcb57664

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cb57664e047ff2dcfb42693948d3ae6af4b10d37
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Fri Jul 3 09:28:39 2009 +0200

    Come cleanups in debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 77e7e5a..2607d0f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -78,6 +78,44 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL'.
 
+Files: libfaac/channels.c,
+       libfaac/filtbank.c,
+       libfaac/ltp.c,
+       libfaac/huffman.{c,h},
+       libfaac/bitstream.{c,h},
+       libfaac/tns.h,
+       libfaac/backpred.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.
+
 Files: libfaac/kiss_fft/*
 Copyright: © 2003-2004, Mark Borgerding
 License: BSD
@@ -104,31 +142,6 @@ License: BSD
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: plugins/foo_faac/foo_faac.cpp
-Copyright: © 2003, Janne Hyvärinen
-License: n/a
-
-Files: plugins/winamp/wa_ipc.h
-Copyright: © 2003, Nullsoft, Inc.
-License: other
- 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.
-
 Files: debian/*
 Copyright: © 2005-2009, Fabian Greffrath <fabian at greffrath.com>
 License: GAP

-- 
faac packaging