[Forensics-changes] [SCM] debian-forensics/sleuthkit branch, debian, updated. debian/3.1.2-1-5-gf0959a0

[Cristian Greco]

The following commit has been merged in the debian branch:
commit 684330e0bf4934ff6beeaeccb349c7b6f50ebfab
Author: Cristian Greco <cristian at regolo.cc>
Date:   Tue Jul 13 19:32:20 2010 +0200

    debian/copyright: fix copyright-refers-to-deprecated-bsd-license-file.

diff --git a/debian/copyright b/debian/copyright
index 5a77aa2..a0e5911 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,9 +13,9 @@ Copyright: 2009, Cristian Greco <cristian.debian at gmail.com>
            2003-2004, Mattia Monga <monga at debian.org>
 License: GPL-2+
 
-Files: examples/callback-style.cpp, examples/posix-style.cpp
+Files: samples/callback-style.cpp, samples/posix-style.cpp
 Copyright: 2008, Brian Carrier <carrier at sleuthkit.org>
-LICENSE: BSD-C3
+License: BSD
 
 Files: tools/fstools/blkls.cpp, tools/fstools/icat.cpp, tools/fstools/ils.cpp,
        tsk3/fs/dls_lib.c, tsk3/fs/ext2fs.c, tsk3/fs/ffs.c, tsk3/fs/fs_inode.c,
@@ -490,9 +490,31 @@ License: IBM-PL-1.0
  one year after the cause of action arose.  Each party waives its rights
  to a jury trial in any resulting litigation.
 
-License: BSD-C3
- On Debian systems, the complete text of the BSD License can be
- found in `/usr/share/common-licenses/BSD'.
+License: BSD
+ 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 Sleuth Kit name 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.
 
 License: GPL-2+
  On Debian systems, the complete text of the GNU General

-- 
debian-forensics/sleuthkit