[SCM] libjsr166y-java: Parallel computation framework for Java branch, master, updated. debian/0.1.20080107-2-17-gafe7ec9

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit 9d40eb6ea624dfe73276ce6d163dc6a9217d243f
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Thu Oct 20 19:25:21 2011 -0430

    Update copyright file

diff --git a/debian/changelog b/debian/changelog
index f2954a3..84b383e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,12 @@ libjsr166y-java (1.7.0-1) UNRELEASED; urgency=low
   * Refresh patch 01_workaround_typing_bug.diff.
   * Bump Standards-Version to 3.9.2. No changes were required.
   * Update Homepage field.
-  * Make copyright file DEP-5 compliant.
+  * Update copyright file and make it DEP-5 compliant.
   * Provide POM files with org.codehaus.jsr166-mirror as group ID.
   * Add extra166y jar.
   * Provide -doc package.
 
- -- Miguel Landaeta <miguel at miguel.cc>  Tue, 18 Oct 2011 19:08:31 -0430
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 20 Oct 2011 19:24:30 -0430
 
 libjsr166y-java (0.1.20080107-2) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index f1226f3..58983ee 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,12 +2,31 @@ Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: jsr166y
 Upstream-Contact: Doug Lea <dl at cs.oswego.edu>
 Source: http://g.oswego.edu/dl/concurrency-interest/
+Comment: Additional contributors to this project are listed below:
+ Andrew Wright,
+ Jeffrey Hayes,
+ Pat Fisher,
+ Mike Judd,
+ John Vint,
+ Martin Buchholz,
+ Bill Scherer,
+ Josh Bloch,
+ JSR-166 Expert Group
 
 Files: *
 Copyright: © 2002-2008, Doug Lea <dl at cs.oswego.edu>,
- © 2002-2008, Members of JCP JSR-166 Expert Group
+ © 2002-2008, Members of JCP JSR-166 Expert Group.
 License: other
 
+Files: src/tests/jtreg/*
+ src/main/java/util/PriorityQueue.java
+Copyright: © 1998-2008, Oracle and/or its affiliates.
+License: GPL-2
+
+Files: src/tests/jtreg/util/TimSort/*
+Copyright: © 2009, Google Inc.
+License: GPL-2
+
 Files: debian/*
 Copyright: © 2010-2011, Miguel Landaeta <miguel at miguel.cc>
 License: other
@@ -39,3 +58,20 @@ License: other
  otherwise exploited by anyone for any purpose, commercial or non-commercial,
  and in any way, including by methods that have not yet been invented or
  conceived.
+
+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; only version 2 of the License.
+ .
+ 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.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, a copy of the GNU General Public License can be found
+ at /usr/share/common-licenses/GPL-2.

-- 
libjsr166y-java: Parallel computation framework for Java