[maven-shared-utils] 05/08: Use javahelper to install Javadoc

Kai-Chung Yan seamlik-guest at moszumanska.debian.org
Tue May 24 09:43:04 UTC 2016


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

seamlik-guest pushed a commit to branch master
in repository maven-shared-utils.

commit 067c664d98a6e86fa907fac6c937779a2f77768e
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Tue May 24 16:15:53 2016 +0800

    Use javahelper to install Javadoc
---
 debian/changelog                                   |  1 +
 debian/control                                     |  3 ++-
 debian/libmaven-shared-utils-java-doc.doc-base.api | 10 ----------
 debian/libmaven-shared-utils-java-doc.install      |  1 -
 debian/libmaven-shared-utils-java-doc.javadoc      |  1 +
 debian/rules                                       |  2 +-
 6 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d1e67b5..47f43b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ maven-shared-utils (3.0.0-1) UNRELEASED; urgency=medium
   * New upstream release
   * Standards-Version => 3.9.8
     - Install readme.md to libmaven-shared-utils-java
+  * Use javahelper to install Javadoc
 
  -- Kai-Chung Yan <seamlikok at gmail.com>  Tue, 24 May 2016 15:30:26 +0800
 
diff --git a/debian/control b/debian/control
index f52eb9f..79bc452 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends-Indep: junit4,
                      libjsr305-java,
                      libmaven-install-plugin-java,
                      libmaven-javadoc-plugin-java,
-                     libmaven-plugin-testing-java
+                     libmaven-plugin-testing-java,
+                     javahelper
 Standards-Version: 3.9.8
 Vcs-Git: git://anonscm.debian.org/pkg-java/maven-shared-utils.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/maven-shared-utils.git
diff --git a/debian/libmaven-shared-utils-java-doc.doc-base.api b/debian/libmaven-shared-utils-java-doc.doc-base.api
deleted file mode 100644
index 7670e6c..0000000
--- a/debian/libmaven-shared-utils-java-doc.doc-base.api
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: libmaven-shared-utils-java
-Title: API Javadoc for Maven Shared Utils
-Author: Maven Shared Utils developers
-Abstract: This is the API Javadoc provided for the
- libmaven-shared-utils-java library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libmaven-shared-utils-java/api/index.html
-Files: /usr/share/doc/libmaven-shared-utils-java/api/*
diff --git a/debian/libmaven-shared-utils-java-doc.install b/debian/libmaven-shared-utils-java-doc.install
index d1a6b49..d51316a 100644
--- a/debian/libmaven-shared-utils-java-doc.install
+++ b/debian/libmaven-shared-utils-java-doc.install
@@ -1,2 +1 @@
-target/apidocs/* usr/share/doc/libmaven-shared-utils-java/api
 readme.md   usr/share/doc/libmaven-shared-utils-java
\ No newline at end of file
diff --git a/debian/libmaven-shared-utils-java-doc.javadoc b/debian/libmaven-shared-utils-java-doc.javadoc
new file mode 100644
index 0000000..6804bf3
--- /dev/null
+++ b/debian/libmaven-shared-utils-java-doc.javadoc
@@ -0,0 +1 @@
+target/apidocs   usr/share/doc/libmaven-shared-utils-java/api
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index afb0059..8d9ce3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --buildsystem=maven
+	dh $@ --buildsystem=maven --with=javahelper
 
 override_dh_install:
 	dh_install

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



More information about the pkg-java-commits mailing list