From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:40 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:40 +0000
Subject: [Pkg-scala-commits] [scala] 04/15: Merge tag 'upstream/2.10.2+dfsg'
In-Reply-To: <20140423213130.24448.39574@moszumanska.debian.org>
References: <20140423213130.24448.39574@moszumanska.debian.org>
Message-ID: <E1Wd4lY-0006P1-M8@moszumanska.debian.org>

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

mehdi pushed a commit to branch master
in repository scala.

commit f8124953ed3a93a58778babb2a032762c6a297b7
Merge: f587000 965d8b7
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Apr 23 19:14:39 2014 +0200

    Merge tag 'upstream/2.10.2+dfsg'
    
    Upstream version 2.10.2+dfsg

 CONTRIBUTING.md                                    |    2 +-
 README.rst                                         |   13 +-
 bincompat-backward.whitelist.conf                  |   61 +
 bincompat-forward.whitelist.conf                   |  113 +
 build.number                                       |    2 +-
 build.xml                                          | 4107 +++++++-------------
 lib/forkjoin.jar.desired.sha1                      |    2 +-
 src/actors/scala/actors/remote/TcpService.scala    |   29 +-
 src/build/maven/scala-actors-pom.xml               |    3 +
 src/build/maven/scala-library-pom.xml              |    3 +
 src/build/maven/scala-reflect-pom.xml              |    4 +-
 src/build/maven/scala-swing-pom.xml                |    3 +
 src/build/pack.xml                                 |   22 +-
 .../scala/reflect/macros/runtime/Aliases.scala     |    5 +
 .../scala/reflect/macros/runtime/Enclosures.scala  |   16 +-
 .../scala/reflect/macros/runtime/Typers.scala      |   23 +-
 .../scala/reflect/macros/util/Traces.scala         |    2 -
 src/compiler/scala/reflect/reify/Errors.scala      |    5 +
 .../scala/reflect/reify/phases/Reshape.scala       |    1 +
 .../scala/reflect/reify/utils/Extractors.scala     |   65 +-
 .../scala/tools/ant/templates/tool-windows.tmpl    |    5 +-
 src/compiler/scala/tools/nsc/Global.scala          |    3 +-
 src/compiler/scala/tools/nsc/ast/DocComments.scala |    5 +
 src/compiler/scala/tools/nsc/ast/Trees.scala       |   57 +-
 .../scala/tools/nsc/ast/parser/Parsers.scala       |   62 +-
 .../scala/tools/nsc/ast/parser/Scanners.scala      |   36 +-
 .../scala/tools/nsc/ast/parser/TreeBuilder.scala   |   11 +-
 .../scala/tools/nsc/backend/icode/Members.scala    |    1 +
 .../scala/tools/nsc/backend/icode/Opcodes.scala    |   19 +
 .../scala/tools/nsc/backend/jvm/GenASM.scala       |   22 +-
 .../scala/tools/nsc/backend/jvm/GenJVM.scala       |   18 +-
 .../scala/tools/nsc/backend/opt/Inliners.scala     |    1 +
 src/compiler/scala/tools/nsc/doc/Settings.scala    |    5 +-
 .../tools/nsc/doc/base/MemberLookupBase.scala      |   33 +-
 .../scala/tools/nsc/doc/base/comment/Body.scala    |   18 +-
 .../scala/tools/nsc/doc/html/SyntaxHigh.scala      |    6 +-
 .../scala/tools/nsc/doc/html/page/Index.scala      |   19 +-
 .../scala/tools/nsc/doc/html/page/Template.scala   |   29 +-
 .../scala/tools/nsc/doc/html/resource/lib/index.js |   17 +-
 .../scala/tools/nsc/doc/model/MemberLookup.scala   |   25 +
 .../scala/tools/nsc/doc/model/ModelFactory.scala   |   43 +-
 .../scala/tools/nsc/doc/model/TreeFactory.scala    |   13 +-
 .../nsc/doc/model/diagram/DiagramFactory.scala     |   34 +-
 .../tools/nsc/interactive/CompilerControl.scala    |   31 +-
 .../scala/tools/nsc/interactive/Global.scala       |   95 +-
 .../scala/tools/nsc/interactive/Picklers.scala     |    4 +-
 .../tests/core/PresentationCompilerInstance.scala  |    6 +-
 .../scala/tools/nsc/interpreter/ExprTyper.scala    |   12 +-
 .../scala/tools/nsc/javac/JavaParsers.scala        |   14 +-
 .../scala/tools/nsc/matching/Patterns.scala        |    2 +-
 .../scala/tools/nsc/settings/ScalaSettings.scala   |    1 +
 .../scala/tools/nsc/symtab/SymbolLoaders.scala     |   11 +-
 .../nsc/symtab/classfile/ClassfileParser.scala     |  316 +-
 .../tools/nsc/symtab/classfile/ICodeReader.scala   |    9 +
 .../scala/tools/nsc/symtab/classfile/Pickler.scala |    7 +-
 .../scala/tools/nsc/transform/Erasure.scala        |    3 +-
 .../scala/tools/nsc/transform/ExplicitOuter.scala  |   64 +-
 .../tools/nsc/transform/SpecializeTypes.scala      |   71 +-
 .../scala/tools/nsc/transform/TailCalls.scala      |   14 +-
 .../scala/tools/nsc/transform/UnCurry.scala        |   35 +-
 .../scala/tools/nsc/transform/patmat/Logic.scala   |  644 +++
 .../tools/nsc/transform/patmat/MatchAnalysis.scala |  709 ++++
 .../tools/nsc/transform/patmat/MatchCodeGen.scala  |  258 ++
 .../nsc/transform/patmat/MatchOptimization.scala   |  615 +++
 .../nsc/transform/patmat/MatchTranslation.scala    |  674 ++++
 .../nsc/transform/patmat/MatchTreeMaking.scala     |  614 +++
 .../nsc/transform/patmat/PatternMatching.scala     |  256 ++
 .../scala/tools/nsc/transform/patmat/Solving.scala |  242 ++
 .../tools/nsc/typechecker/ContextErrors.scala      |   69 +-
 .../scala/tools/nsc/typechecker/Contexts.scala     |   13 +-
 .../scala/tools/nsc/typechecker/EtaExpansion.scala |    1 +
 .../scala/tools/nsc/typechecker/Implicits.scala    |  134 +-
 .../scala/tools/nsc/typechecker/Infer.scala        |   18 +-
 .../scala/tools/nsc/typechecker/Macros.scala       |  145 +-
 .../scala/tools/nsc/typechecker/Namers.scala       |    8 +-
 .../tools/nsc/typechecker/NamesDefaults.scala      |   32 +-
 .../tools/nsc/typechecker/PatternMatching.scala    | 3876 ------------------
 .../scala/tools/nsc/typechecker/RefChecks.scala    |   62 +-
 .../tools/nsc/typechecker/SuperAccessors.scala     |   40 +-
 .../scala/tools/nsc/typechecker/TreeCheckers.scala |    3 +
 .../tools/nsc/typechecker/TypeDiagnostics.scala    |   42 +-
 .../scala/tools/nsc/typechecker/Typers.scala       |  234 +-
 .../scala/tools/nsc/typechecker/Unapplies.scala    |    5 +-
 .../scala/tools/nsc/util/SimpleTracer.scala        |    2 +-
 src/compiler/scala/tools/nsc/util/TreeSet.scala    |   20 +-
 .../scala/tools/reflect/MacroImplementations.scala |   77 +-
 .../scala/tools/reflect/ToolBoxFactory.scala       |   10 +-
 .../scala/concurrent/forkjoin/ForkJoinPool.java    | 2607 +++++++++----
 .../scala/concurrent/forkjoin/ForkJoinTask.java    |  356 +-
 .../concurrent/forkjoin/ForkJoinWorkerThread.java  |   20 +-
 src/library/scala/PartialFunction.scala            |    2 +-
 .../scala/collection/immutable/ListMap.scala       |    8 +-
 .../scala/collection/mutable/ArrayBuffer.scala     |    2 +-
 .../scala/collection/mutable/ArrayOps.scala        |   23 +-
 .../scala/collection/parallel/package.scala        |    7 +-
 src/library/scala/concurrent/Future.scala          |   12 +-
 src/library/scala/concurrent/impl/Future.scala     |    2 +-
 src/library/scala/math/BigInt.scala                |    2 +-
 src/library/scala/math/Ordering.scala              |    2 +-
 src/library/scala/runtime/BoxedUnit.java           |    2 +
 src/library/scala/xml/Utility.scala                |    2 +-
 src/partest/scala/tools/partest/CompilerTest.scala |    2 +-
 src/partest/scala/tools/partest/DirectTest.scala   |   28 +-
 src/partest/scala/tools/partest/nest/Diff.java     |  873 -----
 .../scala/tools/partest/nest/DiffPrint.java        |  606 ---
 .../scala/tools/partest/nest/FileManager.scala     |   41 +-
 .../scala/tools/partest/nest/PathSettings.scala    |    3 +
 .../tools/partest/nest/ReflectiveRunner.scala      |    5 +-
 .../scala/tools/partest/nest/RunnerManager.scala   |    3 +-
 src/reflect/scala/reflect/api/Mirrors.scala        |    4 +-
 src/reflect/scala/reflect/api/Symbols.scala        |    2 +-
 src/reflect/scala/reflect/api/TypeTags.scala       |   38 +-
 src/reflect/scala/reflect/api/Types.scala          |    2 +-
 .../reflect/internal/ClassfileConstants.scala      |    5 +-
 .../scala/reflect/internal/Definitions.scala       |    2 +-
 .../reflect/internal/ExistentialsAndSkolems.scala  |   77 +
 src/reflect/scala/reflect/internal/Flags.scala     |   14 +-
 src/reflect/scala/reflect/internal/StdNames.scala  |   17 +-
 src/reflect/scala/reflect/internal/Symbols.scala   |    2 +-
 src/reflect/scala/reflect/internal/TreeInfo.scala  |   19 +-
 src/reflect/scala/reflect/internal/Trees.scala     |    5 +
 src/reflect/scala/reflect/internal/Types.scala     |   45 +-
 .../scala/reflect/internal/transform/UnCurry.scala |   11 +-
 .../scala/reflect/internal/util/Statistics.scala   |    4 +-
 src/reflect/scala/reflect/macros/Enclosures.scala  |    6 +-
 src/reflect/scala/reflect/macros/Typers.scala      |    6 +-
 .../scala/reflect/runtime/JavaMirrors.scala        |   24 +-
 .../scala/reflect/runtime/JavaUniverse.scala       |    2 +-
 .../scala/reflect/runtime/ReflectionUtils.scala    |   12 +-
 starr.number                                       |    1 +
 test/debug/OBSOLETE                                |    0
 test/disabled/jvm/scala-concurrent-tck-akka.scala  |  391 --
 .../akka/src/akka/dispatch/Future.scala            |  832 ----
 test/disabled/presentation/akka/src/pi.scala       |  108 -
 test/files/jvm/future-spec/FutureTests.scala       |   19 +
 test/files/jvm/t7253.check                         |    1 +
 test/files/jvm/t7253/Base_1.scala                  |    5 +
 test/files/jvm/t7253/JavaClient_1.java             |    9 +
 test/files/jvm/t7253/ScalaClient_1.scala           |    9 +
 test/files/jvm/t7253/test.scala                    |   28 +
 test/files/neg/delayed-init-ref.check              |   10 +
 test/files/neg/delayed-init-ref.flags              |    1 +
 test/files/neg/delayed-init-ref.scala              |   42 +
 test/files/neg/macro-divergence-controlled.check   |    4 +
 .../Impls_Macros_1.scala                           |   23 +
 .../neg/macro-divergence-controlled/Test_2.scala   |    3 +
 test/files/neg/macro-qmarkqmarkqmark.check         |   13 +
 test/files/neg/macro-qmarkqmarkqmark.scala         |   13 +
 test/files/neg/macro-without-xmacros-a.check       |    6 +-
 test/files/neg/macro-without-xmacros-b.check       |    6 +-
 test/files/neg/stringinterpolation_macro-neg.check |    2 +-
 test/files/neg/t414.check                          |    2 +-
 test/files/neg/t4879.check                         |    4 +-
 test/files/neg/t5510.check                         |    6 +-
 test/files/neg/t5663-badwarneq.check               |   34 +-
 test/files/neg/t5663-badwarneq.scala               |   18 +
 test/files/neg/t5856.check                         |    2 +-
 test/files/neg/t6040.check                         |    2 +-
 test/files/neg/t6323a.check                        |    6 +
 test/files/neg/t6771b.check                        |    6 +
 test/files/neg/t6771b.scala                        |   16 +
 test/files/neg/t6952.check                         |    4 +-
 test/files/neg/{t696.check => t696a.check}         |    2 +-
 test/files/neg/t696a.flags                         |    0
 test/files/neg/{t696.scala => t696a.scala}         |    0
 test/files/neg/t696b.check                         |    9 +
 test/files/neg/t696b.flags                         |    1 +
 test/files/neg/{t696.scala => t696b.scala}         |    7 +-
 test/files/neg/t7166.check                         |    4 +
 test/files/neg/t7166/Impls_Macros_1.scala          |   26 +
 test/files/neg/t7166/Test_2.scala                  |    3 +
 test/files/neg/t7171.check                         |    7 +
 test/files/neg/t7171.flags                         |    1 +
 test/files/neg/t7171.scala                         |   11 +
 test/files/neg/t7171b.check                        |   10 +
 test/files/neg/t7171b.flags                        |    1 +
 test/files/neg/t7171b.scala                        |   15 +
 test/files/neg/t7185.check                         |    7 +
 test/files/neg/t7185.scala                         |    3 +
 test/files/neg/t7235.check                         |    4 +
 test/files/neg/t7235.scala                         |   14 +
 test/files/neg/t7238.check                         |    6 +
 test/files/neg/t7238.scala                         |    7 +
 test/files/neg/t7251.check                         |    4 +
 test/files/neg/t7251/A_1.scala                     |   10 +
 test/files/neg/t7251/B_2.scala                     |    7 +
 test/files/neg/t7259.check                         |    7 +
 test/files/neg/t7259.scala                         |    9 +
 test/files/neg/t7285.check                         |   13 +
 test/files/neg/t7285.flags                         |    1 +
 test/files/neg/t7285.scala                         |   55 +
 test/files/neg/t7289.check                         |    4 +
 test/files/neg/t7289.scala                         |   39 +
 test/files/neg/t7289_status_quo.check              |   22 +
 test/files/neg/t7289_status_quo.scala              |   23 +
 test/files/neg/t7290.check                         |   10 +
 test/files/neg/t7290.flags                         |    1 +
 test/files/neg/t7290.scala                         |   10 +
 test/files/neg/t7299.check                         |    7 +
 test/files/neg/t7299.scala                         |    6 +
 test/files/neg/t7325.check                         |   19 +
 test/files/neg/t7325.scala                         |   25 +
 test/files/neg/t7330.check                         |    5 +
 test/files/neg/t7330.scala                         |    5 +
 test/files/neg/t7369.check                         |   13 +
 test/files/neg/t7369.flags                         |    1 +
 test/files/neg/t7369.scala                         |   43 +
 test/files/neg/t7385.check                         |   10 +
 test/files/neg/t7385.scala                         |    7 +
 test/files/neg/t7388.check                         |    4 +
 test/files/neg/t7388.scala                         |    1 +
 test/files/neg/t7509.check                         |   12 +
 test/files/neg/t7509.scala                         |    4 +
 test/files/pos/macro-qmarkqmarkqmark.check         |    0
 test/files/pos/macro-qmarkqmarkqmark.scala         |    7 +
 test/files/pos/spec-t6286.scala                    |   10 +
 test/files/pos/t3120/J1.java                       |    4 +
 test/files/pos/t3120/J2.java                       |    4 +
 test/files/pos/t3120/Q.java                        |    3 +
 test/files/pos/t3120/Test.scala                    |    3 +
 test/files/{neg => pos}/t5692a.check               |    0
 test/files/{neg => pos}/t5692a.flags               |    0
 test/files/{neg => pos}/t5692a/Macros_1.scala      |    0
 test/files/{neg => pos}/t5692a/Test_2.scala        |    0
 test/files/{neg => pos}/t5692b.check               |    0
 test/files/{neg => pos}/t5692b.flags               |    0
 test/files/{neg => pos}/t5692b/Macros_1.scala      |    0
 test/files/{neg => pos}/t5692b/Test_2.scala        |    0
 test/files/pos/t5692c.check                        |    0
 test/files/pos/t5692c.scala                        |    4 +
 test/files/pos/t5744/Macros_1.scala                |   22 +
 test/files/pos/t5744/Test_2.scala                  |    6 +
 test/files/pos/t5886.scala                         |   18 +
 test/files/pos/t6091.flags                         |    1 +
 test/files/pos/t6091.scala                         |   10 +
 test/files/pos/t6210.flags                         |    1 +
 test/files/pos/t6210.scala                         |   21 +
 test/files/pos/t6225.scala                         |   20 +
 test/files/pos/t6386.scala                         |    5 +
 test/files/pos/t6514.scala                         |   11 +
 test/files/pos/t6675.flags                         |    1 +
 test/files/pos/t6675.scala                         |   20 +
 test/files/pos/t6771.flags                         |    1 +
 test/files/pos/t6771.scala                         |    9 +
 test/files/pos/t6921.scala                         |   11 +
 test/files/pos/t7091.scala                         |    7 +
 test/files/pos/t7190.scala                         |   26 +
 test/files/pos/t7200b.scala                        |   50 +
 test/files/pos/t7226.scala                         |   26 +
 test/files/pos/t7232.flags                         |    1 +
 test/files/pos/t7232/Foo.java                      |    9 +
 test/files/pos/t7232/List.java                     |    4 +
 test/files/pos/t7232/Test.scala                    |    5 +
 test/files/pos/t7232b.flags                        |    1 +
 test/files/pos/t7232b/Foo.java                     |    8 +
 test/files/pos/t7232b/List.java                    |    5 +
 test/files/pos/t7232b/Test.scala                   |    5 +
 test/files/pos/t7232c.flags                        |    1 +
 test/files/pos/t7232c/Foo.java                     |   10 +
 test/files/pos/t7232c/Test.scala                   |    4 +
 test/files/pos/t7232d.flags                        |    1 +
 test/files/pos/t7232d/Entry.java                   |    4 +
 test/files/pos/t7232d/Foo.java                     |    8 +
 test/files/pos/t7232d/Test.scala                   |    4 +
 test/files/pos/t7233.scala                         |   14 +
 test/files/pos/t7233b.scala                        |    8 +
 test/files/pos/t7239.scala                         |   38 +
 test/files/pos/t7285a.flags                        |    1 +
 test/files/pos/t7285a.scala                        |   83 +
 test/files/pos/t7329.scala                         |    1 +
 test/files/pos/t7369.flags                         |    1 +
 test/files/pos/t7369.scala                         |   37 +
 test/files/pos/t7377/Client_2.scala                |   11 +
 test/files/pos/t7377/Macro_1.scala                 |    7 +
 test/files/pos/t7377b.flags                        |    1 +
 test/files/pos/t7377b.scala                        |   13 +
 test/files/pos/t7426.scala                         |    3 +
 test/files/pos/t7516/A_1.scala                     |    9 +
 test/files/pos/t7516/B_2.scala                     |    4 +
 test/files/pos/t7517.scala                         |   22 +
 test/files/pos/t7532/A_1.java                      |    6 +
 test/files/pos/t7532/B_2.scala                     |    5 +
 test/files/pos/t7532b/A_1.scala                    |    7 +
 test/files/pos/t7532b/B_2.scala                    |    8 +
 test/files/pos/xlint1.flags                        |    1 +
 test/files/pos/xlint1.scala                        |   13 +
 test/files/presentation/doc.check                  |   50 +-
 test/files/presentation/doc/doc.scala              |  132 +-
 test/files/presentation/doc/src/Class.scala        |    1 +
 test/files/presentation/doc/src/Test.scala         |    1 -
 test/files/presentation/doc/src/p/Base.scala       |   11 +
 test/files/presentation/doc/src/p/Derived.scala    |    9 +
 test/files/presentation/hyperlinks.check           |  137 +-
 .../presentation/hyperlinks/src/SuperTypes.scala   |   32 +
 test/files/presentation/ide-t1000567.check         |    1 +
 test/files/presentation/ide-t1000567/Runner.scala  |   15 +
 test/files/presentation/ide-t1000567/src/a/a.scala |    5 +
 test/files/presentation/ide-t1000567/src/b/b.scala |    5 +
 .../memory-leaks/MemoryLeaksTest.scala             |    2 +-
 test/files/run/classfile-format-51.scala           |  126 +
 test/files/run/inline-ex-handlers.check            |  915 +++--
 test/files/run/interpolation.scala                 |    2 +-
 test/files/run/interpolationMultiline1.scala       |    2 +-
 test/files/run/macro-divergence-spurious.check     |    1 +
 .../macro-divergence-spurious/Impls_Macros_1.scala |   23 +
 .../run/macro-divergence-spurious/Test_2.scala     |    3 +
 test/files/run/macro-expand-nullary-generic.check  |   10 +-
 test/files/run/macro-expand-tparams-explicit.check |    2 +-
 test/files/run/macro-expand-tparams-implicit.check |    2 +-
 test/files/run/macro-expand-tparams-prefix-a.check |    6 +-
 test/files/run/macro-expand-tparams-prefix-b.check |    4 +-
 .../files/run/macro-expand-tparams-prefix-c1.check |    4 +-
 .../files/run/macro-expand-tparams-prefix-c2.check |    4 +-
 .../files/run/macro-expand-tparams-prefix-d1.check |    2 +-
 test/files/run/macro-system-properties.check       |   26 +
 test/files/run/macro-system-properties.scala       |   16 +
 test/files/run/macro-undetparams-consfromsls.check |    6 +-
 test/files/run/macro-undetparams-macroitself.check |    2 +-
 test/files/run/outertest.scala                     |   47 +-
 .../run/reflection-fieldmirror-getsetval.check     |    2 +-
 .../run/reflection-fieldmirror-getsetval.scala     |   12 +-
 test/files/run/repl-colon-type.check               |   21 +-
 test/files/run/repl-colon-type.scala               |    4 +
 test/files/run/resetattrs-this.check               |    1 +
 test/files/run/resetattrs-this.scala               |   11 +
 test/files/run/t3994.scala                         |   20 +
 test/files/run/t5527.check                         |    2 +-
 test/files/run/t5603.check                         |    2 +-
 test/files/run/t5699.check                         |   11 +
 test/files/run/t5699.scala                         |   24 +
 test/files/run/t5710-1.check                       |    1 +
 test/files/run/t5710-1.scala                       |   15 +
 test/files/run/t5710-2.check                       |    1 +
 test/files/run/t5710-2.scala                       |   15 +
 test/files/run/t5923a.check                        |    3 +
 test/files/run/t5923a/Macros_1.scala               |   14 +
 test/files/run/t5923a/Test_2.scala                 |    5 +
 test/files/run/t5923b.check                        |    3 +
 test/files/run/t5923b/Test.scala                   |    7 +
 test/files/run/t6028.check                         |    2 +-
 test/files/run/t6146b.check                        |   11 +-
 test/files/run/t6146b.scala                        |    3 +-
 test/files/run/t6223.check                         |    2 +-
 test/files/run/t6223.scala                         |    4 +-
 test/files/run/t6288.check                         |    2 +-
 test/files/run/t6370.scala                         |   12 +
 test/files/run/t6440.check                         |    2 +-
 test/files/run/t6555.check                         |    2 +-
 test/files/run/t6715.scala                         |   15 +
 test/files/run/t6725-1.check                       |    2 +
 test/files/run/t6725-1.scala                       |    5 +
 test/files/run/t6725-2.check                       |    8 +
 test/files/run/t6725-2.scala                       |    6 +
 test/files/run/t6793.scala                         |    9 +
 test/files/run/t6793b.scala                        |   11 +
 test/files/run/t6793c.scala                        |   11 +
 test/files/run/t6900.scala                         |   36 +
 test/files/run/t6935.scala                         |   14 +
 test/files/run/t6937.check                         |   26 +
 test/files/run/t6937.scala                         |   12 +
 test/files/run/t6989.check                         |   84 +-
 test/files/run/t6989/JavaClass_1.java              |    2 +
 test/files/run/t7047.check                         |    0
 test/files/run/t7047/Impls_Macros_1.scala          |   19 +
 test/files/run/t7047/Test_2.scala                  |    3 +
 test/files/run/t7074.check                         |    9 +
 test/files/run/t7074.scala                         |   15 +
 test/files/run/t7171.scala                         |   22 +
 test/files/run/t7185.check                         |   34 +
 test/files/run/t7185.scala                         |   12 +
 test/files/run/t7200.scala                         |   34 +
 test/files/run/t7214.scala                         |   57 +
 test/files/run/t7215.scala                         |    6 +
 test/files/run/t7235.check                         |    4 +
 test/files/run/t7235.scala                         |   14 +
 test/files/run/t7240.check                         |    0
 test/files/run/t7240/Macros_1.scala                |   48 +
 test/files/run/t7240/Test_2.scala                  |    3 +
 test/files/run/t7242.scala                         |   71 +
 test/files/run/t7246.check                         |    1 +
 test/files/run/t7246/Outer.java                    |    4 +
 test/files/run/t7246/Test.scala                    |   16 +
 test/files/run/t7246b.check                        |    2 +
 test/files/run/t7246b/Base.scala                   |    7 +
 test/files/run/t7246b/Outer.java                   |    4 +
 test/files/run/t7246b/Test.scala                   |   14 +
 test/files/run/t7249.check                         |    1 +
 test/files/run/t7249.scala                         |    7 +
 test/files/run/t7271.check                         |   12 +
 test/files/run/t7271.scala                         |   34 +
 test/files/run/t7290.scala                         |    9 +
 test/files/run/t7291a.check                        |    1 +
 test/files/run/t7291a.flags                        |    0
 test/files/run/t7291a.scala                        |   19 +
 test/files/run/t7291b.check                        |    2 +
 test/files/run/t7291b.flags                        |    1 +
 test/files/run/t7291b.scala                        |   19 +
 test/files/run/t7319.check                         |   38 +
 test/files/run/t7319.scala                         |   13 +
 test/files/run/t7325.check                         |   19 +
 test/files/run/t7325.scala                         |   25 +
 test/files/run/t7341.check                         |    0
 test/files/run/t7341.flags                         |    1 +
 test/files/run/t7341.scala                         |   15 +
 test/files/run/t7359.check                         |    1 +
 test/files/run/t7359/Cyclic_1.java                 |    3 +
 test/files/run/t7359/Test_2.scala                  |    6 +
 test/files/run/t7398.scala                         |   31 +
 test/files/run/test-cpp.check                      |  146 +-
 ...tags_without_scala_reflect_typetag_lookup.check |    2 +-
 ...ut_scala_reflect_typetag_manifest_interop.check |    2 +-
 test/partest                                       |    4 +-
 test/{files => pending}/neg/t5353.check            |    0
 test/{files => pending}/neg/t5353.scala            |    0
 test/pending/neg/t7441.check                       |    6 +
 test/pending/neg/t7441.scala                       |    7 +
 test/pending/pos/t7234.scala                       |   15 +
 test/pending/pos/t7234b.scala                      |   20 +
 test/pending/pos/t7486.scala                       |    8 +
 test/pending/run/t6387.check                       |    1 +
 test/pending/run/t6387.scala                       |   16 +
 test/scaladoc/run/SI-6580.check                    |   11 +
 test/scaladoc/run/SI-6580.scala                    |   32 +
 test/scaladoc/run/SI-6715.check                    |    1 +
 test/scaladoc/run/SI-6715.scala                    |   15 +
 test/scaladoc/run/SI-7367.check                    |    1 +
 test/scaladoc/run/SI-7367.scala                    |   25 +
 test/scaladoc/scalacheck/IndexTest.scala           |    7 -
 tools/stability-test.sh                            |   29 +
 429 files changed, 12974 insertions(+), 12260 deletions(-)

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:41 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:41 +0000
Subject: [Pkg-scala-commits] [scala] 06/15: Merge tag 'upstream/2.10.3+dfsg'
In-Reply-To: <20140423213130.24448.39574@moszumanska.debian.org>
References: <20140423213130.24448.39574@moszumanska.debian.org>
Message-ID: <E1Wd4lZ-0006PU-80@moszumanska.debian.org>

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

