[java-package] 03/05: Fixed the dh_shlibdeps error when generating a documentation package (Closes: #753071)

[Emmanuel Bourg]

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

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

commit 34d881d788e21d5e6f7ba6a43f43533f8bc10f7e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 18 23:37:28 2015 +0200

    Fixed the dh_shlibdeps error when generating a documentation package (Closes: #753071)
---
 debian/changelog |  2 ++
 lib/javase.sh    | 11 +++++++++++
 lib/jdk-doc.sh   |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3a0f03f..6a6552e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ java-package (0.60) UNRELEASED; urgency=medium
   [ Emmanuel Bourg ]
   * Added jcontrol to the command line alternatives (Closes: #799370)
   * Fixed the detection of the latest Java 8 documentation archives.
+  * Fixed the dh_shlibdeps error when generating a documentation package
+    (Closes: #753071)
 
  -- tony mancill <tmancill at debian.org>  Thu, 18 Jun 2015 22:00:02 -0700
 
diff --git a/lib/javase.sh b/lib/javase.sh
index 9bfd3ec..a0e27e4 100644
--- a/lib/javase.sh
+++ b/lib/javase.sh
@@ -81,6 +81,17 @@ override_dh_shlibdeps:
 EOF
 }
 
+j2se_doc_rules() {
+    cat << EOF
+#!/usr/bin/make -f
+
+%:
+	dh \$@
+
+EOF
+}
+
+
 j2se_install_scripts() {
     cat > "$debian_dir/postinst" << EOF
 #!/bin/bash
diff --git a/lib/jdk-doc.sh b/lib/jdk-doc.sh
index a1891ba..443bdfd 100644
--- a/lib/jdk-doc.sh
+++ b/lib/jdk-doc.sh
@@ -49,7 +49,7 @@ j2sdk_doc_run() {
     j2se_copyright > "$debian_dir/copyright"
     echo "$j2se_name $javadoc_base" > "$debian_dir/install"
     j2sdk_doc_doc-base > "$debian_dir/$j2se_package.doc-base"
-    j2se_rules > "$debian_dir/rules"
+    j2se_doc_rules > "$debian_dir/rules"
     chmod +x "$debian_dir/rules"
     j2se_install_scripts
     install -d "$target/debian"

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