[scala] 01/24: Adapted debian/orig-tar.sh for Scala 2.11

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository scala.

commit b77027d43b5e2fea6234724ce1d4d7d003eb2a54
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 11 13:10:44 2015 +0200

    Adapted debian/orig-tar.sh for Scala 2.11
---
 debian/changelog   |  1 +
 debian/orig-tar.sh | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 069b4ae..a2abdbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 scala (2.10.5-2) UNRELEASED; urgency=medium
 
   * The package has been adopted by the Java Team (Closes: #754935)
+  * Adapted debian/orig-tar.sh for Scala 2.11
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sat, 06 Jun 2015 01:07:04 +0200
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 33ec4ee..a2f2ebd 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -10,17 +10,20 @@ tar -xf $3 --strip-components=1 -C $DIR
 rm $3
 
 # Replace the minified JavaScript files
-rm $DIR/src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery.js
-rm $DIR/src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery-ui.js
-rm $DIR/src/compiler/scala/tools/nsc/doc/html/resource/lib/modernizr.custom.js
-rm $DIR/src/compiler/scala/tools/nsc/doc/html/resource/lib/raphael-min.js
-rm $DIR/src/compiler/scala/tools/nsc/doc/html/resource/lib/tools.tooltip.js
+JS_DIR=$DIR/src/scaladoc/scala/tools/nsc/doc/html/resource/lib
 
-wget http://code.jquery.com/jquery-1.8.2.js -O $DIR/src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery.js
-wget http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.0/jquery-ui.js -O $DIR/src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery-ui.js
-wget http://modernizr.com/downloads/modernizr-2.5.3.js -O $DIR/src/compiler/scala/tools/nsc/doc/html/resource/lib/modernizr.custom.js
-wget https://raw.githubusercontent.com/DmitryBaranovskiy/raphael/v2.1.0/raphael.js -O $DIR/src/compiler/scala/tools/nsc/doc/html/resource/lib/raphael-min.js
-wget https://raw.githubusercontent.com/hungryblank/octosquashes-pub/master/couch/src/js/01_tools.tooltip-1.1.3.js -O $DIR/src/compiler/scala/tools/nsc/doc/html/resource/lib/tools.tooltip.js
+rm $JS_DIR/jquery.js
+rm $JS_DIR/jquery-ui.js
+rm $JS_DIR/modernizr.custom.js
+rm $JS_DIR/raphael-min.js
+rm $JS_DIR/tools.tooltip.js
+rm $DIR/spec/public/highlight/highlight.pack.js
+
+wget http://code.jquery.com/jquery-1.8.2.js                                        -O $JS_DIR/jquery.js
+wget http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.0/jquery-ui.js              -O $JS_DIR/jquery-ui.js
+wget http://modernizr.com/downloads/modernizr-2.5.3.js                             -O $JS_DIR/modernizr.custom.js
+wget https://raw.githubusercontent.com/DmitryBaranovskiy/raphael/v2.1.0/raphael.js -O $JS_DIR/raphael-min.js
+wget https://raw.githubusercontent.com/hungryblank/octosquashes-pub/master/couch/src/js/01_tools.tooltip-1.1.3.js -O $JS_DIR/tools.tooltip.js
 
 XZ_OPT=--best tar -c -v -J -f $TAR \
     --exclude 'lib/ant' \

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