[trove3] 32/33: Moved the javadoc to /usr/share/doc/libtrove3-java/api/

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository trove3.

commit 4d7341d97c13efa67527dfa752408e7d65762a91
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 18 18:13:33 2018 +0200

    Moved the javadoc to /usr/share/doc/libtrove3-java/api/
---
 debian/changelog                   | 1 +
 debian/libtrove3-java-doc.doc-base | 4 ++--
 debian/libtrove3-java-doc.install  | 1 +
 debian/rules                       | 3 ---
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b32ef9b..f8d2924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 trove3 (3.0.3-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Moved the javadoc to /usr/share/doc/libtrove3-java/api/
   * Moved the package to Git
   * Standards-Version updated to 4.1.4
   * Switch to debhelper level 11
diff --git a/debian/libtrove3-java-doc.doc-base b/debian/libtrove3-java-doc.doc-base
index 6f1776e..751728b 100644
--- a/debian/libtrove3-java-doc.doc-base
+++ b/debian/libtrove3-java-doc.doc-base
@@ -6,5 +6,5 @@ Abstract: This is the programmer API of trove, a library for high
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libtrove3-java-doc/api/index.html
-Files: /usr/share/doc/libtrove3-java-doc/api/*.html
+Index: /usr/share/doc/libtrove3-java/api/index.html
+Files: /usr/share/doc/libtrove3-java/api/*.html
diff --git a/debian/libtrove3-java-doc.install b/debian/libtrove3-java-doc.install
new file mode 100644
index 0000000..d59d21b
--- /dev/null
+++ b/debian/libtrove3-java-doc.install
@@ -0,0 +1 @@
+output/javadocs/*   /usr/share/doc/libtrove3-java/api
diff --git a/debian/rules b/debian/rules
index 98e595b..8534fa4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,9 +27,6 @@ override_dh_auto_install-indep:
 	  /usr/share/java/trove-$(DEB_UPSTREAM_VERSION).jar \
 	  /usr/share/java/trove4j-$(DEB_UPSTREAM_VERSION).jar \
 	  /usr/share/java/trove-3.jar
-	# Install JavaDoc
-	dh_install -plibtrove3-java-doc \
-	  output/javadocs/* /usr/share/doc/libtrove3-java-doc/api
 
 make-pom:
 	@mkdir -p debian/poms

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/trove3.git