[scala-2.10] 88/166: Added missing Copyright fields and a License paragraph.

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository scala-2.10.

commit cbaa1662f8cb90e250f1e7b5c014e7c36abbf207
Author: Frank S. Thomas <fst at debian.org>
Date:   Sat Sep 17 17:06:06 2011 +0200

    Added missing Copyright fields and a License paragraph.
---
 debian/changelog | 8 ++++++++
 debian/copyright | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e1742aa..0ad6aa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+scala (2.9.1.dfsg-2) UNRELEASED; urgency=low
+
+  [ Frank S. Thomas ]
+  * debian/copyright: Added missing Copyright fields and a License
+    paragraph.
+
+ -- Frank S. Thomas <fst at debian.org>  Sat, 17 Sep 2011 17:02:39 +0200
+
 scala (2.9.1.dfsg-1) unstable; urgency=low
 
   [ Frank S. Thomas ]
diff --git a/debian/copyright b/debian/copyright
index 4146a49..2e5f9d3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174
 Upstream-Name: Scala
 Source: http://www.scala-lang.org/
 
@@ -41,11 +41,13 @@ License: BSD-3-clause
  SUCH DAMAGE.
 
 Files: src/actors/scala/actors/Linked*.java
+Copyright: released into the public domain by Doug Lea
 License: public-domain
   Originally written by Doug Lea and released into the public domain.
   This may be used for any purposes whatsoever without acknowledgment.
 
 Files: src/actors/scala/actors/threadpool/*
+Copyright: released into the public domain by Dawid Kurzyniec et al.
 License: public-domain
  These files contain the following statements:
  .
@@ -95,6 +97,7 @@ Copyright: © 2005-2011 LAMP/EPFL, Lausanne
 License: BSD-3-clause
 
 Files: src/forkjoin/*
+Copyright: released into the public domain by Doug Lea et al.
 License: public-domain
  Written by Doug Lea with assistance from members of JCP JSR-166
  Expert Group and released to the public domain, as explained at
@@ -104,6 +107,8 @@ Files: src/jline/*
 Copyright: © 2002-2007 Marc Prud'hommeaux <mwp1 at cornell.edu>
            © 2009-2010 the original author or authors
 License: BSD-3-clause or Apache-2.0
+ On Debian systems, the complete text of the Apache License
+ Version 2.0 can be found in `/usr/share/common-licenses/Apache-2.0'.
 
 Files: src/library/scala/util/Sorting.scala
 Copyright: © 2006-2009 Ross Judson

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git