Fix some copyright notices:

- extend some to 2007
- use njn@valgrind.org instead of njn25@cam.ac.uk
- use "tool" instead of "skin"


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6703 a5019735-40e9-0310-863c-91ae7b9d1cf9

15 files changed, 32 insertions, 30 deletions

diff --git a/cachegrind/cg-ppc32.c b/cachegrind/cg-ppc32.c
index 485d0dc47..cd447d4a0 100644
--- a/cachegrind/cg-ppc32.c
+++ b/cachegrind/cg-ppc32.c
@@ -1,13 +1,13 @@
 
 /*--------------------------------------------------------------------*/
-/*--- PPC32-specific definitions.                 ppc32/cg-ppc32.c ---*/
+/*--- PPC32-specific definitions.                       cg-ppc32.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
    This file is part of Cachegrind, a Valgrind tool for cache
    profiling programs.
 
-   Copyright (C) 2005 Nicholas Nethercote
+   Copyright (C) 2005-2007 Nicholas Nethercote
       njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
diff --git a/cachegrind/cg-ppc64.c b/cachegrind/cg-ppc64.c
index 7c09f702f..41f3054bc 100644
--- a/cachegrind/cg-ppc64.c
+++ b/cachegrind/cg-ppc64.c
@@ -1,13 +1,13 @@
 
 /*--------------------------------------------------------------------*/
