[libsaxon-java] 32/33: Moved the javadoc to /usr/share/doc/libsaxon-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 libsaxon-java.

commit c2267fd3acccc0d87c1688b57a2742f05ca9f4ab
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 19 11:51:02 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 586ffc9..a9ac3d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libsaxon-java (1:6.5.5-11) UNRELEASED; urgency=medium
   * Team upload.
   * Removed the GCJ package
   * Install the Maven artifacts for saxon-jdom
+  * Moved the javadoc to /usr/share/doc/libsaxon-java/api
   * Moved the package to Git
   * Simplified debian/rules
 
diff --git a/debian/libsaxon-java-doc.doc-base b/debian/libsaxon-java-doc.doc-base
index 58b2e14..5d2345c 100644
--- a/debian/libsaxon-java-doc.doc-base
+++ b/debian/libsaxon-java-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This manual describes what saxon is and how it can be used with XSL st
 Section:Text
 
 Format: HTML
-Index: /usr/share/doc/libsaxon-java-doc/index.html
-Files: /usr/share/doc/libsaxon-java-doc/*
+Index: /usr/share/doc/libsaxon-java/api/index.html
+Files: /usr/share/doc/libsaxon-java/api/*
diff --git a/debian/libsaxon-java-doc.docs b/debian/libsaxon-java-doc.docs
index b4871d4..8220a76 100644
--- a/debian/libsaxon-java-doc.docs
+++ b/debian/libsaxon-java-doc.docs
@@ -1,3 +1,2 @@
 doc/*.html
 doc/*.css
-build/api
diff --git a/debian/libsaxon-java-doc.install b/debian/libsaxon-java-doc.install
new file mode 100644
index 0000000..ba0a986
--- /dev/null
+++ b/debian/libsaxon-java-doc.install
@@ -0,0 +1 @@
+build/api/* /usr/share/doc/libsaxon-java/api/
diff --git a/debian/libsaxon-java-doc.javadoc b/debian/libsaxon-java-doc.javadoc
deleted file mode 100644
index 84cfccf..0000000
--- a/debian/libsaxon-java-doc.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-build/api/
diff --git a/debian/rules b/debian/rules
index 42b124b..d97c59c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,10 +25,6 @@ override_dh_auto_build:
 	(cd $(APIDOC) ; $(JAVADOC) -sourcepath ../../$(SOURCES) -link /usr/share/doc/default-jdk-doc/api \
 		-link /usr/share/doc/libjdom1-java/api @../../debian/javadoc-args )
 
-override_jh_depends:
-	# jh_depends chokes on the jar file for some reason
-	jh_depends -plibsaxon-java-doc
-
 debian/saxon-xslt.1: debian/saxon-xslt.1.in
 	help2man --include=$< --output=$@ --help-option="-?" \
 		--no-info `basename $@ .1` --version-string=$(UPSTREAM_VERSION) --no-discard-stderr

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