[libnative-platform-java] 11/13: Use javahelper to install Javadoc

[Kai-Chung Yan]

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

seamlik-guest pushed a commit to branch master
in repository libnative-platform-java.

commit a4fe34a0bd7527ac2885c8b4a368c3647e4b6f94
Author: Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
Date:   Thu Oct 27 17:01:28 2016 +0800

    Use javahelper to install Javadoc
---
 debian/.gitignore                           | 2 ++
 debian/control                              | 1 +
 debian/libnative-platform-java-doc.doc-base | 9 ---------
 debian/libnative-platform-java-doc.install  | 1 -
 debian/libnative-platform-java-doc.javadoc  | 1 +
 debian/rules                                | 2 +-
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/debian/.gitignore b/debian/.gitignore
index 01b96b2..4220f30 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,7 +1,9 @@
 *.log
 *.substvars
 /.debhelper/
+/.javahelper_clean
 /.mh/
+/*.doc-base.javadoc
 /debhelper-build-stamp
 /files
 /libnative-platform-*/
\ No newline at end of file
diff --git a/debian/control b/debian/control
index 537b9a0..8546e9d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders: Damien Raude-Morvan <drazzib at debian.org>,
 Build-Depends: debhelper (>= 10),
                default-jdk-headless | default-jdk (>= 1:1.6),
                gradle-debian-helper (>= 1.4~),
+               javahelper,
                libncurses5-dev,
                maven-repo-helper (>= 1.5~)
 Standards-Version: 3.9.8
diff --git a/debian/libnative-platform-java-doc.doc-base b/debian/libnative-platform-java-doc.doc-base
deleted file mode 100644
index e70ff27..0000000
--- a/debian/libnative-platform-java-doc.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libnative-platform-java-doc
-Title: API Javadoc for Native Platform
-Author: Adam Murdock
-Abstract: This is the API Javadoc provided by the Native Platform library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libnative-platform-java/api/index.html
-Files: /usr/share/doc/libnative-platform-java/api/*.html
\ No newline at end of file
diff --git a/debian/libnative-platform-java-doc.install b/debian/libnative-platform-java-doc.install
deleted file mode 100644
index 5510ae8..0000000
--- a/debian/libnative-platform-java-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-build/docs/javadoc/*     /usr/share/doc/libnative-platform-java/api/
\ No newline at end of file
diff --git a/debian/libnative-platform-java-doc.javadoc b/debian/libnative-platform-java-doc.javadoc
new file mode 100644
index 0000000..2cfc12b
--- /dev/null
+++ b/debian/libnative-platform-java-doc.javadoc
@@ -0,0 +1 @@
+build/docs/javadoc     usr/share/doc/libnative-platform-java/api
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index f07bc77..6f657f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ export DEB_CFLAGS_MAINT_APPEND = -fPIC
 export DEB_LDFLAGS_MAINT_APPEND = -fPIC
 
 %:
-	dh $@ --buildsystem=gradle --with maven-repo-helper
+	dh $@ --buildsystem=gradle --with maven-repo-helper,javahelper
 
 override_dh_auto_build:
 	dh_auto_build -- assemble nativePlatformSharedLibrary nativePlatformCursesSharedLibrary \

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