Fixed the dh_shlibdeps error when generating a documentation package (Closes: #753071)

diff --git a/debian/changelog b/debian/changelog
index 3a0f03fcaa3e3c3f74d996c549a9f0879e3def58..6a6552e98639e23c74b64f3ccb25f286e31f5c63 100644 (file)
--- 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.
   [ 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@debian.org>  Thu, 18 Jun 2015 22:00:02 -0700
 
 
  -- tony mancill <tmancill@debian.org>  Thu, 18 Jun 2015 22:00:02 -0700
 

diff --git a/lib/javase.sh b/lib/javase.sh
index 9bfd3ecbefbaa4bf04eb17aab2409e2c3db04c41..a0e27e4caf88fdad2dae2d7f6c8d2da6f2daa491 100644 (file)
--- a/lib/javase.sh
+++ b/lib/javase.sh
@@ -81,6 +81,17 @@ override_dh_shlibdeps:
 EOF
 }
 
 EOF
 }
 

+j2se_doc_rules() {
+    cat << EOF
+#!/usr/bin/make -f
+
+%:
+       dh \$@
+
+EOF
+}
+
+

 j2se_install_scripts() {
     cat > "$debian_dir/postinst" << EOF
 #!/bin/bash
 j2se_install_scripts() {
     cat > "$debian_dir/postinst" << EOF
 #!/bin/bash

diff --git a/lib/jdk-doc.sh b/lib/jdk-doc.sh
index a1891ba8035d7a85780a8fca7bed7d23e0a78f07..443bdfdecdc28d8db7c10541330d09a465f13f88 100644 (file)
--- 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_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"
     chmod +x "$debian_dir/rules"
     j2se_install_scripts
     install -d "$target/debian"