[scala-2.10] 164/166: Refreshed debian/copyright

[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 590e243e21bffbcf9e12739d044526a609b895d6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 14 23:44:02 2016 +0100

    Refreshed debian/copyright
---
 debian/copyright | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index ddefd9a..6ed85c8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,26 +1,20 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Scala
-Source: http://www.scala-lang.org/
+Source: http://www.scala-lang.org
 
 Files: *
-Copyright: © 2002-2011 LAMP/EPFL, Lausanne
+Copyright: © 2002-2013 EPFL
+           © 2011-2013 Typesafe, Inc.
 License: BSD-3-clause
- SCALA LICENSE
- .
- Copyright (c) 2002-2011 EPFL, Lausanne, unless otherwise specified.
- All rights reserved.
- .
- This software was developed by the Programming Methods Laboratory of the
- Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland.
 
 Files: src/actors/scala/actors/Linked*.java
-Copyright: released into the public domain by Doug Lea
+Copyright: © 1998-1999 Doug Lea
 License: public-domain-doug-lea
  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.
+Copyright: © Dawid Kurzyniec et al.
 License: public-domain-dawid-kurzyniec
  These files contain the following statements:
  .
@@ -78,8 +72,6 @@ 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
@@ -99,9 +91,11 @@ Copyright: © 2005-2008 The Scalax Project
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: © 2009-2011 Mehdi Dogguy
+Copyright: © 2006-2009 Lex Spoon
            © 2008-2009 Min Huang
-           © 2007-2009 Lex Spoon
+           © 2009-2012 Mehdi Dogguy
+           © 2013 Tony Mancill
+           © 2015-2016 Emmanue Bourg
 License: BSD-3-clause
 
 License: BSD-3-clause
@@ -154,3 +148,7 @@ License: Expat
 License: GPL
  On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL'.
+
+License: 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'.

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