This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository scala-2.10.
commit 5ccbebf01f7399e409d20b48f3755de4e0a1b417 Author: Mehdi Dogguy <[email protected]> Date: Thu Sep 1 13:35:45 2011 +0200 Fix scala-doc in sid (Closes: #636870) --- debian/changelog | 7 ++++++- debian/control | 4 ++-- debian/rules | 2 +- debian/scala-doc.links | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6a46af0..74fd7b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,13 @@ scala (2.9.1.dfsg-1) UNRELEASED; urgency=low [ Mehdi Dogguy ] * New upstream release (Closes: #639960). + * Use upstream's copy of jquery library. Scala-doc uses jQuery 1.4 + and is not compatible with 1.6 (yet), which got uploaded recently. + (Closes: #636870). + - Remove links created to system jquery{,ui}.js files + - Remove dependencies of scala-doc on libjs-jquery{,ui}. - -- Mehdi Dogguy <[email protected]> Thu, 01 Sep 2011 11:43:02 +0200 + -- Mehdi Dogguy <[email protected]> Thu, 01 Sep 2011 13:33:03 +0200 scala (2.9.0.1.dfsg-1) unstable; urgency=low diff --git a/debian/control b/debian/control index ec91696..73e710f 100644 --- a/debian/control +++ b/debian/control @@ -51,8 +51,8 @@ Description: Scala standard library Package: scala-doc Architecture: all Depends: - libjs-jquery, - libjs-jquery-ui, +# libjs-jquery, +# libjs-jquery-ui, ${misc:Depends} Section: doc Description: Scala API documentation diff --git a/debian/rules b/debian/rules index 1fa0931..7d060d8 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ override_dh_auto_build: ANT_OPTS="-Xmx1024M -Xss64M" ant -Dversion.number=$(BUNDLE_VERSION) fastdist # Use jQuery from libjs-jquery{,ui} - find -name "jquery.js" -or -name "jquery-ui.js" -delete + #find -name "jquery.js" -or -name "jquery-ui.js" -delete override_dh_auto_clean: rm -rf build dist diff --git a/debian/scala-doc.links b/debian/scala-doc.links index 96bec76..9b6017e 100644 --- a/debian/scala-doc.links +++ b/debian/scala-doc.links @@ -1,2 +1,2 @@ -usr/share/javascript/jquery/jquery.js usr/share/doc/scala-doc/html/lib/jquery.js -usr/share/javascript/jquery-ui/jquery-ui.js usr/share/doc/scala-doc/html/lib/jquery-ui.js +#usr/share/javascript/jquery/jquery.js usr/share/doc/scala-doc/html/lib/jquery.js +#usr/share/javascript/jquery-ui/jquery-ui.js usr/share/doc/scala-doc/html/lib/jquery-ui.js -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
