Undid r17875 (scala#1660) in 2.7.x branch, updated v...

Undid r17875 (scala#1660) in 2.7.x branch, updated version numbers to 2.7.5.

Author: Antonio Cunei

META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Scala Distribution
 Bundle-SymbolicName: scala.tools.nsc;singleton:=true
-Bundle-Version: 2.7.4.final
+Bundle-Version: 2.7.5.final
 Eclipse-LazyStart: true
 Bundle-ClassPath: 
  .,

build.number

@@ -1,5 +1,5 @@
 #Tue Sep 11 19:21:09 CEST 2007
 version.minor=7
-version.patch=4
+version.patch=5
 version.suffix=final
 version.major=2

build.xml

@@ -627,8 +627,8 @@ PACKED QUICK BUILD (PACK)
       <!-- filemode / dirmode: see trac ticket #1294 -->
       <zipfileset dirmode="755" filemode="644" src="${fjbg.jar}"/>
       <zipfileset dirmode="755" filemode="644" src="${msil.jar}"/>
+      <zipfileset dirmode="755" filemode="644" src="${jline.jar}"/>
     </jar>
-    <copy file="${jline.jar}" toDir="${build-pack.dir}/lib"/>
   </target>
 
   <target name="pack.pre-partest" depends="pack.comp">
@@ -657,7 +657,6 @@ PACKED QUICK BUILD (PACK)
       <classpath>
         <pathelement location="${build-pack.dir}/lib/scala-library.jar"/>
         <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/>
-        <pathelement location="${build-pack.dir}/lib/jline.jar"/>
       </classpath>
     </taskdef>
     <mkdir dir="${build-pack.dir}/bin"/>

src/build/pack.xml

@@ -97,7 +97,7 @@ MAIN DISTRIBUTION SBAZ
       <binset
           dir="${dist.dir}/bin"
           includes="scala,scala.bat,scalac,scalac.bat,scaladoc,scaladoc.bat,fsc,fsc.bat"/>
-      <libset dir="${dist.dir}/lib" includes="scala-compiler.jar,jline.jar"/>
+      <libset dir="${dist.dir}/lib" includes="scala-compiler.jar"/>
       <manset dir="${dist.dir}/man" includes="**"/>
       <srcset dir="${dist.dir}/src" includes="scala-compiler-src.jar"/>
     </sbaz>

src/compiler/scala/tools/nsc/doc/script.js

@@ -40,7 +40,7 @@ function get_api_root(key) {
   return root;
 }
 
-var scala_src_root = 'http://lampsvn.epfl.ch/trac/scala/browser/scala/tags/R_2_7_4_final/';
+var scala_src_root = 'http://lampsvn.epfl.ch/trac/scala/browser/scala/tags/R_2_7_5_final/';
 var lib_src_root = scala_src_root + 'src/library/';
 var comp_src_root = scala_src_root + 'src/compiler/';
 var actors_src_root = scala_src_root + 'src/actors/';