[SCM] mediatomb/master: Update copyright file to include full text of various BSD licenses.

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

The following commit has been merged in the master branch:
commit 08de4baf59bc73bbd09919f4fc38bf34b9bd01ad
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat Sep 11 23:59:40 2010 -0400

    Update copyright file to include full text of various BSD licenses.

diff --git a/debian/copyright b/debian/copyright
index d8e0d77..6dfb6cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -119,7 +119,7 @@ License: public domain
    Still in the public domain.
 
 Files: web/js/md5.js
-Copyright: (C) Paul Johnston 1999 - 2002
+Copyright: (C) 1998 - 2009, Paul Johnston & Contributors
 License: BSD-3
    A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
    Digest Algorithm, as defined in RFC 1321.
@@ -129,7 +129,32 @@ License: BSD-3
    See http://pajhome.org.uk/crypt/md5 for more info.
 
    The BSD license used for this file is given at
-   http://pajhome.org.uk/site/legal.html#bsdlicense.
+   http://pajhome.org.uk/site/legal.html#bsdlicense and is repeated below.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. Redistributions in binary
+   form must reproduce the above copyright notice, this list of conditions and
+   the following disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of the author nor the names of its contributors may be used
+   to endorse or promote products derived from this software without specific
+   prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (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: web/js/prototype.js
 Copyright: (C) 2005-2008 Sam Stephenson
@@ -197,6 +222,30 @@ License: BSD-3 | LGPL-2.1
    /pupnp code that were made by the MediaTomb team are covered by the LGPL
    license.
 
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+   * Neither name of Intel Corporation nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+   OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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: acinclude.m4
 Copyright: (C) 2006 Steven G. Johnson <stevenj at alum.mit.edu>
 License: GPL-2+
@@ -253,6 +302,3 @@ The complete text of the GNU Lesser General Public License can be found in
 
 The complete text of the GNU Lesser General Public License, version 2.1 can be
 found in `/usr/share/common-licenses/LGPL-2.1'.
-
-The complete text of the Berkeley Software Distribution license can be
-found in `/usr/share/common-licenses/BSD'.

-- 
MediaTomb packaging