[Likwid-commit] [likwid] 01/01: Fixing reported copyright issues and two missformatted man pages

[Thomas Röhl]

This is an automated email from the git hooks/post-receive script.

eatmyfear-guest pushed a commit to branch master
in repository likwid.

commit 54184277f4f82b317ad5b9b2531bbfe2e2b32ba0
Author: Thomas.Roehl <Thomas.Roehl at googlemail.com>
Date:   Mon Apr 20 09:55:41 2015 +0200

    Fixing reported copyright issues and two missformatted man pages
---
 debian/copyright       | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 doc/likwid-bench.1     |  1 -
 doc/likwid-perfscope.1 |  2 +-
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index ae748c3..5e5068c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,8 @@ Source: http://ftp.fau.de/pub/likwid/
 
 Files: *
 Copyright: 2014 Jan Treibig (jt), jan.treibig at gmail.com
-License: GPL-3
- Copyright (C) 2014 Jan Treibig
+License: GPL-3+
+ Copyright (C) 2014 Jan Treibig and Thomas Roehl
  .
  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
@@ -56,6 +56,48 @@ License: GPL-1+ or Artistic
  Public License can be found in `/usr/share/common-licenses/GPL-1' and
  the Artistic Licence in `/usr/share/common-licenses/Artistic'.
 
+Files: perl/xmgrace.pm
+Copyright: 2011, Jan Treibig <jan.treibig at googlemail.com>
+License: GPL-2+
+
+Files: test/accuracy/statistics.py
+Copyright: 2013, Steven D'Aprano <steve+python at pearwood.info>
+License: Apache-2.0
+
+Files: test/stream.c
+Copyright: 1991-2005, John D. McCalpin <john at mccalpin.com>
+License: Own
+* License:
+*  1. You are free to use this program and/or to redistribute
+*     this program.
+*  2. You are free to modify this program for your own use,
+*     including commercial use, subject to the publication
+*     restrictions in item 3.
+*  3. You are free to publish results obtained from running this
+*     program, or from works that you derive from this program,
+*     with the following limitations:
+*     3a. In order to be referred to as "STREAM benchmark results",
+*         published results must be in conformance to the STREAM
+*         Run Rules, (briefly reviewed below) published at
+*         http://www.cs.virginia.edu/stream/ref.html
+*         and incorporated herein by reference.
+*         As the copyright holder, John McCalpin retains the
+*         right to determine conformity with the Run Rules.
+*     3b. Results based on modified source code or on runs not in
+*         accordance with the STREAM Run Rules must be clearly
+*         labelled whenever they are published.  Examples of
+*         proper labelling include:
+*         "tuned STREAM benchmark results" 
+*         "based on a variant of the STREAM benchmark code"
+*         Other comparable, clear and reasonable labelling is
+*         acceptable.
+*     3c. Submission of results to the STREAM benchmark web site
+*         is encouraged, but not required.
+*  4. Use of this program or creation of derived works based on this
+*     program constitutes acceptance of these licensing restrictions.
+*  5. Absolutely no warranty is expressed or implied.
+*-----------------------------------------------------------------------
+
 Files: debian/*
 Copyright: 2014 Christoph Martin <christoph.martin at uni-mainz.de>
 License: GPL-2+
diff --git a/doc/likwid-bench.1 b/doc/likwid-bench.1
index 45d0f6c..e9cb8c8 100644
--- a/doc/likwid-bench.1
+++ b/doc/likwid-bench.1
@@ -1,5 +1,4 @@
 .TH LIKWID-BENCH 1 <DATE> likwid\-<VERSION>
-.WARN
 .SH NAME
 likwid-bench \- low-level benchmark suite and microbenchmarking framework
 .SH SYNOPSIS
diff --git a/doc/likwid-perfscope.1 b/doc/likwid-perfscope.1
index 2d48e21..8c140ab 100644
--- a/doc/likwid-perfscope.1
+++ b/doc/likwid-perfscope.1
@@ -1,7 +1,7 @@
 .TH LIKWID-PERFSCOPE 1 <DATE> likwid\-<VERSION>
 .SH NAME
 likwid-perfscope \- Frontend for the timeline mode of
-.N likwid-perfctr(1)
+.B likwid-perfctr(1)
 that on-the-fly generates pictures from the measurements
 .SH SYNOPSIS
 .B likwid-perfscope 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/likwid/likwid.git