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 1f6d6ae77f8b1649da78bcc1538313943b6dca17 Author: Mehdi Dogguy <[email protected]> Date: Fri Jun 24 14:29:20 2011 +0200 Make scala-doc depends on libjs-jquery{,ui}. --- debian/changelog | 3 ++- debian/control | 2 ++ debian/rules | 3 +++ debian/scala-doc.links | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 733357f..8ffe52c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ scala (2.9.0.1.dfsg-1) unstable; urgency=low * New upstream release (Closes: #631429) (LP: #782013). * Refresh patch. * Use Scala's provided JLine 2, instead of libjline-java. + * Make scala-doc depends on libjs-jquery{,ui}. [ Frank S. Thomas ] * Updated debian/copyright for Scala 2.9.0.1. @@ -11,7 +12,7 @@ scala (2.9.0.1.dfsg-1) unstable; urgency=low * Fix spelling error in changelog. * Remove copyright information about docs/android-examples. - -- Mehdi Dogguy <[email protected]> Fri, 24 Jun 2011 14:18:37 +0200 + -- Mehdi Dogguy <[email protected]> Fri, 24 Jun 2011 14:28:54 +0200 scala (2.8.1.dfsg-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 82b929e..5f0df42 100644 --- a/debian/control +++ b/debian/control @@ -49,6 +49,8 @@ Description: The Scala standard library Package: scala-doc Architecture: all Depends: + libjs-jquery, + libjs-jquery-ui, ${misc:Depends} Section: doc Description: The Scala API documentation diff --git a/debian/rules b/debian/rules index f08fbb0..1fa0931 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,9 @@ BUNDLE_VERSION=$(shell sed -n "s/Bundle-Version: //p" META-INF/MANIFEST.MF) 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 + override_dh_auto_clean: rm -rf build dist diff --git a/debian/scala-doc.links b/debian/scala-doc.links new file mode 100644 index 0000000..96bec76 --- /dev/null +++ b/debian/scala-doc.links @@ -0,0 +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 -- 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
