This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository scala.
commit ed9d83fc76874738c50417024d9f67d949d6860f Author: Emmanuel Bourg <[email protected]> Date: Fri Jun 19 14:28:05 2015 +0200 Install the scaladoc of the reflection API --- debian/changelog | 1 + debian/scala-doc.doc-base | 4 ++-- debian/scala-doc.install | 3 ++- debian/scala-doc.links | 2 +- debian/scala-doc.lintian-overrides | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7af2ce0..82e1af8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ scala (2.11.6-2) UNRELEASED; urgency=medium * 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. + * Install the scaladoc of the reflection API * 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 fc7169b..4303c58 100644 --- a/debian/scala-doc.doc-base +++ b/debian/scala-doc.doc-base @@ -5,5 +5,5 @@ Abstract: This manual describes the API of the programming language Scala. Section: Programming/Scala Format: HTML -Index: /usr/share/doc/scala-2.11/html/index.html -Files: /usr/share/doc/scala-2.11/html/* +Index: /usr/share/doc/scala-2.11/api/library/index.html +Files: /usr/share/doc/scala-2.11/api/* diff --git a/debian/scala-doc.install b/debian/scala-doc.install index e4f6c27..e0bf222 100644 --- a/debian/scala-doc.install +++ b/debian/scala-doc.install @@ -1,2 +1,3 @@ -build/scaladoc/library/* usr/share/doc/scala-2.11/html/ +build/scaladoc/library/* usr/share/doc/scala-2.11/api/library/ +build/scaladoc/reflect/* usr/share/doc/scala-2.11/api/reflect/ build/pack/doc/tools/* usr/share/doc/scala-2.11/tools/ diff --git a/debian/scala-doc.links b/debian/scala-doc.links index 61ead42..01efce5 100644 --- a/debian/scala-doc.links +++ b/debian/scala-doc.links @@ -5,5 +5,5 @@ 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/api/library usr/share/doc/scala-doc/html usr/share/doc/scala-2.11/tools usr/share/doc/scala-doc/tools diff --git a/debian/scala-doc.lintian-overrides b/debian/scala-doc.lintian-overrides new file mode 100644 index 0000000..45890a1 --- /dev/null +++ b/debian/scala-doc.lintian-overrides @@ -0,0 +1 @@ +scala-doc: duplicate-files usr/share/doc/scala-2.11/api/*/lib/* -- 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