mehdi pushed a commit to branch master
in repository scala.

commit 81f447c1d896ca752e3a11536081fcc73c56814f
Merge: f812495 d1c5a34
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Apr 23 19:14:57 2014 +0200

    Merge tag 'upstream/2.10.3+dfsg'
    
    Upstream version 2.10.3+dfsg

 .gitignore                                         |   48 +
 bincompat-backward.whitelist.conf                  |   92 +
 bincompat-forward.whitelist.conf                   |  964 +++++++
 build.number                                       |    2 +-
 build.xml                                          |  120 +-
 docs/LICENSE                                       |   56 +-
 gitignore.SAMPLE                                   |   35 -
 .../scala/actors/scheduler/ThreadPoolConfig.scala  |    5 +-
 src/build/maven/maven-deploy.xml                   |    6 +-
 .../scala/reflect/macros/runtime/Typers.scala      |    2 +-
 src/compiler/scala/reflect/reify/package.scala     |    7 +-
 .../scala/reflect/reify/phases/Reshape.scala       |   16 +-
 .../scala/tools/ant/templates/tool-windows.tmpl    |   70 +-
 .../scala/tools/nsc/ast/parser/Parsers.scala       |   13 +-
 .../scala/tools/nsc/ast/parser/TreeBuilder.scala   |    6 +
 .../scala/tools/nsc/interpreter/ILoop.scala        |   35 +-
 .../nsc/symtab/classfile/ClassfileParser.scala     |   24 +-
 .../scala/tools/nsc/transform/Constructors.scala   |    5 +-
 .../scala/tools/nsc/transform/Erasure.scala        |    5 -
 .../tools/nsc/transform/ExtensionMethods.scala     |    7 +-
 src/compiler/scala/tools/nsc/transform/Mixin.scala |    2 +-
 .../tools/nsc/transform/SpecializeTypes.scala      |  150 +-
 .../scala/tools/nsc/transform/patmat/Solving.scala |    9 +-
 .../tools/nsc/typechecker/ContextErrors.scala      |    2 +-
 .../scala/tools/nsc/typechecker/Duplicators.scala  |   21 +-
 .../scala/tools/nsc/typechecker/Macros.scala       |    8 +-
 .../scala/tools/nsc/typechecker/Namers.scala       |    7 +-
 .../tools/nsc/typechecker/NamesDefaults.scala      |    9 +-
 .../scala/tools/nsc/typechecker/RefChecks.scala    |   63 +-
 .../tools/nsc/typechecker/TypeDiagnostics.scala    |   11 +-
 .../scala/tools/nsc/typechecker/Typers.scala       |   20 +-
 src/compiler/scala/tools/nsc/util/ClassPath.scala  |    5 +-
 .../scala/tools/nsc/util/MsilClassPath.scala       |    3 +-
 .../scala/tools/reflect/ToolBoxFactory.scala       |   17 +-
 .../scala/tools/reflect/WrappedProperties.scala    |    8 +-
 src/compiler/scala/tools/util/Javap.scala          |    2 +-
 src/eclipse/README.md                              |    3 +
 src/eclipse/test-junit/.classpath                  |   12 +
 src/eclipse/test-junit/.project                    |   35 +
 .../scala/collection/concurrent/TrieMap.scala      |    7 +-
 src/library/scala/collection/mutable/MapLike.scala |    4 +-
 src/library/scala/collection/mutable/SetLike.scala |    4 +-
 src/library/scala/concurrent/Future.scala          |  195 +-
 src/library/scala/concurrent/impl/Promise.scala    |  275 +-
 src/library/scala/math/BigDecimal.scala            |    2 +-
 src/library/scala/math/BigInt.scala                |    2 +-
 src/library/scala/runtime/ScalaRunTime.scala       |   66 +-
 src/library/scala/util/Properties.scala            |   51 +-
 src/partest/scala/tools/partest/DirectTest.scala   |   27 +
 src/partest/scala/tools/partest/PartestTask.scala  |    5 +-
 .../scala/reflect/internal/CapturedVariables.scala |    2 +-
 .../reflect/internal/ClassfileConstants.scala      |   36 +-
 .../scala/reflect/internal/Definitions.scala       |   13 +-
 .../reflect/internal/ExistentialsAndSkolems.scala  |    9 +-
 src/reflect/scala/reflect/internal/HasFlags.scala  |    3 +
 src/reflect/scala/reflect/internal/Importers.scala |    7 +-
 src/reflect/scala/reflect/internal/Printers.scala  |    2 +
 .../scala/reflect/internal/StdAttachments.scala    |   31 +
 src/reflect/scala/reflect/internal/StdNames.scala  |    1 +
 .../scala/reflect/internal/SymbolTable.scala       |   13 +-
 src/reflect/scala/reflect/internal/Trees.scala     |    7 +-
 src/reflect/scala/reflect/internal/Types.scala     |   22 +-
 .../internal/annotations/uncheckedBounds.scala     |   13 +
 .../scala/reflect/internal/util/WeakHashSet.scala  |  453 ++-
 .../scala/reflect/runtime/JavaMirrors.scala        |   44 +-
 .../scala/reflect/runtime/ReflectionUtils.scala    |    6 +
 .../scala/reflect/runtime/SymbolLoaders.scala      |   11 +-
 test/files/{gitignore.SAMPLE => .gitignore}        |    0
 test/files/jvm/duration-tck.scala                  |    5 +-
 test/files/jvm/scala-concurrent-tck.scala          |  562 +---
 test/files/neg/macro-abort.check                   |    4 +
 test/files/neg/macro-abort/Macros_1.scala          |    9 +
 test/files/neg/macro-abort/Test_2.scala            |    3 +
 test/files/neg/macro-exception.check               |    7 +
 test/files/neg/macro-exception/Macros_1.scala      |    9 +
 test/files/neg/macro-exception/Test_2.scala        |    3 +
 ...verride-macro-overrides-abstract-method-b.check |   16 +-
 .../Impls_Macros_1.scala                           |   17 +-
 .../Test_2.scala                                   |    6 +-
 test/files/neg/t6138.check                         |    7 +
 test/files/neg/t6138.scala                         |    5 +
 test/files/neg/t7020.check                         |   17 +
 test/files/neg/t7020.flags                         |    1 +
 test/files/neg/t7020.scala                         |   30 +
 test/files/neg/t7473.check                         |    7 +
 test/files/neg/t7473.scala                         |    7 +
 test/files/neg/t7507.check                         |    4 +
 test/files/neg/t7507.scala                         |    7 +
 test/files/neg/t7636.check                         |   10 +
 test/files/neg/t7636.scala                         |    7 +
 test/files/neg/t7694b.check                        |    7 +
 test/files/neg/t7752.check                         |   27 +
 test/files/neg/t7752.scala                         |   26 +
 .../files/neg/valueclasses-impl-restrictions.check |    8 +-
 .../files/neg/valueclasses-impl-restrictions.scala |    4 +-
 test/files/pos/SI-7638.scala                       |   51 +
 test/files/pos/lub-dealias-widen.scala             |   34 +
 test/files/pos/t4760.scala                         |   34 +
 test/files/pos/t7014/ThreadSafety.java             |    9 +
 test/files/pos/t7014/ThreadSafetyLevel.java        |    8 +
 test/files/pos/t7014/t7014.scala                   |    4 +
 test/files/pos/t7461.check                         |    0
 test/files/pos/t7461/Macros_1.scala                |   13 +
 test/files/pos/t7461/Test_2.scala                  |    3 +
 test/files/pos/t7486-named.scala                   |    8 +
 test/{pending => files}/pos/t7486.scala            |    0
 test/files/pos/t7505.scala                         |   16 +
 test/files/pos/t7649.flags                         |    1 +
 test/files/pos/t7649.scala                         |   20 +
 test/files/pos/t7694.scala                         |   40 +
 test/files/pos/t7716.scala                         |   16 +
 test/files/pos/t7782.scala                         |   25 +
 test/files/pos/t7782b.scala                        |   25 +
 test/files/pos/t7818.scala                         |   10 +
 test/files/pos/t942/Amount_1.java                  |    5 +
 test/files/pos/t942/Test_2.scala                   |    3 +
 test/files/run/WeakHashSetTest.scala               |  174 ++
 test/files/run/classfile-format-51.scala           |    8 +-
 test/files/run/classfile-format-52.check           |    2 +
 test/files/run/classfile-format-52.scala           |   77 +
 test/files/run/future-flatmap-exec-count.check     |    6 +
 test/files/run/future-flatmap-exec-count.scala     |   61 +
 test/files/run/macro-auto-duplicate.check          |    1 +
 test/files/run/macro-auto-duplicate/Macros_1.scala |   17 +
 test/files/run/macro-auto-duplicate/Test_2.scala   |    3 +
 test/files/run/macro-duplicate.check               |    0
 test/files/run/macro-duplicate.flags               |    1 +
 .../files/run/macro-duplicate/Impls_Macros_1.scala |   29 +
 test/files/run/macro-duplicate/Test_2.scala        |    6 +
 test/files/run/predef-cycle.scala                  |   71 +
 .../files/run/reflection-magicsymbols-invoke.check |    2 +-
 test/files/run/t6392b.check                        |    2 +-
 test/files/run/t6481.check                         |    4 +
 test/files/run/t6481.scala                         |   13 +
 test/files/run/t6989.check                         |   24 +
 test/files/run/t7265.scala                         |   27 +
 test/files/run/t7269.scala                         |   32 +
 test/files/run/t7331a.check                        |    2 +
 test/files/run/t7331a.scala                        |   10 +
 test/files/run/t7331b.check                        |    3 +
 test/files/run/t7331b.scala                        |   11 +
 test/files/run/t7331c.check                        |    3 +
 test/files/run/t7331c.scala                        |   11 +
 test/files/run/t7336.scala                         |   31 +
 test/files/run/t7375a.check                        |    4 +
 test/files/run/t7375a.scala                        |   16 +
 test/files/run/t7375b.check                        |    4 +
 test/files/run/t7375b/Macros_1.scala               |   18 +
 test/files/run/t7375b/Test_2.scala                 |    3 +
 test/files/run/t7398.scala                         |   11 +-
 test/files/run/t7455.check                         |    4 +
 test/files/run/t7455/Outer.java                    |   31 +
 test/files/run/t7455/Test.scala                    |   30 +
 test/files/run/t7498.scala                         |   20 +
 test/files/run/t7507.scala                         |   31 +
 test/files/run/t7510.check                         |    0
 test/files/run/t7510/Ann_1.java                    |    4 +
 test/files/run/t7510/Test_2.scala                  |    9 +
 test/files/run/t7556.check                         |    2 +
 test/files/run/t7556/Test_2.scala                  |   11 +
 test/files/run/t7556/mega-class_1.scala            | 3002 ++++++++++++++++++++
 test/files/run/t7558.scala                         |    9 +
 test/files/run/t7569.check                         |   12 +
 test/files/run/t7569.scala                         |   19 +
 test/files/run/t7571.scala                         |   12 +
 test/files/run/t7617a.check                        |    2 +
 test/files/run/t7617a/Macros_1.scala               |   22 +
 test/files/run/t7617a/Test_2.scala                 |    5 +
 test/files/run/t7617b.check                        |    1 +
 test/files/run/t7617b/Macros_1.scala               |    8 +
 test/files/run/t7617b/Test_2.scala                 |   11 +
 test/files/run/t7657.check                         |    3 +
 test/files/run/t7657/Macros_1.scala                |    8 +
 test/files/run/t7657/Test_2.scala                  |    6 +
 test/files/run/t7733.check                         |    1 +
 test/files/run/t7733/Separate_1.scala              |    5 +
 test/files/run/t7733/Test_2.scala                  |    9 +
 test/files/run/t7775.scala                         |   17 +
 test/files/run/t7779.scala                         |   67 +
 test/files/run/t7825.scala                         |   34 +
 test/files/run/toolbox_current_run_compiles.check  |    2 +
 test/files/run/toolbox_current_run_compiles.scala  |   28 +
 test/files/run/typed-annotated.check               |    1 +
 test/files/run/typed-annotated/Macros_1.scala      |   17 +
 test/files/run/typed-annotated/Test_2.scala        |    3 +
 test/files/specialized/SI-7343.scala               |   55 +
 test/files/specialized/SI-7344.scala               |   53 +
 test/files/specialized/spec-ame.check              |    2 +-
 test/files/specialized/spec-ame.scala              |    3 +
 test/instrumented/boxes.patch                      |    2 +-
 .../library/scala/runtime/BoxesRunTime.java        |    7 +-
 .../library/scala/runtime/ScalaRunTime.scala       |  100 +-
 test/instrumented/srt.patch                        |   65 +-
 .../scala/concurrent/impl/DefaultPromiseTest.scala |  344 +++
 test/junit/scala/runtime/ScalaRunTimeTest.scala    |   70 +
 test/junit/scala/tools/nsc/SampleTest.scala        |   17 +
 test/pending/junit/scala/util/t7265.scala          |   46 +
 test/pending/pos/t7778/Foo_1.java                  |    6 +
 test/pending/pos/t7778/Test_2.scala                |    3 +
 test/scaladoc/run/t7767.check                      |    1 +
 test/scaladoc/run/t7767.scala                      |   18 +
 tools/binary-repo-lib.sh                           |    2 +-
 202 files changed, 8104 insertions(+), 1179 deletions(-)

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:41 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:41 +0000
Subject: [Pkg-scala-commits] [scala] 08/15: Merge tag 'upstream/2.10.4+dfsg'
In-Reply-To: <20140423213130.24448.39574@moszumanska.debian.org>
References: <20140423213130.24448.39574@moszumanska.debian.org>
Message-ID: <E1Wd4lZ-0006Py-T2@moszumanska.debian.org>

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

