[Pkg-scala-commits] [SCM] Scala packaging branch, master, updated. debian/2.8.1.dfsg-1-12-ge5a9644

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 5397aa87469405a62cdbaf882fdfbd593b3c7638
Author: Frank S. Thomas <fst at debian.org>
Date:   Sun Jun 5 22:48:04 2011 +0200

    Updated debian/copyright for Scala 2.9.0.1.

diff --git a/debian/copyright b/debian/copyright
index 31456fb..4146a49 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,11 @@ Upstream-Name: Scala
 Source: http://www.scala-lang.org/
 
 Files: *
-Copyright: © 2002-2010 LAMP/EPFL, Lausanne
+Copyright: © 2002-2011 LAMP/EPFL, Lausanne
 License: BSD-3-clause
  SCALA LICENSE
  .
- Copyright (c) 2002-2010 EPFL, Lausanne, unless otherwise specified.
+ Copyright (c) 2002-2011 EPFL, Lausanne, unless otherwise specified.
  All rights reserved.
  .
  This software was developed by the Programming Methods Laboratory of the
@@ -69,12 +69,6 @@ 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/matching/ParallelMatching.scala
-       src/compiler/scala/tools/nsc/matching/TransMatcher.scala
-Copyright: © 2005-2010 LAMP/EPFL, Lausanne
-           © 2007 Google Inc.
-License: BSD-3-clause
-
 Files: src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery-ui.js
 Copyright: © 2010 AUTHORS.txt (http://jqueryui.com/about)
 License: Expat or GPL
@@ -91,6 +85,15 @@ 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.
+License: BSD-3-clause
+
 Files: src/forkjoin/*
 License: public-domain
  Written by Doug Lea with assistance from members of JCP JSR-166
@@ -99,11 +102,8 @@ License: public-domain
 
 Files: src/jline/*
 Copyright: © 2002-2007 Marc Prud'hommeaux <mwp1 at cornell.edu>
-License: BSD-3-clause
-
-Files: src/library/scala/collection/immutable/TreeHashMap.scala
-Copyright: © 2008-2009 David MacIver
-License: BSD-3-clause
+           © 2009-2010 the original author or authors
+License: BSD-3-clause or Apache-2.0
 
 Files: src/library/scala/util/Sorting.scala
 Copyright: © 2006-2009 Ross Judson
@@ -113,15 +113,15 @@ 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-2010 LAMP/EPFL, Lausanne
+           © 2002-2011 LAMP/EPFL, Lausanne
 License: BSD-3-clause
 
-Files: test/pending/neg/bug1987.scala
-Copyright: © 2008-2009 Shunsuke Sogame
-License: Expat
-
 Files: debian/*
 Copyright: © 2009-2011 Mehdi Dogguy
            © 2008-2009 Min Huang

-- 
Scala packaging