-/*--- PPC64-specific definitions.                 ppc64/cg-ppc64.c ---*/
+/*--- PPC64-specific definitions.                       cg-ppc64.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
    This file is part of Cachegrind, a Valgrind tool for cache
    profiling programs.
 
-   Copyright (C) 2005 Nicholas Nethercote
+   Copyright (C) 2005-2007 Nicholas Nethercote
       njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
diff --git a/callgrind/callgrind.h b/callgrind/callgrind.h
index 1bea6311e..d3704c333 100644
--- a/callgrind/callgrind.h
+++ b/callgrind/callgrind.h
@@ -10,7 +10,7 @@
 
    ----------------------------------------------------------------
 
-   This file is part of callgrind, a valgrind skin for cache simulation
+   This file is part of callgrind, a valgrind tool for cache simulation
    and call tree tracing.
 
    Copyright (C) 2003-2007 Josef Weidendorfer.  All rights reserved.
diff --git a/callgrind/callgrind_annotate.in b/callgrind/callgrind_annotate.in
index 68703b163..f80a36ec5 100644
--- a/callgrind/callgrind_annotate.in
+++ b/callgrind/callgrind_annotate.in
@@ -11,9 +11,9 @@
 #  Copyright (C) 2003 Josef Weidendorfer
 #     Josef.Weidendorfer@gmx.de
 #
-#  This file is based heavily on vg_annotate, part of Valgrind.
+#  This file is based heavily on cg_annotate, part of Valgrind.
 #  Copyright (C) 2002 Nicholas Nethercote
-#     njn25@cam.ac.uk
+#     njn@valgrind.org
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License as
diff --git a/callgrind/clo.c b/callgrind/clo.c
index 829158ea7..98da3fe44 100644
--- a/callgrind/clo.c
+++ b/callgrind/clo.c
@@ -1,11 +1,11 @@
 /*
-   This file is part of Callgrind, a Valgrind skin for call graph
+   This file is part of Callgrind, a Valgrind tool for call graph
    profiling programs.
 
    Copyright (C) 2002-2007, Josef Weidendorfer (Josef.Weidendorfer@gmx.de)
 
-   This skin is derived from and contains lot of code from Cachegrind
-   Copyright (C) 2002 Nicholas Nethercote (njn25@cam.ac.uk)
+   This tool is derived from and contains lot of code from Cachegrind
+   Copyright (C) 2002 Nicholas Nethercote (njn@valgrind.org)
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/callgrind/command.c b/callgrind/command.c
index 67fcab9f2..faf9f9cc1 100644
--- a/callgrind/command.c
+++ b/callgrind/command.c
@@ -1,11 +1,11 @@
 /*
-   This file is part of Callgrind, a Valgrind skin for call graph
+   This file is part of Callgrind, a Valgrind tool for call graph
    profiling programs.
 
    Copyright (C) 2002-2007, Josef Weidendorfer (Josef.Weidendorfer@gmx.de)
 
-   This skin is derived from and contains lot of code from Cachegrind
-   Copyright (C) 2002 Nicholas Nethercote (njn25@cam.ac.uk)
+   This tool is derived from and contains lot of code from Cachegrind
+   Copyright (C) 2002 Nicholas Nethercote (njn@valgrind.org)
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/callgrind/debug.c b/callgrind/debug.c
index f9bc3785c..ff700ee87 100644
--- a/callgrind/debug.c
+++ b/callgrind/debug.c
@@ -1,11 +1,11 @@
 /*
-   This file is part of Callgrind, a Valgrind skin for call graph
+   This file is part of Callgrind, a Valgrind tool for call graph
    profiling programs.
 
    Copyright (C) 2002-2007, Josef Weidendorfer (Josef.Weidendorfer@gmx.de)
 
-   This skin is derived from and contains lot of code from Cachegrind
-   Copyright (C) 2002 Nicholas Nethercote (njn25@cam.ac.uk)
+   This tool is derived from and contains lot of code from Cachegrind
+   Copyright (C) 2002 Nicholas Nethercote (njn@valgrind.org)
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/callgrind/main.c b/callgrind/main.c
index 160de9565..52cc4b063 100644
--- a/callgrind/main.c
+++ b/callgrind/main.c
@@ -10,8 +10,8 @@
 
    Copyright (C) 2002-2007, Josef Weidendorfer (Josef.Weidendorfer@gmx.de)
 
-   This skin is derived from and contains code from Cachegrind
-   Copyright (C) 2002-2007 Nicholas Nethercote (njn25@cam.ac.uk)
+   This tool is derived from and contains code from Cachegrind
+   Copyright (C) 2002-2007 Nicholas Nethercote (njn@valgrind.org)
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/callgrind/sim.c b/callgrind/sim.c
index 1c4c3b5de..f15fc7d0c 100644
--- a/callgrind/sim.c
+++ b/callgrind/sim.c
@@ -5,12 +5,13 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Callgrind.
-   (c) 2003-2005, Josef Weidendorfer
+   This file is part of Callgrind, a Valgrind tool for call graph
+   profiling programs.
 
-   Parts are Copyright (C) 2002 Nicholas Nethercote
-      njn25@cam.ac.uk
+   Copyright (C) 2003-2005, Josef Weidendorfer (Josef.Weidendorfer@gmx.de)
 
+   This tool is derived from and contains code from Cachegrind
+   Copyright (C) 2002-2007 Nicholas Nethercote (njn@valgrind.org)
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/m_syswrap/syscall-ppc32-linux.S b/coregrind/m_syswrap/syscall-ppc32-linux.S
index bf51bb734..35923eabc 100644
--- a/coregrind/m_syswrap/syscall-ppc32-linux.S
+++ b/coregrind/m_syswrap/syscall-ppc32-linux.S
@@ -7,7 +7,7 @@
   This file is part of Valgrind, a dynamic binary instrumentation
   framework.
 
-  Copyright (C) 2005 Paul Mackerras <paulus@samba.org>
+  Copyright (C) 2005-2007 Paul Mackerras (paulus@samba.org)
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c
index ef865baa0..faec292e4 100644
--- a/coregrind/m_syswrap/syswrap-ppc32-linux.c
+++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c
@@ -7,8 +7,8 @@
    This file is part of Valgrind, a dynamic binary instrumentation
    framework.
 
-   Copyright (C) 2005 Nicholas Nethercote <njn@valgrind.org>
-   Copyright (C) 2005 Cerion Armour-Brown <cerion@open-works.co.uk>
+   Copyright (C) 2005-2007 Nicholas Nethercote <njn@valgrind.org>
+   Copyright (C) 2005-2007 Cerion Armour-Brown <cerion@open-works.co.uk>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c
index 427d3649f..6907401d1 100644
--- a/coregrind/m_syswrap/syswrap-ppc64-linux.c
+++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c
@@ -7,8 +7,8 @@
    This file is part of Valgrind, a dynamic binary instrumentation
    framework.
 
-   Copyright (C) 2005 Nicholas Nethercote <njn@valgrind.org>
-   Copyright (C) 2005 Cerion Armour-Brown <cerion@open-works.co.uk>
+   Copyright (C) 2005-2007 Nicholas Nethercote <njn@valgrind.org>
+   Copyright (C) 2005-2007 Cerion Armour-Brown <cerion@open-works.co.uk>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/include/vki/vki-posixtypes-ppc32-linux.h b/include/vki/vki-posixtypes-ppc32-linux.h
index 59da11018..8d9f2d4aa 100644
--- a/include/vki/vki-posixtypes-ppc32-linux.h
+++ b/include/vki/vki-posixtypes-ppc32-linux.h
@@ -8,7 +8,7 @@
    This file is part of Valgrind, a dynamic binary instrumentation
    framework.
 
-   Copyright (C) 2005 Julian Seward
+   Copyright (C) 2005-2007 Julian Seward
       jseward@acm.org
 
    This program is free software; you can redistribute it and/or
diff --git a/include/vki/vki-posixtypes-ppc64-linux.h b/include/vki/vki-posixtypes-ppc64-linux.h
index a4c5a0d2f..e152479b5 100644
--- a/include/vki/vki-posixtypes-ppc64-linux.h
+++ b/include/vki/vki-posixtypes-ppc64-linux.h
@@ -8,7 +8,7 @@
    This file is part of Valgrind, a dynamic binary instrumentation
    framework.
 
-   Copyright (C) 2005 Julian Seward
+   Copyright (C) 2005-2007 Julian Seward
       jseward@acm.org
 
    This program is free software; you can redistribute it and/or
diff --git a/massif/ms_main.c b/massif/ms_main.c
index 6c9ab8946..6fa430b1f 100644
--- a/massif/ms_main.c
+++ b/massif/ms_main.c
@@ -1722,7 +1722,8 @@ static void ms_pre_clo_init(void)
    VG_(details_name)            ("Massif");
    VG_(details_version)         (NULL);
    VG_(details_description)     ("a space profiler");
-   VG_(details_copyright_author)("Copyright (C) 2003, Nicholas Nethercote");
+   VG_(details_copyright_author)(
+      "Copyright (C) 2003-2007, Nicholas Nethercote");
    VG_(details_bug_reports_to)  (VG_BUGS_TO);
 
    // Basic functions