mehdi pushed a commit to branch master
in repository scala.

commit 72010bf4a71e19fd4f04935cef1740aa7eb22d40
Merge: 81f447c fe0c68f
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Apr 23 19:19:25 2014 +0200

    Merge tag 'upstream/2.10.4+dfsg'
    
    Upstream version 2.10.4+dfsg

 .gitignore                                         |    1 +
 bincompat-backward.whitelist.conf                  |  217 +---
 bincompat-forward.whitelist.conf                   | 1274 +-------------------
 build.examples.xml                                 |  283 -----
 build.number                                       |    2 +-
 build.xml                                          |   59 +-
 docs/LICENSE                                       |   36 +
 docs/README                                        |   58 +-
 docs/examples/actors/auction.scala                 |  131 --
 docs/examples/actors/boundedbuffer.scala           |   37 -
 docs/examples/actors/channels.scala                |   32 -
 docs/examples/actors/fringe.scala                  |   82 --
 docs/examples/actors/links.scala                   |   47 -
 docs/examples/actors/looping.scala                 |   26 -
 docs/examples/actors/message.scala                 |   40 -
 docs/examples/actors/pingpong.scala                |   61 -
 docs/examples/actors/producers.scala               |  114 --
 docs/examples/actors/seq.scala                     |   15 -
 docs/examples/boundedbuffer.scala                  |   46 -
 docs/examples/computeserver.scala                  |   54 -
 .../examples/expressions/expressions-current.scala |   68 --
 docs/examples/fors.scala                           |  112 --
 docs/examples/futures.scala                        |   17 -
 docs/examples/gadts.scala                          |   22 -
 docs/examples/iterators.scala                      |   28 -
 docs/examples/jolib/Ref.scala                      |   55 -
 docs/examples/jolib/parallelOr.scala               |   58 -
 docs/examples/maps.scala                           |  187 ---
 docs/examples/monads/callccInterpreter.scala       |   86 --
 docs/examples/monads/directInterpreter.scala       |   55 -
 docs/examples/monads/errorInterpreter.scala        |   86 --
 docs/examples/monads/simpleInterpreter.scala       |   75 --
 docs/examples/monads/stateInterpreter.scala        |   86 --
 docs/examples/oneplacebuffer.scala                 |   64 -
 docs/examples/parsing/ArithmeticParser.scala       |   57 -
 docs/examples/parsing/ArithmeticParsers.scala      |   70 --
 docs/examples/parsing/JSON.scala                   |   44 -
 docs/examples/parsing/ListParser.scala             |   33 -
 docs/examples/parsing/ListParsers.scala            |   30 -
 docs/examples/parsing/MiniML.scala                 |   52 -
 docs/examples/parsing/lambda/Main.scala            |   34 -
 docs/examples/parsing/lambda/TestParser.scala      |   68 --
 docs/examples/parsing/lambda/TestSyntax.scala      |   86 --
 docs/examples/parsing/lambda/test/test-01.kwi      |    1 -
 docs/examples/parsing/lambda/test/test-02.kwi      |    1 -
 docs/examples/parsing/lambda/test/test-03.kwi      |    1 -
 docs/examples/parsing/lambda/test/test-04.kwi      |    1 -
 docs/examples/parsing/lambda/test/test-05.kwi      |    1 -
 docs/examples/parsing/lambda/test/test-06.kwi      |    1 -
 docs/examples/parsing/lambda/test/test-07.kwi      |    1 -
 docs/examples/parsing/lambda/test/test-08.kwi      |    1 -
 docs/examples/patterns.scala                       |   36 -
 docs/examples/pilib/elasticBuffer.scala            |   77 --
 docs/examples/pilib/handover.scala                 |  186 ---
 docs/examples/pilib/mobilePhoneProtocol.scala      |  172 ---
 docs/examples/pilib/piNat.scala                    |   89 --
 docs/examples/pilib/rwlock.scala                   |  329 -----
 docs/examples/pilib/scheduler.scala                |  150 ---
 docs/examples/pilib/semaphore.scala                |   72 --
 docs/examples/pilib/twoPlaceBuffer.scala           |   67 -
 docs/examples/plugintemplate/.classpath            |   11 -
 docs/examples/plugintemplate/.project              |   18 -
 docs/examples/plugintemplate/build.xml             |  265 ----
 docs/examples/plugintemplate/doc/README            |   68 --
 .../plugintemplate/examples/BasicExample.scala     |    8 -
 .../plugintemplate/lib/scalatest.jar.desired.sha1  |    1 -
 .../examples/plugintemplate/misc/scalac-plugin.xml |    4 -
 docs/examples/plugintemplate/plugin.properties     |   10 -
 .../src/plugintemplate/PluginProperties.scala      |   61 -
 .../plugintemplate/TemplateAnnotationChecker.scala |   20 -
 .../src/plugintemplate/TemplateComponent.scala     |   35 -
 .../TemplateInfoTransformComponent.scala           |   79 --
 .../src/plugintemplate/TemplatePlugin.scala        |   52 -
 .../TemplateTransformComponent.scala               |   58 -
 .../plugintemplate/TemplateTraverseComponent.scala |   32 -
 .../src/plugintemplate/standalone/Main.scala       |   44 -
 .../plugintemplate/standalone/PluginRunner.scala   |   36 -
 .../plugintemplate/PluginPropertiesSuite.scala     |   14 -
 .../test/plugintemplate/TemplatePluginSuite.scala  |   22 -
 docs/examples/sort.scala                           |   48 -
 docs/examples/sort1.scala                          |   22 -
 docs/examples/sort2.scala                          |   25 -
 docs/examples/swing/ButtonApp.scala                |   24 -
 docs/examples/swing/CelsiusConverter.scala         |   42 -
 docs/examples/swing/CelsiusConverter2.scala        |   36 -
 docs/examples/swing/ComboBoxes.scala               |   86 --
 docs/examples/swing/CountButton.scala              |   30 -
 docs/examples/swing/Dialogs.scala                  |  176 ---
 docs/examples/swing/GridBagDemo.scala              |   64 -
 docs/examples/swing/HelloWorld.scala               |   13 -
 docs/examples/swing/LabelTest.scala                |   19 -
 docs/examples/swing/LinePainting.scala             |   53 -
 docs/examples/swing/ListViewDemo.scala             |   17 -
 docs/examples/swing/SimpleApplet.scala             |   18 -
 docs/examples/swing/SwingApp.scala                 |   29 -
 docs/examples/swing/TableSelection.scala           |   96 --
 docs/examples/swing/UIDemo.scala                   |  147 ---
 docs/examples/swing/images/banana.jpg              |  Bin 6000 -> 0 bytes
 docs/examples/swing/images/margarita1.jpg          |  Bin 14770 -> 0 bytes
 docs/examples/swing/images/margarita2.jpg          |  Bin 17310 -> 0 bytes
 docs/examples/swing/images/rose.jpg                |  Bin 13808 -> 0 bytes
 docs/examples/tcpoly/collection/HOSeq.scala        |  167 ---
 docs/examples/tcpoly/monads/Monads.scala           |   69 --
 docs/examples/typeinf.scala                        |  253 ----
 docs/examples/xml/phonebook/embeddedBook.scala     |   26 -
 docs/examples/xml/phonebook/phonebook.scala        |   38 -
 docs/examples/xml/phonebook/phonebook1.scala       |   21 -
 docs/examples/xml/phonebook/phonebook2.scala       |   25 -
 docs/examples/xml/phonebook/phonebook3.scala       |   81 --
 docs/examples/xml/phonebook/verboseBook.scala      |   24 -
 docs/licenses/apache_android.txt                   |   16 -
 docs/licenses/apache_ant.txt                       |   16 -
 docs/licenses/apache_jansi.txt                     |  203 ++++
 docs/licenses/bsd_asm.txt                          |   31 +
 docs/licenses/bsd_jline.txt                        |    2 +-
 src/asm/scala/tools/asm/MethodWriter.java          |    7 +-
 src/build/maven/maven-deploy.xml                   |   20 +
 src/build/pack.xml                                 |    2 +-
 .../scala/tools/ant/templates/tool-windows.tmpl    |   17 +-
 .../scala/tools/nsc/ast/parser/Parsers.scala       |    7 +-
 .../scala/tools/nsc/ast/parser/Scanners.scala      |    5 +-
 .../scala/tools/nsc/backend/icode/GenICode.scala   |    5 +-
 .../scala/tools/nsc/backend/icode/Members.scala    |    4 +
 .../scala/tools/nsc/backend/jvm/GenASM.scala       |   38 +-
 .../nsc/backend/opt/DeadCodeElimination.scala      |    8 +-
 .../tools/nsc/interactive/CompilerControl.scala    |   23 +-
 .../scala/tools/nsc/interactive/ContextTrees.scala |   65 +-
 .../scala/tools/nsc/interactive/Global.scala       |   47 +-
 .../scala/tools/nsc/interactive/Picklers.scala     |    2 +-
 .../scala/tools/nsc/interactive/REPL.scala         |    2 +-
 .../nsc/interactive/tests/InteractiveTest.scala    |    2 +-
 .../nsc/interactive/tests/core/AskCommand.scala    |   23 +-
 .../nsc/interactive/tests/core/CoreTestDefs.scala  |   47 +-
 .../nsc/interactive/tests/core/TestMarker.scala    |    4 +-
 .../nsc/interpreter/AbstractFileClassLoader.scala  |   16 +-
 .../scala/tools/nsc/interpreter/ILoop.scala        |   28 +-
 .../scala/tools/nsc/symtab/BrowsingLoaders.scala   |    6 +-
 .../tools/nsc/symtab/classfile/ICodeReader.scala   |    7 +-
 .../scala/tools/nsc/transform/Erasure.scala        |   21 +-
 .../scala/tools/nsc/transform/UnCurry.scala        |   12 +-
 .../tools/nsc/typechecker/ContextErrors.scala      |   10 +-
 .../tools/nsc/typechecker/NamesDefaults.scala      |    9 +-
 .../scala/tools/nsc/typechecker/RefChecks.scala    |   14 +-
 .../scala/tools/nsc/typechecker/Typers.scala       |   48 +-
 .../scala/tools/reflect/ToolBoxFactory.scala       |    9 +-
 src/library/scala/MatchError.scala                 |   10 +-
 src/library/scala/collection/TraversableLike.scala |    2 +-
 .../generic/GenericClassTagCompanion.scala         |    2 +-
 .../collection/generic/GenericCompanion.scala      |    2 +-
 .../generic/GenericOrderedCompanion.scala          |    2 +-
 .../scala/collection/immutable/TrieIterator.scala  |    2 +-
 .../scala/collection/parallel/ParSeqLike.scala     |    2 +-
 .../scala/concurrent/ExecutionContext.scala        |    2 +-
 src/library/scala/concurrent/Future.scala          |    5 +-
 src/reflect/scala/reflect/api/Universe.scala       |   10 +-
 src/reflect/scala/reflect/internal/Kinds.scala     |    3 +-
 src/reflect/scala/reflect/internal/Symbols.scala   |   13 +-
 src/reflect/scala/reflect/internal/Types.scala     |   37 +-
 src/swing/scala/swing/Publisher.scala              |    2 +-
 starr.number                                       |    3 +-
 test/{files => disabled}/presentation/doc.check    |    0
 .../{files => disabled}/presentation/doc/doc.scala |    0
 .../presentation/doc/src/Class.scala               |    0
 .../presentation/doc/src/p/Base.scala              |    0
 .../presentation/doc/src/p/Derived.scala           |    0
 test/disabled/run/t6026.check                      |    9 +
 test/disabled/run/t6026.scala                      |    9 +
 test/files/android/HelloAndroid.scala              |   16 -
 test/files/android/HelloAndroid.xml                |   11 -
 test/files/{neg => disabled}/t7020.check           |    0
 test/files/{neg => disabled}/t7020.flags           |    0
 test/files/{neg => disabled}/t7020.scala           |    0
 test/files/jvm/future-spec/PromiseTests.scala      |    4 +-
 test/files/jvm/scala-concurrent-tck.scala          |    4 +-
 test/files/neg/applydynamic_sip.check              |    8 +-
 .../neg/classmanifests_new_deprecations.check      |    8 +-
 test/files/neg/macro-invalidimpl-f.check           |    2 +-
 test/files/neg/macro-invalidimpl-g.check           |    2 +-
 test/files/neg/macro-invalidret-nontree.check      |    2 +-
 .../neg/macro-invalidret-nonuniversetree.check     |    2 +-
 .../neg/macro-invalidsig-context-bounds.check      |    5 +-
 test/files/neg/macro-invalidsig-ctx-badargc.check  |    2 +-
 test/files/neg/macro-invalidsig-ctx-badtype.check  |    2 +-
 .../neg/macro-invalidsig-ctx-badvarargs.check      |    2 +-
 test/files/neg/macro-invalidsig-ctx-noctx.check    |    2 +-
 .../neg/macro-invalidsig-implicit-params.check     |    5 +-
 .../neg/macro-invalidsig-params-badargc.check      |    2 +-
 .../neg/macro-invalidsig-params-badtype.check      |    2 +-
 .../neg/macro-invalidsig-params-badvarargs.check   |    2 +-
 .../neg/macro-invalidsig-params-namemismatch.check |    2 +-
 .../neg/macro-invalidsig-tparams-badtype.check     |    2 +-
 .../neg/macro-invalidsig-tparams-notparams-a.check |    2 +-
 .../neg/macro-invalidsig-tparams-notparams-b.check |    2 +-
 test/files/neg/t5689.check                         |    2 +-
 test/files/neg/t6426.check                         |    7 -
 test/files/neg/t6426.scala                         |    5 -
 test/files/neg/t6563.check                         |    4 +
 test/files/neg/t6563.scala                         |    8 +
 test/files/neg/t7519-b.check                       |    4 +
 test/files/neg/t7519-b/Mac_1.scala                 |   14 +
 test/files/neg/t7519-b/Use_2.scala                 |    8 +
 test/files/neg/t7519.check                         |    7 +
 test/files/neg/t7519.scala                         |   18 +
 test/files/neg/t7783.check                         |   16 +
 test/files/neg/t7783.flags                         |    1 +
 test/files/neg/t7783.scala                         |   15 +
 test/files/neg/t8104a.check                        |    4 +
 test/files/neg/t8104a/Macros_1.scala               |   23 +
 test/files/neg/t8104a/Test_2.scala                 |   20 +
 test/files/neg/t8104b.check                        |    4 +
 test/files/neg/t8104b/Macros_1.scala               |   23 +
 test/files/neg/t8104b/Test_2.scala                 |   24 +
 test/files/neg/t8146-non-finitary-2.check          |    9 +
 test/files/neg/t8146-non-finitary-2.scala          |    8 +
 test/files/neg/t8146-non-finitary.check            |    9 +
 test/files/neg/t8146-non-finitary.scala            |    7 +
 test/files/pos/SI-4012-a.scala                     |    7 +
 test/files/pos/SI-4012-b.scala                     |   15 +
 test/files/pos/t7776.check                         |    0
 test/files/pos/t7776.scala                         |   12 +
 test/files/pos/t7815.scala                         |   30 +
 test/files/pos/t7902.scala                         |   17 +
 test/files/pos/t8060.scala                         |   11 +
 test/files/pos/t8062.flags                         |    1 +
 test/files/pos/t8062/A_1.scala                     |    5 +
 test/files/pos/t8062/B_2.scala                     |    3 +
 test/files/pos/t8111.scala                         |   24 +
 test/files/pos/t8138.scala                         |   24 +
 test/files/pos/t8146a.scala                        |    9 +
 test/files/pos/t8146b.scala                        |   77 ++
 test/files/pos/t8152-performance.scala             |   13 +
 test/files/presentation/callcc-interpreter.check   |    2 +-
 ...349.check => completion-implicit-chained.check} |   27 +-
 .../completion-implicit-chained/Test.scala         |    3 +
 .../src/Completions.scala                          |   12 +
 test/files/presentation/ide-bug-1000349.check      |    2 +-
 test/files/presentation/ide-bug-1000475.check      |    6 +-
 test/files/presentation/ide-bug-1000531.check      |    2 +-
 test/files/presentation/ide-t1001388.check         |    1 +
 test/files/presentation/ide-t1001388/Test.scala    |   28 +
 test/files/presentation/ide-t1001388/src/a/A.scala |    6 +
 test/files/presentation/implicit-member.check      |    2 +-
 test/files/presentation/ping-pong.check            |    4 +-
 test/files/presentation/scope-completion-1.check   |   19 +
 .../presentation/scope-completion-1/Test.scala     |    3 +
 .../scope-completion-1/src/Completions.scala       |   12 +
 test/files/presentation/scope-completion-2.check   |   33 +
 .../presentation/scope-completion-2/Test.scala     |    3 +
 .../scope-completion-2/src/Completions.scala       |   31 +
 test/files/presentation/scope-completion-3.check   |  111 ++
 .../presentation/scope-completion-3/Test.scala     |    3 +
 .../scope-completion-3/src/Completions.scala       |  106 ++
 test/files/presentation/scope-completion-4.check   |  293 +++++
 .../presentation/scope-completion-4/Test.scala     |    3 +
 .../scope-completion-4/src/Completions.scala       |   84 ++
 .../presentation/scope-completion-import.check     |  193 +++
 .../scope-completion-import/Test.scala             |    3 +
 .../scope-completion-import/src/Completions.scala  |   72 ++
 test/files/presentation/t5708.check                |    2 +-
 test/files/presentation/t7548.check                |    1 +
 test/files/presentation/t7548/Test.scala           |   17 +
 test/files/presentation/t7548/src/Foo.scala        |    7 +
 test/files/presentation/t7548b.check               |    1 +
 test/files/presentation/t7548b/Test.scala          |   17 +
 test/files/presentation/t7548b/src/Foo.scala       |   12 +
 test/files/presentation/t7915.check                |   11 +
 test/files/presentation/t7915/Test.scala           |    8 +
 test/files/presentation/t7915/src/Foo.scala        |    9 +
 test/files/presentation/t8085.check                |    3 +
 test/files/presentation/t8085.flags                |    1 +
 test/files/presentation/t8085/Test.scala           |   27 +
 .../presentation/t8085/src/nodescala/Foo.scala     |    3 +
 .../t8085/src/nodescala/NodeScalaSuite.scala       |   10 +
 .../presentation/t8085/src/nodescala/package.scala |    7 +
 test/files/presentation/t8085b.check               |    3 +
 test/files/presentation/t8085b.flags               |    1 +
 test/files/presentation/t8085b/Test.scala          |   27 +
 .../presentation/t8085b/src/p1/nodescala/Foo.scala |    4 +
 .../t8085b/src/p1/nodescala/NodeScalaSuite.scala   |   11 +
 .../t8085b/src/p1/nodescala/package.scala          |    9 +
 test/files/presentation/visibility.check           |   10 +-
 test/files/run/dynamic-applyDynamic.check          |   14 +
 test/files/run/dynamic-applyDynamic.scala          |   26 +
 test/files/run/dynamic-applyDynamicNamed.check     |   14 +
 test/files/run/dynamic-applyDynamicNamed.scala     |   26 +
 test/files/run/dynamic-selectDynamic.check         |   13 +
 test/files/run/dynamic-selectDynamic.scala         |   25 +
 test/files/run/dynamic-updateDynamic.check         |   14 +
 test/files/run/dynamic-updateDynamic.scala         |   28 +
 test/files/run/large_code.check                    |    3 +
 test/files/run/large_code.scala                    |   24 +
 test/files/run/t4542.check                         |    3 -
 test/files/run/t6546.flags                         |    1 +
 test/files/run/t6546/A_1.scala                     |    6 +
 test/files/run/t6546/B_2.scala                     |    8 +
 test/files/run/t7439.check                         |    1 +
 test/files/run/t7439/A_1.java                      |    3 +
 test/files/run/t7439/B_1.java                      |    3 +
 test/files/run/t7439/Test_2.scala                  |   31 +
 test/files/run/t7912.scala                         |   16 +
 test/files/run/t8010.scala                         |   22 +
 test/files/run/t8029.scala                         |   57 +
 test/files/run/t8114.scala                         |   15 +
 test/files/run/toolbox_rangepos.check              |    1 +
 test/files/run/toolbox_rangepos.scala              |    8 +
 .../reflect/internal/util/SourceFileTest.scala     |   58 +
 306 files changed, 2930 insertions(+), 7986 deletions(-)

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:42 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:42 +0000
Subject: [Pkg-scala-commits] [scala] 09/15: New upstream release (Closes:
	#744278).
In-Reply-To: <20140423213130.24448.39574@moszumanska.debian.org>
References: <20140423213130.24448.39574@moszumanska.debian.org>
Message-ID: <E1Wd4la-0006QF-4H@moszumanska.debian.org>

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

mehdi pushed a commit to branch master
in repository scala.

commit d8f49c59ea16289ab0e9f26985901f743cc91848
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Apr 23 19:25:52 2014 +0200

    New upstream release (Closes: #744278).
---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 594f059..de13888 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scala (2.10.4+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release (Closes: #744278).
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 23 Apr 2014 19:23:33 +0200
+
 scala (2.9.2+dfsg-2) unstable; urgency=low
 
   * Team upload.

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:42 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:42 +0000
Subject: [Pkg-scala-commits] [scala] 10/15: Update patches
In-Reply-To: <20140423213130.24448.39574@moszumanska.debian.org>
References: <20140423213130.24448.39574@moszumanska.debian.org>
Message-ID: <E1Wd4la-0006QW-8Y@moszumanska.debian.org>

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

mehdi pushed a commit to branch master
in repository scala.

commit e179e42f1675a5517a80b2147ded6d8db436d4dc
Author: Lucas Satabin <lucas.satabin at gnieh.org>
Date:   Sun Mar 30 18:01:53 2014 +0200

    Update patches
---
 debian/patches/0001-Define-system-locations.patch  |  21 ++--
 .../patches/0002-Use-system-ant-contrib.jar.patch  |  19 ++-
 ..._HOME-and-TOOL_CLASSPATH-to-the-package-l.patch |  55 ++++----
 debian/patches/0005-java7-compilation.patch        | 138 +++++++++------------
 debian/patches/remove-non-ascii-ftbfs.patch        |   9 +-
 5 files changed, 113 insertions(+), 129 deletions(-)

diff --git a/debian/patches/0001-Define-system-locations.patch b/debian/patches/0001-Define-system-locations.patch
index 2fee3dc..33ef923 100644
--- a/debian/patches/0001-Define-system-locations.patch
+++ b/debian/patches/0001-Define-system-locations.patch
@@ -6,24 +6,22 @@ Subject: Define system locations
  build.xml |    9 +++++++++
  1 files changed, 9 insertions(+), 0 deletions(-)
 
-diff --git a/build.xml b/build.xml
-index 2281613..f77c225 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -141,6 +141,10 @@ PROPERTIES
+@@ -97,6 +97,10 @@
    <!-- Prevents system classpath from being used -->
-   <property name="build.sysclasspath" value="ignore"/>
+   <property name="build.sysclasspath"     value="ignore"/>
  
 +  <!-- Defines system location of java libraries -->
 +  <property name="javalib.dir" value="/usr/share/java" />
 +  <property name="scalalib.dir" value="${javalib.dir}/scala" />
 +
    <!-- Defines the repository layout -->
-   <property name="docs.dir" value="${basedir}/docs"/>
-   <property name="lib.dir" value="${basedir}/lib"/>
-@@ -159,6 +163,11 @@ PROPERTIES
-   <property name="scalac.args" value=""/>
-   <property name="javac.args" value=""/>
+   <property name="docs.dir"               value="${basedir}/docs"/>
+   <property name="lib.dir"                value="${basedir}/lib"/>
+@@ -117,6 +121,11 @@
+   <!-- read starr.version -->
+   <property file="${basedir}/starr.number"/>
  
 +  <!-- Sets location of system libraries -->
 +  <property name="junit.jar" value="${javalib.dir}/junit4.jar"/>
@@ -31,6 +29,5 @@ index 2281613..f77c225 100644
 +  <property name="jansi-native.jar" value="${javalib.dir}/jansi-native.jar"/>
 +
    <!-- Sets location of pre-compiled libraries -->
-   <property name="lib.starr.jar" value="${lib.dir}/scala-library.jar"/>
-   <property name="comp.starr.jar" value="${lib.dir}/scala-compiler.jar"/>
--- 
+   <property name="library.starr.jar"       value="${lib.dir}/scala-library.jar"/>
+   <property name="reflect.starr.jar"       value="${lib.dir}/scala-reflect.jar"/>
diff --git a/debian/patches/0002-Use-system-ant-contrib.jar.patch b/debian/patches/0002-Use-system-ant-contrib.jar.patch
index 1b728ca..c8a7093 100644
--- a/debian/patches/0002-Use-system-ant-contrib.jar.patch
+++ b/debian/patches/0002-Use-system-ant-contrib.jar.patch
@@ -6,17 +6,14 @@ Subject: Use system ant-contrib.jar
  build.xml |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/build.xml b/build.xml
-index f77c225..33db14a 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -220,7 +220,7 @@ INITIALISATION
-     <property name="scalac.args.all" value="${scalac.args} ${scalac.args.optimise}"/>
- 	  <property name="scalac.args.quick" value="${scalac.args.all} ${scalac.args.quickonly}"/>
-     <!-- Setting-up Ant contrib tasks -->
--    <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib.dir}/ant/ant-contrib.jar"/>
+@@ -202,7 +202,7 @@
+ 
+   <target name="init" depends="boot">
+     <!-- Set up Ant contrib tasks so we can use <if><then><else> instead of the clunky `unless` attribute -->
+-    <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib-ant.dir}/ant-contrib.jar"/>
 +    <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${javalib.dir}/ant-contrib.jar"/>
-     <!-- This is the start time for the distribution -->
-     <tstamp prefix="time">
-       <format property="human" pattern="d MMMM yyyy, HH:mm:ss"/>
--- 
+ 
+     <!-- Add our maven ant tasks -->
+     <path id="maven-ant-tasks.classpath" path="${lib-ant.dir}/maven-ant-tasks-2.1.1.jar" />
diff --git a/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch b/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
index e7d80d2..87601f1 100644
--- a/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
+++ b/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
@@ -8,46 +8,47 @@ Subject: Adapt SCALA_HOME and TOOL_CLASSPATH to the package layout
 
 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
 +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
-@@ -48,23 +48,7 @@
- esac
+@@ -8,16 +8,6 @@
+ # PARTICULAR PURPOSE.
+ ##############################################################################
+ 
+-findScalaHome () {
+-  # see SI-2092 and SI-5792
+-  local source="${BASH_SOURCE[0]}"
+-  while [ -h "$source" ] ; do
+-    local linked="$(readlink "$source")"
+-    local dir="$( cd -P $(dirname "$source") && cd -P $(dirname "$linked") && pwd )"
+-    source="$dir/$(basename "$linked")"
+-  done
+-  ( cd -P "$(dirname "$source")/.." && pwd )
+-}
+ execCommand () {
+   [[ -n $SCALA_RUNNER_DEBUG ]] && echo "" && for arg in "$@@"; do echo "$arg"; done && echo "";
+   "$@@"
+@@ -68,7 +58,7 @@
+ fi
  
  # Finding the root folder for this Scala distribution
--SOURCE=$0;
--SCRIPT=`basename "$SOURCE"`;
--while [ -h "$SOURCE" ]; do
--    SCRIPT=`basename "$SOURCE"`;
--    LOOKUP=`ls -ld "$SOURCE"`;
--    TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`;
--    if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then
--        SOURCE=${TARGET:-.};
--    else
--        SOURCE=`dirname "$SOURCE"`/${TARGET:-.};
--    fi;
--done;
--
--# see #2092
--SCALA_HOME=`dirname "$SOURCE"`
--SCALA_HOME=`cd "$SCALA_HOME"; pwd -P`
--SCALA_HOME=`cd "$SCALA_HOME"/..; pwd`
+-SCALA_HOME="$(findScalaHome)"
 +SCALA_HOME="/usr/share/java"
+ SEP=":"
  
- # Remove spaces from SCALA_HOME on windows
- if $cygwin; then
-@@ -73,16 +57,7 @@
+ # Possible additional command line options
+@@ -84,16 +74,7 @@
  fi
  
  # Constructing the extension classpath
 -TOOL_CLASSPATH="@classpath@"
--if [ -z "$TOOL_CLASSPATH" ] ; then
+-if [[ -z "$TOOL_CLASSPATH" ]]; then
 -    for ext in "$SCALA_HOME"/lib/* ; do
--        if [ -z "$TOOL_CLASSPATH" ] ; then
+-        if [[ -z "$TOOL_CLASSPATH" ]]; then
 -            TOOL_CLASSPATH="$ext"
 -        else
--            TOOL_CLASSPATH="$TOOL_CLASSPATH:$ext"
+-            TOOL_CLASSPATH="${TOOL_CLASSPATH}${SEP}${ext}"
 -        fi
 -    done
 -fi
 +TOOL_CLASSPATH="$SCALA_HOME/scala-compiler.jar:$SCALA_HOME/scala-library.jar:$SCALA_HOME/scalap.jar:$SCALA_HOME/scala/jline.jar:$SCALA_HOME/jansi.jar"
  
- CYGWIN_JLINE_TERMINAL=
- if $cygwin; then
+ if [[ -n "$cygwin" ]]; then
+     if [[ "$OS" = "Windows_NT" ]] && cygpath -m .>/dev/null 2>/dev/null ; then
diff --git a/debian/patches/0005-java7-compilation.patch b/debian/patches/0005-java7-compilation.patch
index 70fb437..314bd22 100644
--- a/debian/patches/0005-java7-compilation.patch
+++ b/debian/patches/0005-java7-compilation.patch
@@ -5,27 +5,16 @@ Forwarded: not-needed
 
 --- a/src/swing/scala/swing/ComboBox.scala
 +++ b/src/swing/scala/swing/ComboBox.scala
-@@ -1,17 +1,15 @@
- /*                     __                                               *\
- **     ________ ___   / /  ___     Scala API                            **
--**    / __/ __// _ | / /  / _ |    (c) 2007-2011, LAMP/EPFL             **
-+**    / __/ __// _ | / /  / _ |    (c) 2007-2013, LAMP/EPFL             **
- **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
- ** /____/\___/_/ |_/____/_/ | |                                         **
- **                          |/                                          **
- \*                                                                      */
- 
--
--
+@@ -9,7 +9,7 @@
  package scala.swing
  
  import event._
 -import javax.swing.{JList, JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer}
-+import javax.swing.{ JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer }
++import javax.swing.{JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer}
  import java.awt.event.ActionListener
  
  object ComboBox {
-@@ -120,10 +118,10 @@
+@@ -118,10 +118,10 @@
    implicit def floatEditor(c: ComboBox[Float]): Editor[Float] = new BuiltInEditor(c)(s => s.toFloat, s => s.toString)
    implicit def doubleEditor(c: ComboBox[Double]): Editor[Double] = new BuiltInEditor(c)(s => s.toDouble, s => s.toString)
  
@@ -39,7 +28,7 @@ Forwarded: not-needed
        def setSelectedItem(a: Any) {
          if ((selected != null && selected != a) ||
              selected == null && a != null) {
-@@ -131,7 +129,7 @@
+@@ -129,7 +129,7 @@
            fireContentsChanged(this, -1, -1)
          }
        }
@@ -48,7 +37,7 @@ Forwarded: not-needed
        def getSize = items.size
      }
    }
-@@ -159,7 +157,7 @@
+@@ -157,7 +157,7 @@
   * @see javax.swing.JComboBox
   */
  class ComboBox[A](items: Seq[A]) extends Component with Publisher {
@@ -57,7 +46,7 @@ Forwarded: not-needed
  
    object selection extends Publisher {
      def index: Int = peer.getSelectedIndex
-@@ -184,7 +182,8 @@
+@@ -182,7 +182,8 @@
     * of the component to its own defaults _after_ the renderer has been
     * configured. That's Swing's principle of most suprise.
     */
@@ -67,28 +56,68 @@ Forwarded: not-needed
    def renderer_=(r: ListView.Renderer[A]) { peer.setRenderer(r.peer) }
  
    /* XXX: currently not safe to expose:
-@@ -203,8 +202,8 @@
+@@ -201,8 +202,9 @@
      peer.setEditor(editor(this).comboBoxPeer)
    }
  
 -  def prototypeDisplayValue: Option[A] = toOption[A](peer.getPrototypeDisplayValue)
 +  def prototypeDisplayValue: Option[A] = Option(peer.getPrototypeDisplayValue)
    def prototypeDisplayValue_=(v: Option[A]) {
--    peer.setPrototypeDisplayValue(v map toAnyRef orNull)
+-    peer.setPrototypeDisplayValue((v map toAnyRef).orNull)
 +    peer.setPrototypeDisplayValue((v map toAnyRef).orNull.asInstanceOf[A])
    }
  }
++
+--- a/build.xml
++++ b/build.xml
+@@ -364,13 +364,6 @@
+ 
+     <fail if="has.unsupported.jdk" message="JDK ${ant.java.version} is not supported by this build!"/>
+ 
+-    <if><isset property="has.java7"/><then>
+-      <echo level="warning"> You are using JDK7 for this build.
+-        While this will be able to build most of Scala, it will not build the Swing project.
+-        You will be unable to create a distribution.
+-      </echo>
+-    </then></if>
+-
+     <!-- Allow this to be overridden simply -->
+     <property name="sbt.latest.version"    value="0.12.2"/>
+ 
+@@ -1195,7 +1188,7 @@
+   <target name="quick.partest"    depends="quick.scalap, quick.comp, asm.done">
+     <staged-build with="locker"   stage="quick" project="partest" version="partest"/> </target>
+ 
+-  <target name="quick.swing"      depends="quick.actors, quick.lib" if="has.java6">
++  <target name="quick.swing"      depends="quick.actors, quick.lib">
+     <staged-build with="locker"   stage="quick" project="swing"/> </target>
+ 
+   <target name="quick.plugins"    depends="quick.comp">
+@@ -1246,7 +1239,7 @@
+     <staged-pack project="library"/></target>
+ 
+   <target name="pack.actors"  depends="quick.lib">                <staged-pack project="actors"/> </target>
+-  <target name="pack.swing" if="has.java6" depends="quick.swing"> <staged-pack project="swing"/> </target>
++  <target name="pack.swing" depends="quick.swing"> <staged-pack project="swing"/> </target>
+   <target name="pack.reflect" depends="quick.reflect">            <staged-pack project="reflect"/> </target>
+ 
+   <target name="pack.comp"    depends="quick.comp, asm.done">
+@@ -1393,11 +1386,9 @@
+       <make-bundle name="scala-reflect" version="${osgi.version.number}" />
+       <make-bundle name="scala-compiler" version="${osgi.version.number}" />
+       <make-plugin-bundle name="continuations" version="${osgi.version.number}" />
++      <make-bundle name="scala-swing" version="${osgi.version.number}"/>
+       <touch file="${build-osgi.dir}/bundles.complete" verbose="no"/>
+ 
+-      <if><isset property="has.java6"/><then>
+-        <make-bundle name="scala-swing" version="${osgi.version.number}"/></then>
+-      </if>
+       <stopwatch name="osgi.bundle.timer" action="total"/></then>
+     </if>
+   </target>
 --- a/src/swing/scala/swing/ListView.scala
 +++ b/src/swing/scala/swing/ListView.scala
-@@ -1,6 +1,6 @@
- /*                     __                                               *\
- **     ________ ___   / /  ___     Scala API                            **
--**    / __/ __// _ | / /  / _ |    (c) 2007-2011, LAMP/EPFL             **
-+**    / __/ __// _ | / /  / _ |    (c) 2007-2013, LAMP/EPFL             **
- **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
- ** /____/\___/_/ |_/____/_/ | |                                         **
- **                          |/                                          **
-@@ -24,21 +24,21 @@
+@@ -24,18 +24,18 @@
      val MultiInterval = Value(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
    }
  
@@ -106,15 +135,11 @@ Forwarded: not-needed
       */
 -  	class Wrapped[A](override val peer: ListCellRenderer) extends Renderer[A] {
 -  	  def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int) = {
-+        class Wrapped[A](override val peer: ListCellRenderer[A]) extends Renderer[A] {
-+          def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int) = {
++  	class Wrapped[A](override val peer: ListCellRenderer[A]) extends Renderer[A] {
++  	  def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int) = {
          Component.wrap(peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused).asInstanceOf[JComponent])
        }
--  	}
-+	}
- 
-     /**
-      * Returns a renderer for items of type <code>A</code>. The given function
+   	}
 @@ -55,8 +55,8 @@
       * </code>
       */
@@ -188,7 +213,7 @@ Forwarded: not-needed
    def listData: Seq[A] = peer.getModel match {
 -    case model: ModelWrapper => model.items
 -    case model @ _ => new Seq[A] { selfSeq =>
-+    case model: ModelWrapper[a] => model.items
++    case model: ModelWrapper[A] => model.items
 +    case model => new Seq[A] { selfSeq =>
       def length = model.getSize
       def iterator = new Iterator[A] {
@@ -209,34 +234,7 @@ Forwarded: not-needed
        def getSize = items.size
      })
    }
-@@ -195,25 +195,12 @@
-     object indices extends Indices(peer.getSelectedIndices) {
-       def -=(n: Int): this.type = { peer.removeSelectionInterval(n,n); this }
-       def +=(n: Int): this.type = { peer.addSelectionInterval(n,n); this }
--      @deprecated("Use ListView.selection.leadIndex", "2.8.0")
--      def leadIndex: Int = peer.getSelectionModel.getLeadSelectionIndex
--      @deprecated("Use ListView.selection.anchorIndex", "2.8.0")
--      def anchorIndex: Int = peer.getSelectionModel.getAnchorSelectionIndex
-     }
- 
--    @deprecated("Use ListView.selectIndices", "2.8.0")
--    def selectIndices(ind: Int*) = peer.setSelectedIndices(ind.toArray)
--
-     /**
-      * The currently selected items.
-      */
--    object items extends scala.collection.SeqProxy[A] {
--      def self = peer.getSelectedValues.map(_.asInstanceOf[A])
--      @deprecated("Use ListView.selection.leadIndex", "2.8.0")
--      def leadIndex: Int = peer.getSelectionModel.getLeadSelectionIndex
--      @deprecated("Use ListView.selection.anchorIndex", "2.8.0")
--      def anchorIndex: Int = peer.getSelectionModel.getAnchorSelectionIndex
--    }
-+    lazy val items = peer.getSelectedValues.map(_.asInstanceOf[A])
- 
-     def intervalMode: IntervalMode.Value = IntervalMode(peer.getSelectionModel.getSelectionMode)
-     def intervalMode_=(m: IntervalMode.Value) { peer.getSelectionModel.setSelectionMode(m.id) }
-@@ -227,7 +214,7 @@
+@@ -216,7 +216,7 @@
      def adjusting = peer.getSelectionModel.getValueIsAdjusting
    }
  
@@ -245,15 +243,3 @@ Forwarded: not-needed
    def renderer_=(r: ListView.Renderer[A]) { peer.setCellRenderer(r.peer) }
  
    def fixedCellWidth = peer.getFixedCellWidth
-@@ -239,6 +226,11 @@
-   def prototypeCellValue: A = peer.getPrototypeCellValue.asInstanceOf[A]
-   def prototypeCellValue_=(a: A) { peer.setPrototypeCellValue(a) }
- 
-+  def visibleRowCount = peer.getVisibleRowCount
-+  def visibleRowCount_=(n: Int) = peer.setVisibleRowCount(n)
-+
-+  def ensureIndexIsVisible(idx: Int) = peer.ensureIndexIsVisible(idx)
-+
-   def selectionForeground: Color = peer.getSelectionForeground
-   def selectionForeground_=(c: Color) = peer.setSelectionForeground(c)
-   def selectionBackground: Color = peer.getSelectionBackground
diff --git a/debian/patches/remove-non-ascii-ftbfs.patch b/debian/patches/remove-non-ascii-ftbfs.patch
index 7f4ef77..2989521 100644
--- a/debian/patches/remove-non-ascii-ftbfs.patch
+++ b/debian/patches/remove-non-ascii-ftbfs.patch
@@ -9,13 +9,14 @@
   * @since 2.0
   */
  public class UnixTerminal
-@@ -245,4 +245,4 @@
+@@ -245,4 +245,5 @@
              return codes.get((short) code);
          }
      }
 -}
 \ No newline at end of file
 +}
++
 --- a/src/jline/src/main/java/scala/tools/jline/internal/TerminalLineSettings.java
 +++ b/src/jline/src/main/java/scala/tools/jline/internal/TerminalLineSettings.java
 @@ -22,7 +22,7 @@
@@ -27,13 +28,14 @@
   * @since 2.0
   */
  public final class TerminalLineSettings
-@@ -214,4 +214,4 @@
+@@ -214,4 +214,5 @@
              }
          }
      }
 -}
 \ No newline at end of file
 +}
++
 --- a/src/jline/src/test/java/scala/tools/jline/internal/TerminalLineSettingsTest.java
 +++ b/src/jline/src/test/java/scala/tools/jline/internal/TerminalLineSettingsTest.java
 @@ -8,7 +8,7 @@
@@ -45,10 +47,11 @@
   */
  public class TerminalLineSettingsTest
  {
-@@ -143,4 +143,4 @@
+@@ -143,4 +143,5 @@
          assertEquals(32, settings.getProperty("rows", freeBsdSttySample));
      }
  
 -}
 \ No newline at end of file
 +}
++

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:42 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:42 +0000
Subject: [Pkg-scala-commits] [scala] 11/15: Update the clean target
In-Reply-To: <20140423213130.24448.39574@moszumanska.debian.org>
References: <20140423213130.24448.39574@moszumanska.debian.org>
Message-ID: <E1Wd4la-0006Qi-CW@moszumanska.debian.org>

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

mehdi pushed a commit to branch master
in repository scala.

commit 3c80ce6bc3ddb7630f4214b8924f61d1b69da940
Author: Lucas Satabin <lucas.satabin at gnieh.org>
Date:   Mon Mar 31 21:34:39 2014 +0200

    Update the clean target
    
    distributions are generated in `dists` and not in `dist` anymore
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index cee25e5..dcd6564 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ override_dh_auto_build:
 	done
 
 override_dh_auto_clean:
-	rm -rf build dist
+	rm -rf build dists
 
 override_dh_compress:
 	dh_compress -X.js -X.scala

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:42 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:42 +0000
Subject: [Pkg-scala-commits] [scala] 12/15: Update paths of elements to
	install
In-Reply-To: <20140423213130.24448.39574@moszumanska.debian.org>
References: <20140423213130.24448.39574@moszumanska.debian.org>
Message-ID: <E1Wd4la-0006Qw-Gl@moszumanska.debian.org>

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

mehdi pushed a commit to branch master
in repository scala.

commit c5e4b518b4acd4c8be0658b0e9fc2695ab88b2c7
Author: Lucas Satabin <lucas.satabin at gnieh.org>
Date:   Mon Mar 31 21:35:07 2014 +0200

    Update paths of elements to install
---
 .../0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch  | 2 +-
 debian/scala-doc.install                                             | 5 ++---
 debian/scala-library.jlibs                                           | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch b/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
index 87601f1..ea84b6f 100644
--- a/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
+++ b/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
@@ -48,7 +48,7 @@ Subject: Adapt SCALA_HOME and TOOL_CLASSPATH to the package layout
 -        fi
 -    done
 -fi
-+TOOL_CLASSPATH="$SCALA_HOME/scala-compiler.jar:$SCALA_HOME/scala-library.jar:$SCALA_HOME/scalap.jar:$SCALA_HOME/scala/jline.jar:$SCALA_HOME/jansi.jar"
++TOOL_CLASSPATH="$SCALA_HOME/scala-compiler.jar:$SCALA_HOME/scala-library.jar:$SCALA_HOME/scala-reflect.jar:$SCALA_HOME/scalap.jar:$SCALA_HOME/scala/jline.jar:$SCALA_HOME/jansi.jar"
  
  if [[ -n "$cygwin" ]]; then
      if [[ "$OS" = "Windows_NT" ]] && cygpath -m .>/dev/null 2>/dev/null ; then
diff --git a/debian/scala-doc.install b/debian/scala-doc.install
index 7d323bf..d58f493 100644
--- a/debian/scala-doc.install
+++ b/debian/scala-doc.install
@@ -1,3 +1,2 @@
-dists/latest/doc/scala-devel-docs/api/*		usr/share/doc/scala-doc/html/
-dists/latest/doc/scala-devel-docs/examples/*	usr/share/doc/scala-doc/examples/
-dists/latest/doc/scala-devel-docs/tools/*	usr/share/doc/scala-doc/tools/
+dists/latest/api/*		usr/share/doc/scala-doc/html/
+dists/latest/doc/tools/*	usr/share/doc/scala-doc/tools/
diff --git a/debian/scala-library.jlibs b/debian/scala-library.jlibs
index 0c2f90d..1ff855e 100644
--- a/debian/scala-library.jlibs
+++ b/debian/scala-library.jlibs
@@ -1,6 +1,5 @@
 dists/latest/lib/scala-library.jar
-dists/latest/lib/scala-dbc.jar
+dists/latest/lib/scala-actors.jar
+dists/latest/lib/scala-reflect.jar
 dists/latest/lib/scala-swing.jar
 dists/latest/lib/scala-partest.jar
-dists/latest/lib/scalacheck.jar
-dists/latest/lib/scala-partest.jar

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:42 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:42 +0000
Subject: [Pkg-scala-commits] [scala] 13/15: Update watch file
In-Reply-To: <20140423213130.24448.39574@moszumanska.debian.org>
References: <20140423213130.24448.39574@moszumanska.debian.org>
Message-ID: <E1Wd4la-0006R8-Jw@moszumanska.debian.org>

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

mehdi pushed a commit to branch master
in repository scala.

commit 3ab75d93e054e85ba2ba3cb873e0e7f9a3e60be1
Author: Lucas Satabin <lucas.satabin at gnieh.org>
Date:   Wed Apr 9 20:56:59 2014 +0200

    Update watch file
---
 debian/watch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/watch b/debian/watch
index 4ea170b..c820c9f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts="dversionmangle=s/\+dfsg[\.\d]*$//" \
-http://www.scala-lang.org/downloads \
-	/downloads/distrib/files/scala-sources-(.*)\.tgz
+opts="filenamemangle=s/(?:.*)?v(\d(\.\d+)*)\.tar\.gz/scala-$1.tar.gz/" \
+  https://github.com/scala/scala/tags (?:.*/)?v(\d(\.\d+)*)\.tar\.gz

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:42 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:42 +0000
Subject: [Pkg-scala-commits] [scala] 14/15: Update changelog
In-Reply-To: <20140423213130.24448.39574@moszumanska.debian.org>
References: <20140423213130.24448.39574@moszumanska.debian.org>
Message-ID: <E1Wd4la-0006RM-NB@moszumanska.debian.org>

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

mehdi pushed a commit to branch master
in repository scala.

commit 1a5fac921d5dfff577c9e5c9248c5d0deefadbfb
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Apr 23 19:37:01 2014 +0200

    Update changelog
---
 debian/changelog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index de13888..ead7151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,17 @@
 scala (2.10.4+dfsg-1) UNRELEASED; urgency=low
 
+  [ Mehdi Dogguy ]
   * New upstream release (Closes: #744278).
 
+  [ Lucas Satabin ]
+  * Update patches
+  * Update the clean target
+  * Update paths of elements to install
+  * Update watch file
+
+  [ Frank S. Thomas ]
+  * Remove myself from Uploaders.
+
  -- Mehdi Dogguy <mehdi at debian.org>  Wed, 23 Apr 2014 19:23:33 +0200
 
 scala (2.9.2+dfsg-2) unstable; urgency=low

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:42 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:42 +0000
Subject: [Pkg-scala-commits] [scala] 15/15: test fastdist-opt
In-Reply-To: <20140423213130.24448.39574@moszumanska.debian.org>
References: <20140423213130.24448.39574@moszumanska.debian.org>
Message-ID: <E1Wd4la-0006Rb-R9@moszumanska.debian.org>

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

mehdi pushed a commit to branch master
in repository scala.

commit 371f20ffc2ea300d9e1ff53b791c978f77e4066d
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Apr 23 20:32:52 2014 +0200

    test fastdist-opt
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index dcd6564..89e09bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ override_dh_auto_build:
 	# Build Jline
 	ant -f debian/build-jline.xml -propertyfile debian/ant-jline.properties
 	# Build Scala
-	ANT_OPTS="-Xmx1024M -Xss64M" ant -Dversion.number=$(BUNDLE_VERSION) fastdist
+	ANT_OPTS="-Xmx1024M -Xss64M" ant -Dversion.number=$(BUNDLE_VERSION) fastdist-opt
 
 	for file in scala scala-library; do \
 		sed "s/@VERSION@/$(BUNDLE_VERSION)/" debian/$${file}.pom.xml.in > debian/$${file}.pom.xml; \

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:42 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:42 +0000
Subject: [Pkg-scala-commits] [scala] branch pristine-tar updated (ccf7bd2 ->
	e430c81)
Message-ID: <20140423213130.24448.55189@moszumanska.debian.org>

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

mehdi pushed a change to branch pristine-tar
in repository scala.

      from  ccf7bd2   pristine-tar data for scala_2.9.2+dfsg.orig.tar.gz
       new  0dbce33   pristine-tar data for scala_2.10.1+dfsg.orig.tar.gz
       new  9bd04d9   pristine-tar data for scala_2.10.2+dfsg.orig.tar.gz
       new  8a768d9   pristine-tar data for scala_2.10.3+dfsg.orig.tar.gz
       new  e430c81   pristine-tar data for scala_2.10.4+dfsg.orig.tar.gz

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 scala_2.10.1+dfsg.orig.tar.gz.delta | Bin 0 -> 279569 bytes
 scala_2.10.1+dfsg.orig.tar.gz.id    |   1 +
 scala_2.10.2+dfsg.orig.tar.gz.delta | Bin 0 -> 287343 bytes
 scala_2.10.2+dfsg.orig.tar.gz.id    |   1 +
 scala_2.10.3+dfsg.orig.tar.gz.delta | Bin 0 -> 293692 bytes
 scala_2.10.3+dfsg.orig.tar.gz.id    |   1 +
 scala_2.10.4+dfsg.orig.tar.gz.delta | Bin 0 -> 291080 bytes
 scala_2.10.4+dfsg.orig.tar.gz.id    |   1 +
 8 files changed, 4 insertions(+)
 create mode 100644 scala_2.10.1+dfsg.orig.tar.gz.delta
 create mode 100644 scala_2.10.1+dfsg.orig.tar.gz.id
 create mode 100644 scala_2.10.2+dfsg.orig.tar.gz.delta
 create mode 100644 scala_2.10.2+dfsg.orig.tar.gz.id
 create mode 100644 scala_2.10.3+dfsg.orig.tar.gz.delta
 create mode 100644 scala_2.10.3+dfsg.orig.tar.gz.id
 create mode 100644 scala_2.10.4+dfsg.orig.tar.gz.delta
 create mode 100644 scala_2.10.4+dfsg.orig.tar.gz.id

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:43 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:43 +0000
Subject: [Pkg-scala-commits] [scala] 01/04: pristine-tar data for
	scala_2.10.1+dfsg.orig.tar.gz
In-Reply-To: <20140423213130.24448.55189@moszumanska.debian.org>
References: <20140423213130.24448.55189@moszumanska.debian.org>
Message-ID: <E1Wd4lb-0006S7-3T@moszumanska.debian.org>

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

mehdi pushed a commit to branch pristine-tar
in repository scala.

commit 0dbce33ecb68901b7d4d8385671ebe1bdeec6337
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Apr 23 19:14:15 2014 +0200

    pristine-tar data for scala_2.10.1+dfsg.orig.tar.gz
---
 scala_2.10.1+dfsg.orig.tar.gz.delta | Bin 0 -> 279569 bytes
 scala_2.10.1+dfsg.orig.tar.gz.id    |   1 +
 2 files changed, 1 insertion(+)

diff --git a/scala_2.10.1+dfsg.orig.tar.gz.delta b/scala_2.10.1+dfsg.orig.tar.gz.delta
new file mode 100644
index 0000000..089e538
Binary files /dev/null and b/scala_2.10.1+dfsg.orig.tar.gz.delta differ
diff --git a/scala_2.10.1+dfsg.orig.tar.gz.id b/scala_2.10.1+dfsg.orig.tar.gz.id
new file mode 100644
index 0000000..b3bc0a3
--- /dev/null
+++ b/scala_2.10.1+dfsg.orig.tar.gz.id
@@ -0,0 +1 @@
+e42fe35c409d64dad50f78c7d905802875b98358

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:43 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:43 +0000
Subject: [Pkg-scala-commits] [scala] 02/04: pristine-tar data for
	scala_2.10.2+dfsg.orig.tar.gz
In-Reply-To: <20140423213130.24448.55189@moszumanska.debian.org>
References: <20140423213130.24448.55189@moszumanska.debian.org>
Message-ID: <E1Wd4lb-0006SH-89@moszumanska.debian.org>

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

mehdi pushed a commit to branch pristine-tar
in repository scala.

commit 9bd04d95cdbf94f3ba3dcb8202dcc67e7ba0b2da
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Apr 23 19:14:38 2014 +0200

    pristine-tar data for scala_2.10.2+dfsg.orig.tar.gz
---
 scala_2.10.2+dfsg.orig.tar.gz.delta | Bin 0 -> 287343 bytes
 scala_2.10.2+dfsg.orig.tar.gz.id    |   1 +
 2 files changed, 1 insertion(+)

diff --git a/scala_2.10.2+dfsg.orig.tar.gz.delta b/scala_2.10.2+dfsg.orig.tar.gz.delta
new file mode 100644
index 0000000..d251e7f
Binary files /dev/null and b/scala_2.10.2+dfsg.orig.tar.gz.delta differ
diff --git a/scala_2.10.2+dfsg.orig.tar.gz.id b/scala_2.10.2+dfsg.orig.tar.gz.id
new file mode 100644
index 0000000..1b57e3a
--- /dev/null
+++ b/scala_2.10.2+dfsg.orig.tar.gz.id
@@ -0,0 +1 @@
+d54cd246cc8a4596d11b4bfb3b6a5fdb38700d3f

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:43 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:43 +0000
Subject: [Pkg-scala-commits] [scala] 03/04: pristine-tar data for
	scala_2.10.3+dfsg.orig.tar.gz
In-Reply-To: <20140423213130.24448.55189@moszumanska.debian.org>
References: <20140423213130.24448.55189@moszumanska.debian.org>
Message-ID: <E1Wd4lb-0006SU-Ch@moszumanska.debian.org>

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

mehdi pushed a commit to branch pristine-tar
in repository scala.

commit 8a768d95b2c85e72c726419bd3ad8b010fbeb37e
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Apr 23 19:14:57 2014 +0200

    pristine-tar data for scala_2.10.3+dfsg.orig.tar.gz
---
 scala_2.10.3+dfsg.orig.tar.gz.delta | Bin 0 -> 293692 bytes
 scala_2.10.3+dfsg.orig.tar.gz.id    |   1 +
 2 files changed, 1 insertion(+)

diff --git a/scala_2.10.3+dfsg.orig.tar.gz.delta b/scala_2.10.3+dfsg.orig.tar.gz.delta
new file mode 100644
index 0000000..7b88bca
Binary files /dev/null and b/scala_2.10.3+dfsg.orig.tar.gz.delta differ
diff --git a/scala_2.10.3+dfsg.orig.tar.gz.id b/scala_2.10.3+dfsg.orig.tar.gz.id
new file mode 100644
index 0000000..cd273c3
--- /dev/null
+++ b/scala_2.10.3+dfsg.orig.tar.gz.id
@@ -0,0 +1 @@
+bab74cb1c81b6b9d1ea034ac3187571e74a76e1e

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:31:43 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:31:43 +0000
Subject: [Pkg-scala-commits] [scala] 04/04: pristine-tar data for
	scala_2.10.4+dfsg.orig.tar.gz
In-Reply-To: <20140423213130.24448.55189@moszumanska.debian.org>
References: <20140423213130.24448.55189@moszumanska.debian.org>
Message-ID: <E1Wd4lb-0006Sh-Gh@moszumanska.debian.org>

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

mehdi pushed a commit to branch pristine-tar
in repository scala.

commit e430c8107ba0035b13d54e4fd6c89b009ceed5bc
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Apr 23 19:19:24 2014 +0200

    pristine-tar data for scala_2.10.4+dfsg.orig.tar.gz
---
 scala_2.10.4+dfsg.orig.tar.gz.delta | Bin 0 -> 291080 bytes
 scala_2.10.4+dfsg.orig.tar.gz.id    |   1 +
 2 files changed, 1 insertion(+)

diff --git a/scala_2.10.4+dfsg.orig.tar.gz.delta b/scala_2.10.4+dfsg.orig.tar.gz.delta
new file mode 100644
index 0000000..01d1f8e
Binary files /dev/null and b/scala_2.10.4+dfsg.orig.tar.gz.delta differ
diff --git a/scala_2.10.4+dfsg.orig.tar.gz.id b/scala_2.10.4+dfsg.orig.tar.gz.id
new file mode 100644
index 0000000..1a6cf03
--- /dev/null
+++ b/scala_2.10.4+dfsg.orig.tar.gz.id
@@ -0,0 +1 @@
+1587df557bb405d1b79a9ab9c197c5bdea87f4e2

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:32:49 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:32:49 +0000
Subject: [Pkg-scala-commits] [scala] annotated tag upstream/2.10.1+dfsg
	created (now 4fdbc19)
Message-ID: <20140423213249.27976.142@moszumanska.debian.org>

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

mehdi pushed a change to annotated tag upstream/2.10.1+dfsg
in repository scala.

        at  4fdbc19   (tag)
   tagging  6c6d055cb925b346d698d816d16ee05adb2fda32 (commit)
  replaces  upstream/2.9.2+dfsg
 tagged by  Mehdi Dogguy
        on  Wed Apr 23 19:14:15 2014 +0200

- Log -----------------------------------------------------------------
Upstream version 2.10.1+dfsg

Mehdi Dogguy (1):
      Imported Upstream version 2.10.1+dfsg

-----------------------------------------------------------------------

No new revisions were added by this update.

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:32:49 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:32:49 +0000
Subject: [Pkg-scala-commits] [scala] annotated tag upstream/2.10.2+dfsg
	created (now ecc9ae2)
Message-ID: <20140423213249.27976.25487@moszumanska.debian.org>

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

mehdi pushed a change to annotated tag upstream/2.10.2+dfsg
in repository scala.

        at  ecc9ae2   (tag)
   tagging  965d8b79f81cd7aba7785ce570be1bb4a7684aac (commit)
  replaces  upstream/2.10.1+dfsg
 tagged by  Mehdi Dogguy
        on  Wed Apr 23 19:14:39 2014 +0200

- Log -----------------------------------------------------------------
Upstream version 2.10.2+dfsg

Mehdi Dogguy (1):
      Imported Upstream version 2.10.2+dfsg

-----------------------------------------------------------------------

No new revisions were added by this update.

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:32:49 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:32:49 +0000
Subject: [Pkg-scala-commits] [scala] annotated tag upstream/2.10.3+dfsg
	created (now 9c8c8be)
Message-ID: <20140423213249.27976.95787@moszumanska.debian.org>

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

mehdi pushed a change to annotated tag upstream/2.10.3+dfsg
in repository scala.

        at  9c8c8be   (tag)
   tagging  d1c5a3449134448f8edff3780222014d9da5b703 (commit)
  replaces  upstream/2.10.2+dfsg
 tagged by  Mehdi Dogguy
        on  Wed Apr 23 19:14:57 2014 +0200

- Log -----------------------------------------------------------------
Upstream version 2.10.3+dfsg

Mehdi Dogguy (1):
      Imported Upstream version 2.10.3+dfsg

-----------------------------------------------------------------------

No new revisions were added by this update.

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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:32:49 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:32:49 +0000
Subject: [Pkg-scala-commits] [scala] annotated tag upstream/2.10.4 created
	(now 3a5c3c2)
Message-ID: <20140423213249.27976.25391@moszumanska.debian.org>

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

mehdi pushed a change to annotated tag upstream/2.10.4
in repository scala.

        at  3a5c3c2   (tag)
   tagging  1b970a4a30a2bae3aff4a7ff7e8b5e0d271191b7 (commit)
  replaces  upstream/2.9.2+dfsg
 tagged by  Lucas Satabin
        on  Wed Apr 9 20:50:59 2014 +0200

- Log -----------------------------------------------------------------
Upstream version 2.10.4

Lucas Satabin (1):
      Imported Upstream version 2.10.4

-----------------------------------------------------------------------

This annotated tag includes the following new commits:

       new  1b970a4   Imported Upstream version 2.10.4

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


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


From mehdi at moszumanska.debian.org  Wed Apr 23 21:32:56 2014
From: mehdi at moszumanska.debian.org (Mehdi Dogguy)
Date: Wed, 23 Apr 2014 21:32:56 +0000
Subject: [Pkg-scala-commits] [scala] annotated tag upstream/2.10.4+dfsg
	created (now 738137b)
Message-ID: <20140423213249.27976.33507@moszumanska.debian.org>

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

mehdi pushed a change to annotated tag upstream/2.10.4+dfsg
in repository scala.

        at  738137b   (tag)
   tagging  fe0c68f36075f8be1f3b7ef2e09353bdd61403cd (commit)
  replaces  upstream/2.10.3+dfsg
 tagged by  Mehdi Dogguy
        on  Wed Apr 23 19:19:25 2014 +0200

- Log -----------------------------------------------------------------
Upstream version 2.10.4+dfsg

Mehdi Dogguy (1):
      Imported Upstream version 2.10.4+dfsg

-----------------------------------------------------------------------

No new revisions were added by this update.

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