[Forensics-changes] [SCM] debian-forensics/ext4magic branch, debian, updated. upstream/0.3.1-2-g3d56d1a

[Joao Eriberto Mota Filho]

The following commit has been merged in the debian branch:
commit 3d56d1a32b630d079306d3adb7fd16b48bc60c5a
Author: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
Date:   Fri Apr 19 23:55:44 2013 -0300

    * Improved the long description in debian/control.
    * Added Simplified BSD license to debian/copyright.

diff --git a/debian/control b/debian/control
index 3aba76f..d2e9794 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Package: ext4magic
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: recover deleted files from ext3 or ext4 partitions
- ext4magic is a file carver (or file carving).
+ ext4magic is a file carver (or file carving). It can be used when recovering
+ from disasters or in digital forensics activities.
  .
  The deletion of files in ext3/4 filesystems can not be easily reversed. Zero
  out of the block references in the inodes makes that impossible. Experiences
diff --git a/debian/copyright b/debian/copyright
index 830f337..3e92375 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,10 @@ Files: *
 Copyright: 2010-2012 Roberto Maar <robi at users.berlios.de>
 License: GPL-2.0+
 
+Files: src/magic.h
+Copyright: 2003 Christos Zoulas <christos at zoulas.com>
+License: Simplified BSD License
+
 Files: debian/*
 Copyright: 2013 Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
 License: GPL-2.0+
@@ -26,3 +30,26 @@ License: GPL-2.0+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: Simplified 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 immediately at the beginning of the file, without modification,
+    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.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.

-- 
debian-forensics/ext4magic