This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository scala.
commit 6c129663c8a9828150699af762e17a6880fb1089 Author: Emmanuel Bourg <[email protected]> Date: Fri Jun 5 23:39:44 2015 +0200 Replaced the minified JavaScript files with unobfuscated ones --- debian/changelog | 1 + debian/gbp.conf | 8 -------- debian/orig-tar.sh | 28 ++++++++++++++++++++++++++++ debian/watch | 2 +- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index dab0409..52c6ff8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ scala (2.10.4+dfsg-1) UNRELEASED; urgency=low [ Emmanuel Bourg ] * The package has been adopted by the Java Team (Closes: #754935) * Patched the build to avoid downloading libraries from the Internet + * Replaced the minified JavaScript files with unobfuscated ones * No longer build scala-partest.jar until diffutils is packaged or replaced * debian/watch: Fixed the versions matched (x.y.z instead of x.y.z..z) * debian/rules: Added the missing get-orig-source target (Closes: #724704) diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index 53b640a..0000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -pristine-tar = True -filter-pristine-tar = True -filter = [ - "docs/android-examples", - "lib/ant", - "lib/midpapi10.jar" - ] diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..33ec4ee --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,28 @@ +#!/bin/sh +set -e + +VERSION=$2 +DIR=scala-${VERSION} +TAR=../scala_${VERSION}.orig.tar.xz + +mkdir $DIR +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 + +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 + +XZ_OPT=--best tar -c -v -J -f $TAR \ + --exclude 'lib/ant' \ + $DIR +rm -Rf $DIR diff --git a/debian/watch b/debian/watch index 4c388d8..4ec34ef 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 opts="filenamemangle=s/(?:.*)?v(\d(\.\d+)*)\.tar\.gz/scala-$1.tar.gz/" \ - https://github.com/scala/scala/tags (?:.*/)?v(\d(?:\.\d+)*)\.tar\.gz + https://github.com/scala/scala/tags (?:.*/)?v(\d(?:\.\d+)*)\.tar\.gz debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
