This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository scala.
commit 46de66e208abb035e53d4b502191d73c90d3d1ca Author: Emmanuel Bourg <[email protected]> Date: Fri Jun 19 13:13:42 2015 +0200 Install the documentation under /usr/share/doc/scala-2.11 --- debian/changelog | 1 + debian/scala-doc.doc-base | 6 +++--- debian/scala-doc.install | 4 ++-- debian/scala-doc.links | 7 +++++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8a66389..7af2ce0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ scala (2.11.6-2) UNRELEASED; urgency=medium * Added a /usr/share/scala link pointing to the default version * Added symlinks in /usr/share/java with the major Scala version (e.g. scala-library-2.11.jar) + * Install the documentation under /usr/share/doc/scala-2.11. * Removed the JRE dependency of scala-library * Build depend on scala (>= 2.11) * Install the Maven artifacts for scala-actors and scala-reflect diff --git a/debian/scala-doc.doc-base b/debian/scala-doc.doc-base index c7d7c73..fc7169b 100644 --- a/debian/scala-doc.doc-base +++ b/debian/scala-doc.doc-base @@ -1,9 +1,9 @@ Document: scala-doc -Title: Scala API Documentation +Title: Scala 2.11 API Documentation Author: The Scala Development Team Abstract: This manual describes the API of the programming language Scala. Section: Programming/Scala Format: HTML -Index: /usr/share/doc/scala-doc/html/index.html -Files: /usr/share/doc/scala-doc/html/* +Index: /usr/share/doc/scala-2.11/html/index.html +Files: /usr/share/doc/scala-2.11/html/* diff --git a/debian/scala-doc.install b/debian/scala-doc.install index 54254ba..e4f6c27 100644 --- a/debian/scala-doc.install +++ b/debian/scala-doc.install @@ -1,2 +1,2 @@ -build/scaladoc/library/* usr/share/doc/scala-doc/html/ -build/pack/doc/tools/* usr/share/doc/scala-doc/tools/ +build/scaladoc/library/* usr/share/doc/scala-2.11/html/ +build/pack/doc/tools/* usr/share/doc/scala-2.11/tools/ diff --git a/debian/scala-doc.links b/debian/scala-doc.links index 9b6017e..61ead42 100644 --- a/debian/scala-doc.links +++ b/debian/scala-doc.links @@ -1,2 +1,9 @@ #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/doc/scala-2.11/api usr/share/doc/scala/api +usr/share/doc/scala-2.11/tools usr/share/doc/scala/tools + +# Compatibility links with the older versions of the scala-doc package (<< 2.11) +usr/share/doc/scala-2.11/api usr/share/doc/scala-doc/html +usr/share/doc/scala-2.11/tools usr/share/doc/scala-doc/tools -- 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
