Fixing an incomplete svnmerge; second, merge ag...

Fixing an incomplete svnmerge; second, merge again from trunk.

Author: Antonio Cunei

build.xml

@@ -375,7 +375,7 @@ LOCAL REFERENCE BUILD (LOCKER)
         <include name="**/*.properties"/>
         <include name="**/*.swf"/>
         <include name="**/*.png"/>
-
+        <include name="**/*.gif"/>
       </fileset>
     </copy>
     <touch file="${build-locker.dir}/compiler.complete" verbose="no"/>
@@ -590,6 +590,7 @@ QUICK BUILD (QUICK)
         <include name="**/*.properties"/>
         <include name="**/*.swf"/>
         <include name="**/*.png"/>
+        <include name="**/*.gif"/>        
       </fileset>
     </copy>
     <touch file="${build-quick.dir}/compiler.complete" verbose="no"/>
@@ -1101,6 +1102,7 @@ BOOTSTRAPPING BUILD (STRAP)
         <include name="**/*.properties"/>
         <include name="**/*.swf"/>
         <include name="**/*.png"/>
+        <include name="**/*.gif"/>        
        </fileset>
     </copy>
     <touch file="${build-strap.dir}/compiler.complete" verbose="no"/>

lib/jline.jar.desired.sha1

@@ -1 +1 @@
-32f4eb98f8135b0d565e4e7aa72550f34fc4c133 ?jline.jar
+115e0f58e2ffa089c083c466b0161216dd4c916e ?jline.jar

lib/msil.jar.desired.sha1

@@ -1 +1 @@
-411bfee5f3b2b6bae5f6ac06f84b4f4624370492 ?msil.jar
+58f64cd00399c724e7d526e5bdcbce3e2b79f78b ?msil.jar

lib/scala-compiler.jar.desired.sha1

@@ -1 +1 @@
-4b2f54712dab89071f1909f07367673635beffda ?scala-compiler.jar
+e0382dfa2712e567b49f5826ac50eae59cf03cb3 ?scala-compiler.jar

lib/scala-library-src.jar.desired.sha1

@@ -1 +1 @@
-f015b1389419b997796a3a9814bedac6343f108e ?scala-library-src.jar
+5ad90238f4fc57e8147fb69496c68d02ca073ca0 ?scala-library-src.jar

lib/scala-library.jar.desired.sha1

@@ -1 +1 @@
-af0438e6911f357a2af0d068482baa1f526dbac0 ?scala-library.jar
+678ada3690dd149c2bd302407e315a74de0bfd42 ?scala-library.jar

src/actors/scala/actors/Debug.scala

@@ -43,5 +43,5 @@ private[actors] class Logger(tag: String) {
     if (lev > 0) b
 }
 
-@deprecated("this class is going to be removed in a future release")
+@deprecated("this class is going to be removed in a future release", "2.7.7")
 class Debug(tag: String) extends Logger(tag) {}

src/actors/scala/actors/Future.scala

@@ -27,12 +27,12 @@ abstract class Future[+T] extends Responder[T] with Function0[T] {
   private[actors] var fvalue: Option[Any] = None
   private[actors] def fvalueTyped = fvalue.get.asInstanceOf[T]
 
-  @deprecated("this member is going to be removed in a future release")
+  @deprecated("this member is going to be removed in a future release", "2.8.0")
   def ch: InputChannel[Any] = inputChannel
 
-  @deprecated("this member is going to be removed in a future release")
+  @deprecated("this member is going to be removed in a future release", "2.8.0")
   protected def value: Option[Any] = fvalue
-  @deprecated("this member is going to be removed in a future release")
+  @deprecated("this member is going to be removed in a future release", "2.8.0")
   protected def value_=(x: Option[Any]) { fvalue = x }
 
   /** Tests whether the future's result is available.

src/actors/scala/actors/IScheduler.scala

@@ -67,16 +67,16 @@ trait IScheduler {
 
   def managedBlock(blocker: scala.concurrent.ManagedBlocker): Unit
 
-  @deprecated("this member is going to be removed in a future release")
+  @deprecated("this member is going to be removed in a future release", "2.7.7")
   def tick(a: Actor) {}
 
-  @deprecated("this member is going to be removed in a future release")
+  @deprecated("this member is going to be removed in a future release", "2.7.7")
   def onLockup(handler: () => Unit) {}
 
-  @deprecated("this member is going to be removed in a future release")
+  @deprecated("this member is going to be removed in a future release", "2.7.7")
   def onLockup(millis: Int)(handler: () => Unit) {}
 
-  @deprecated("this member is going to be removed in a future release")
+  @deprecated("this member is going to be removed in a future release", "2.7.7")
   def printActorDump {}
 
 }

src/actors/scala/actors/MessageQueue.scala

@@ -16,7 +16,7 @@ package scala.actors
  * @author Philipp Haller
  */
 @SerialVersionUID(7124278808020037465L)
-@deprecated("this class is going to be removed in a future release")
+@deprecated("this class is going to be removed in a future release", "2.7.7")
 class MessageQueueElement(msg: Any, session: OutputChannel[Any], next: MessageQueueElement) extends MQueueElement[Any](msg, session, next) with Serializable {
   def this() = this(null, null, null)
   def this(msg: Any, session: OutputChannel[Any]) = this(msg, session, null)
@@ -36,7 +36,7 @@ private[actors] class MQueueElement[Msg >: Null](val msg: Msg, val session: Outp
  * @author Philipp Haller
  */
 @SerialVersionUID(2168935872884095767L)
-@deprecated("this class is going to be removed in a future release")
+@deprecated("this class is going to be removed in a future release", "2.7.7")
 class MessageQueue(label: String) extends MQueue[Any](label) with Serializable
 
 private[actors] class MQueue[Msg >: Null](protected val label: String) {