[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6226-g0fa5f35

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 9801ece096fbbfb1950d30f450bad8d3bca3d0af
Author: Michael Tautschnig <tautschnig at joey.forsyte>
Date:   Sun Jul 25 08:24:50 2010 +0200

    Copied BSD license text as suggested by lintian
    
    - Text taken from concerned files
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index eea74af..a70f88d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ clamav (0.96.1+dfsg-2) unstable; urgency=low
     - German (closes: #585482)
     - Russian (closes: #585691)
     - French (closes: #585894)
+  * Copied BSD license text from concerned files into debian/copyright, as
+    suggested by lintian.
 
- -- Michael Tautschnig <mt at debian.org>  Sat, 24 Jul 2010 18:09:56 +0200
+ -- Michael Tautschnig <mt at debian.org>  Sun, 25 Jul 2010 08:24:18 +0200
 
 clamav (0.96.1+dfsg-1) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 7e547da..3fd5e3b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -85,24 +85,34 @@ They have the following 2-clause BSD license:
 
 
 All files in libclamav/regex/ are Copyright (c) 1992, 1993, 1994 Henry Spencer
-and the Regents of the University of California.
+and the Regents of the University of California. This code is derived from
+OpenBSD's libc/regex, original BSD license follows below.
 libclamav/qsort.c is Copyright (c) 1992, 1993 The Regents of the University of California.
 They are licensed under the BSD license:
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. 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.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
-
-On Debian GNU/Linux systems, the complete text of the BSD License can be found
-in `/usr/share/common-licenses/BSD'.
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
 
 libclamav/is_tar.c is placed in the public domain:
  Stolen (by the author of the file utility!) from the public domain tar program:

-- 
Debian repository for ClamAV