[scala] 11/24: 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.

commit 0eb4a4862fba864076496c78244434e98e9e6e04
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jun 17 10:54:31 2015 +0200

    Refreshed debian/copyright
---
 debian/changelog |  1 +
 debian/copyright | 36 +++++++++---------------------------
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1816a82..723a8cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ scala (2.11.6-2) UNRELEASED; urgency=medium
     - Removed 0005-java7-compilation.patch (fixed upstream)
     - Depend on libjline2-java instead of building an embedded copy of jline
     - Require a Java 7+ runtime
+    - Refreshed debian/copyright
   * Removed the JRE dependency of scala-library
   * The package has been adopted by the Java Team (Closes: #754935)
   * Adapted debian/orig-tar.sh for Scala 2.11
diff --git a/debian/copyright b/debian/copyright
index 93ccdc4..8333193 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,10 @@
 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-2015 LAMP/EPFL, Lausanne
 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
@@ -22,6 +15,7 @@ License: public-domain
 Files: src/actors/scala/actors/threadpool/*
 Copyright: released into the public domain by Dawid Kurzyniec et al.
 License: public-domain
+Comment:
  These files contain the following statements:
  .
  Written by Dawid Kurzyniec and released to the public domain, as
@@ -44,32 +38,28 @@ License: public-domain
  Expert Group and released to the public domain, as explained at
  http://creativecommons.org/licenses/publicdomain
 
-Files: src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery-ui.js
+Files: src/scaladoc/scala/tools/nsc/doc/html/resource/lib/jquery-ui.js
 Copyright: © 2010 AUTHORS.txt (http://jqueryui.com/about)
 License: Expat or GPL
 
-Files: src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery.js
+Files: src/scaladoc/scala/tools/nsc/doc/html/resource/lib/jquery.js
 Copyright: © 2010 John Resig
            © 2010 The Dojo Foundation
 License: Expat or BSD-3-clause or GPL
 
-Files: src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js
+Files: src/scaladoc/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js
 Copyright: © 2010 Fabrizio Balliano (http://www.fabrizioballiano.net)
                   Kevin Dalman (http://allpro.net)
 License: GPL or Expat
 
-Files: src/compiler/scala/tools/nsc/interactive/*
-Copyright: © 2009-2011 Scala Solutions and LAMP/EPFL, Lausanne
-License: BSD-3-clause
-
-Files: src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
-Copyright: © 2005-2011 LAMP/EPFL, Lausanne
-           © 2007 Google Inc.
+Files: src/interactive/scala/tools/nsc/interactive/*
+Copyright: © 2009-2013 Typesafe/Scala Solutions and LAMP/EPFL
 License: BSD-3-clause
 
 Files: src/forkjoin/*
 Copyright: released into the public domain by Doug Lea et al.
 License: public-domain
+Comment:
  Written by Doug Lea with assistance from members of JCP JSR-166
  Expert Group and released to the public domain, as explained at
  http://creativecommons.org/licenses/publicdomain
@@ -78,14 +68,6 @@ Files: src/library/scala/util/Sorting.scala
 Copyright: © 2006-2009 Ross Judson
 License: BSD-3-clause
 
-Files: src/library/scala/xml/Xhtml.scala
-Copyright: © 2007 David Pollak, WorldWide Conferencing, LLC
-License: BSD-3-clause
-
-Files: src/scalacheck/org/scalacheck/*
-Copyright: © 2007-2010 Rickard Nilsson
-License: BSD-3-clause
-
 Files: src/scalap/scala/tools/scalap/scalax/*
 Copyright: © 2005-2008 The Scalax Project
            © 2002-2011 LAMP/EPFL, Lausanne

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