[Forensics-changes] [SCM] debian-forensics/tct branch, debian-sid, updated. upstream/1.18-17-gafa05f9

[Daniel Baumann]

The following commit has been merged in the debian-sid branch:
commit afa05f9740daea914b60bd57be5a85f8ebbb6281
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Feb 9 22:41:42 2008 +0100

    Merging copyright files.

diff --git a/debian/tct.copyright b/debian/copyright
similarity index 92%
rename from debian/tct.copyright
rename to debian/copyright
index 77a8237..846d88a 100644
--- a/debian/tct.copyright
+++ b/debian/copyright
@@ -248,3 +248,27 @@ 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.
+
+This package was produced by Yotam Rubin <yotam at makif.omer.k12.il>
+from sources obtained from:
+<http://www.porcupine.org/forensics/...>
+
+Copyright 1999 by Dan Farmer.  All rights reserved.  Some individual
+files may be covered by other copyrights (this will be noted in the
+file itself.)
+
+Redistribution and use in source and binary forms are permitted
+provided that this entire copyright notice is duplicated in all such
+copies.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR ANY PARTICULAR PURPOSE.
+
+IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, 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.
diff --git a/debian/timeout.copyright b/debian/timeout.copyright
deleted file mode 100644
index 441ccc8..0000000
--- a/debian/timeout.copyright
+++ /dev/null
@@ -1,23 +0,0 @@
-This package was produced by Yotam Rubin <yotam at makif.omer.k12.il>
-from sources obtained from:
-<http://www.porcupine.org/forensics/...>
-
-Copyright 1999 by Dan Farmer.  All rights reserved.  Some individual
-files may be covered by other copyrights (this will be noted in the
-file itself.)
-
-Redistribution and use in source and binary forms are permitted
-provided that this entire copyright notice is duplicated in all such
-copies.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR ANY PARTICULAR PURPOSE.
-
-IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, 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/tct