[Forensics-changes] [SCM] debian-forensics/sleuthkit branch, debian, updated. debian/3.1.3-1-20-g80ab685

Julien Valroff julien at kirya.net
Thu Jun 2 07:07:28 UTC 2011


The following commit has been merged in the debian branch:
commit 64450a7841215fdfdc35f7d3d3575548290348fb
Author: Julien Valroff <julien at kirya.net>
Date:   Wed Jun 1 20:36:46 2011 +0200

    Update copyright - still needs to be checked

diff --git a/debian/changelog b/debian/changelog
index b84e550..28d3b96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ sleuthkit (3.2.1-1~1.gbpc1daa5) UNRELEASED; urgency=low
   * Refresh patch to prevent static linking
   * Add myself as uploader 
   * Bump debhelper compat to 8 
+  * Update copyright information 
 
- -- Julien Valroff <julien at debian.org>  Wed, 01 Jun 2011 20:11:45 +0200
+ -- Julien Valroff <julien at debian.org>  Wed, 01 Jun 2011 20:26:49 +0200
 
 sleuthkit (3.1.3-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index a0e5911..2618186 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
-Name: sleuthkit
-Maintainer: Brian Carrier <carrier at sleuthkit.org>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174 
+Upstream-Name: The Sleuth Kit (TSK)
+Upstream-Contact: Brian Carrier <carrier at sleuthkit.org>
 Source: http://www.sleuthkit.org/sleuthkit/
 
 Files: *
@@ -8,14 +8,16 @@ Copyright: 2001-2009, Brian Carrier <carrier at sleuthkit.org>
 License: CPL-1.0 or IBM-PL-1.0
 
 Files: debian/*
-Copyright: 2009, Cristian Greco <cristian.debian at gmail.com>
+Copyright: 2003-2004, Mattia Monga <monga at debian.org>
            2004-2009, Martin A. Godisch <godisch at debian.org>
-           2003-2004, Mattia Monga <monga at debian.org>
+           2009-2010, Cristian Greco <cristian at regolo.cc>
+           2010-2011, Christophe Monniez <christophe.monniez at fccu.be>
+           2011, Julien Valroff <julien at debian.org>
 License: GPL-2+
 
 Files: samples/callback-style.cpp, samples/posix-style.cpp
 Copyright: 2008, Brian Carrier <carrier at sleuthkit.org>
-License: BSD
+License: BSD-3-clause
 
 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,
@@ -25,7 +27,7 @@ Files: tools/fstools/blkls.cpp, tools/fstools/icat.cpp, tools/fstools/ils.cpp,
        tsk/fs/tsk_hfs.h, tsk/fs/tsk_iso9660.h
 Copyright: 1997-1999, International Business Machine Corporation
            2002-2009, Brian Carrier <carrier at sleuthkit.org>
-LICENSE: IBM-PL-1.0
+License: IBM-PL-1.0
 
 Files: tools/srchtools/srch_strings.c
 Copyright: Richard Stallman <rms at gnu.ai.mit.edu>
@@ -34,35 +36,34 @@ License: GPL-2+
 
 Files: tsk3/base/XGetopt.c
 Copyright: 2002-2003, Hans Dietrich <hdietrich2 at hotmail.com>
-License: other
+License: public-domain
  This software is released into the public domain.
  You are free to use it in any way you like.
-
+ .
  This software is provided "as is" with no expressed
  or implied warranty.  I accept no liability for any
  damage or loss of business that this software may cause.
 
-
 License: CPL-1.0
  Common Public License Version 1.0
-
+ .
  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
  LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
  CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
+ .
  1. DEFINITIONS
-
+ .
  "Contribution" means:
-
+ .
     a) in the case of the initial Contributor, the initial code and
  documentation distributed under this Agreement, and
-
+ .
     b) in the case of each subsequent Contributor:
-
+ .
     i) changes to the Program, and
-
+ .
     ii) additions to the Program;
-
+ .
     where such changes and/or additions to the Program originate from and are
  distributed by that particular Contributor. A Contribution 'originates' from a
  Contributor if it was added to the Program by such Contributor itself or
@@ -70,27 +71,27 @@ License: CPL-1.0
  additions to the Program which: (i) are separate modules of software
  distributed in conjunction with the Program under their own license
  agreement, and (ii) are not derivative works of the Program.
-
+ .
  "Contributor" means any person or entity that distributes the Program.
-
+ .
  "Licensed Patents " mean patent claims licensable by a Contributor which are
  necessarily infringed by the use or sale of its Contribution alone or when
  combined with the Program.
-
+ .
  "Program" means the Contributions distributed in accordance with this
  Agreement.
-
+ .
  "Recipient" means anyone who receives the Program under this Agreement,
  including all Contributors.
-
+ .
  2. GRANT OF RIGHTS
-
+ .
     a) Subject to the terms of this Agreement, each Contributor hereby grants
  Recipient a non-exclusive, worldwide, royalty-free copyright license to
  reproduce, prepare derivative works of, publicly display, publicly perform,
  distribute and sublicense the Contribution of such Contributor, if any, and
  such derivative works, in source code and object code form.
-
+ .
     b) Subject to the terms of this Agreement, each Contributor hereby grants
  Recipient a non-exclusive, worldwide, royalty-free patent license under
  Licensed Patents to make, use, sell, offer to sell, import and otherwise
@@ -102,7 +103,7 @@ License: CPL-1.0
  the Licensed Patents. The patent license shall not apply to any other
  combinations which include the Contribution. No hardware per se is licensed
  hereunder.
-
+ .
     c) Recipient understands that although each Contributor grants the
  licenses to its Contributions set forth herein, no assurances are provided by
  any Contributor that the Program does not infringe the patent or other
@@ -114,52 +115,52 @@ License: CPL-1.0
  needed, if any.  For example, if a third party patent license is required to
  allow Recipient to distribute the Program, it is Recipient's responsibility
  to acquire that license before distributing the Program.
-
+ .
     d) Each Contributor represents that to its knowledge it has sufficient
  copyright rights in its Contribution, if any, to grant the copyright license
  set forth in this Agreement.
-
+ .
  3. REQUIREMENTS
-
+ .
  A Contributor may choose to distribute the Program in object code form under
  its own license agreement, provided that:
-
+ .
     a) it complies with the terms and conditions of this Agreement; and
-
+ .
     b) its license agreement:
-
+ .
     i) effectively disclaims on behalf of all Contributors all warranties and
  conditions, express and implied, including warranties or conditions of title
  and non-infringement, and implied warranties or conditions of merchantability
  and fitness for a particular purpose;
-
+ .
     ii) effectively excludes on behalf of all Contributors all liability for
  damages, including direct, indirect, special, incidental and consequential
  damages, such as lost profits;
-
+ .
     iii) states that any provisions which differ from this Agreement are
  offered by that Contributor alone and not by any other party; and
-
+ .
     iv) states that source code for the Program is available from such
  Contributor, and informs licensees how to obtain it in a reasonable manner on
  or through a medium customarily used for software exchange.
-
+ .
  When the Program is made available in source code form:
-
+ .
     a) it must be made available under this Agreement; and
-
+ .
     b) a copy of this Agreement must be included with each copy of the
      Program.
-
+ .
  Contributors may not remove or alter any copyright notices contained within
  the Program.
-
+ .
  Each Contributor must identify itself as the originator of its Contribution,
  if any, in a manner that reasonably allows subsequent Recipients to identify
  the originator of the Contribution.
-
+ .
  4. COMMERCIAL DISTRIBUTION
-
+ .
  Commercial distributors of software may accept certain responsibilities with
  respect to end users, business partners and the like. While this license is
  intended to facilitate the commercial use of the Program, the Contributor who
@@ -180,7 +181,7 @@ License: CPL-1.0
  Commercial Contributor in, the defense and any related settlement
  negotiations. The Indemnified Contributor may participate in any such claim
  at its own expense.
-
+ .
  For example, a Contributor might include the Program in a commercial product
  offering, Product X. That Contributor is then a Commercial Contributor. If
  that Commercial Contributor then makes performance claims, or offers
@@ -190,9 +191,9 @@ License: CPL-1.0
  Contributors related to those performance claims and warranties, and if a
  court requires any other Contributor to pay any damages as a result, the
  Commercial Contributor must pay those damages.
-
+ .
  5. NO WARRANTY
-
+ .
  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
  AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
  EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
@@ -203,9 +204,9 @@ License: CPL-1.0
  not limited to the risks and costs of program errors, compliance with
  applicable laws, damage to or loss of data, programs or equipment, and
  unavailability or interruption of operations.
-
+ .
  6. DISCLAIMER OF LIABILITY
-
+ .
  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
  CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
@@ -214,15 +215,15 @@ License: CPL-1.0
  ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
  EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
  OF SUCH DAMAGES.
-
+ .
  7. GENERAL
-
+ .
  If any provision of this Agreement is invalid or unenforceable under
  applicable law, it shall not affect the validity or enforceability of the
  remainder of the terms of this Agreement, and without further action by the
  parties hereto, such provision shall be reformed to the minimum extent
  necessary to make such provision valid and enforceable.
-
+ .
  If Recipient institutes patent litigation against a Contributor with respect
  to a patent applicable to software (including a cross-claim or counterclaim
  in a lawsuit), then any patent licenses granted by that Contributor to such
@@ -233,7 +234,7 @@ License: CPL-1.0
  or hardware) infringes such Recipient's patent(s), then such Recipient's
  rights granted under Section 2(b) shall terminate as of the date such
  litigation is filed.
-
+ .
  All Recipient's rights under this Agreement shall terminate if it fails to
  comply with any of the material terms or conditions of this Agreement and
  does not cure such failure in a reasonable period of time after becoming
@@ -242,7 +243,7 @@ License: CPL-1.0
  soon as reasonably practicable. However, Recipient's obligations under this
  Agreement and any licenses granted by Recipient relating to the Program shall
  continue and survive.
-
+ .
  Everyone is permitted to copy and distribute copies of this Agreement, but in
  order to avoid inconsistency the Agreement is copyrighted and may only be
  modified in the following manner. The Agreement Steward reserves the right to
@@ -260,7 +261,7 @@ License: CPL-1.0
  of any Contributor under this Agreement, whether expressly, by implication,
  estoppel or otherwise. All rights in the Program not expressly granted under
  this Agreement are reserved.
-
+ .
  This Agreement is governed by the laws of the State of New York and the
  intellectual property laws of the United States of America. No party to this
  Agreement will bring a legal action under this Agreement more than one year
@@ -269,13 +270,13 @@ License: CPL-1.0
 
 License: IBM-PL-1.0
  IBM PUBLIC LICENSE VERSION 1.0 - CORONER TOOLKIT UTILITIES
-
+ .
  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS IBM PUBLIC
  LICENSE ("AGREEMENT").  ANY USE, REPRODUCTION OR DISTRIBUTION OF THE
  PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
+ .
  1.  DEFINITIONS
-
+ .
  "Contribution" means:
     a) in the case of International Business Machines Corporation ("IBM"), 
        the Original Program, and 
@@ -291,31 +292,31 @@ License: IBM-PL-1.0
        (i)  are separate modules of software distributed in conjunction 
             with the Program under their own license agreement, and 
        (ii) are not derivative works of the Program.
-
+ .
  "Contributor" means IBM and any other entity that distributes the Program.
-
+ .
  "Licensed Patents " mean patent claims licensable by a Contributor which
  are necessarily infringed by the use or sale of its Contribution alone
  or when combined with the Program.
-
+ .
  "Original Program" means the original version of the software accompanying
  this Agreement as released by IBM, including source code, object code
  and documentation, if any.
-
+ .
  "Program" means the Original Program and Contributions.
-
+ .
  "Recipient" means anyone who receives the Program under this Agreement,
  including all Contributors.
-
+ .
  2.  GRANT OF RIGHTS
-
+ .
     a) Subject to the terms of this Agreement, each Contributor hereby
     grants Recipient a non-exclusive, worldwide, royalty-free copyright
     license to reproduce, prepare derivative works of, publicly display,
     publicly perform, distribute and sublicense the Contribution of such
     Contributor, if any, and such derivative works, in source code and
     object code form.
-
+ .
     b) Subject to the terms of this Agreement, each Contributor hereby
     grants Recipient a non-exclusive, worldwide, royalty-free patent
     license under Licensed Patents to make, use, sell, offer to sell,
@@ -327,7 +328,7 @@ License: IBM-PL-1.0
     by the Licensed Patents.  The patent license shall not apply to any
     other combinations which include the Contribution.  No hardware per
     se is licensed hereunder.
-
+ .
     c) Recipient understands that although each Contributor grants the
     licenses to its Contributions set forth herein, no assurances are
     provided by any Contributor that the Program does not infringe the
@@ -341,13 +342,13 @@ License: IBM-PL-1.0
     is required to allow Recipient to distribute the Program, it is
     Recipient's responsibility to acquire that license before distributing
     the Program.
-
+ .
     d) Each Contributor represents that to its knowledge it has sufficient
     copyright rights in its Contribution, if any, to grant the copyright
     license set forth in this Agreement.
-
+ .
  3.  REQUIREMENTS
-
+ .
  A Contributor may choose to distribute the Program in object code form
  under its own license agreement, provided that:
     a) it complies with the terms and conditions of this Agreement; and
@@ -367,24 +368,24 @@ License: IBM-PL-1.0
             such Contributor, and informs licensees how to obtain it in a
             reasonable manner on or through a medium customarily used for 
             software exchange. 
-
+ .
  When the Program is made available in source code form:
     a) it must be made available under this Agreement; and 
     b) a copy of this Agreement must be included with each copy of the 
        Program.  
-
+ .
  Each Contributor must include the following in a conspicuous location
  in the Program:
-
+ .
     Copyright (c) 1997,1998,1999, International Business Machines
     Corporation and others. All Rights Reserved.
-
+ .
  In addition, each Contributor must identify itself as the originator of
  its Contribution, if any, in a manner that reasonably allows subsequent
  Recipients to identify the originator of the Contribution.
-
+ .
  4.  COMMERCIAL DISTRIBUTION
-
+ .
  Commercial distributors of software may accept certain responsibilities
  with respect to end users, business partners and the like.  While this
  license is intended to facilitate the commercial use of the Program, the
@@ -407,7 +408,7 @@ License: IBM-PL-1.0
        the Commercial Contributor in, the defense and any related 
        settlement negotiations.  The Indemnified Contributor may 
        participate in any such claim at its own expense.
-
+ .
  For example, a Contributor might include the Program in a commercial
  product offering, Product X.  That Contributor is then a Commercial
  Contributor.  If that Commercial Contributor then makes performance
@@ -418,9 +419,9 @@ License: IBM-PL-1.0
  claims and warranties, and if a court requires any other Contributor to
  pay any damages as a result, the Commercial Contributor must pay those
  damages.
-
+ .
  5.  NO WARRANTY
-
+ .
  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED
  ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
  EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
@@ -431,9 +432,9 @@ License: IBM-PL-1.0
  including but not limited to the risks and costs of program errors,
  compliance with applicable laws, damage to or loss of data, programs or
  equipment, and unavailability or interruption of operations.
-
+ .
  6.  DISCLAIMER OF LIABILITY
-
+ .
  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
  ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
@@ -442,15 +443,15 @@ License: IBM-PL-1.0
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION
  OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
+ .
  7.  GENERAL
-
+ .
  If any provision of this Agreement is invalid or unenforceable under
  applicable law, it shall not affect the validity or enforceability of
  the remainder of the terms of this Agreement, and without further action
  by the parties hereto, such provision shall be reformed to the minimum
  extent necessary to make such provision valid and enforceable.
-
+ .
  If Recipient institutes patent litigation against a Contributor with
  respect to a patent applicable to software (including a cross-claim or
  counterclaim in a lawsuit), then any patent licenses granted by that
@@ -461,7 +462,7 @@ License: IBM-PL-1.0
  combinations of the Program with other software or hardware) infringes
  such Recipient's patent(s), then such Recipient's rights granted under
  Section 2(b) shall terminate as of the date such litigation is filed.
-
+ .
  All Recipient's rights under this Agreement shall terminate if it fails
  to comply with any of the material terms or conditions of this Agreement
  and does not cure such failure in a reasonable period of time after
@@ -470,7 +471,7 @@ License: IBM-PL-1.0
  of the Program as soon as reasonably practicable.  However, Recipient's
  obligations under this Agreement and any licenses granted by Recipient
  relating to the Program shall continue and survive.
-
+ .
  IBM may publish new versions (including revisions) of this Agreement
  from time to time.  Each new version of the Agreement will be given a
  distinguishing version number.  The Program (including Contributions)
@@ -483,18 +484,18 @@ License: IBM-PL-1.0
  intellectual property of any Contributor under this Agreement, whether
  expressly, by implication, estoppel or otherwise.  All rights in the
  Program not expressly granted under this Agreement are reserved.
-
+ .
  This Agreement is governed by the laws of the State of New York and the
  intellectual property laws of the United States of America. No party to
  this Agreement will bring a legal action under this Agreement more than
  one year after the cause of action arose.  Each party waives its rights
  to a jury trial in any resulting litigation.
 
-License: BSD
+License: BSD-3-clause
  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
@@ -503,7 +504,7 @@ License: BSD
  - 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
@@ -517,5 +518,20 @@ License: BSD
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+ .
  On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'.

-- 
debian-forensics/sleuthkit



More information about the forensics-changes mailing list