ensure older pattern only match up to version 8

[sven/java-package.git] / lib / jdk-doc.sh

diff --git a/lib/jdk-doc.sh b/lib/jdk-doc.sh
index d9efde7991529fb1c5ae26915448c928a6e75a04..e6f94eac7add378171c376c39875cad0777fb044 100644 (file)
--- a/lib/jdk-doc.sh
+++ b/lib/jdk-doc.sh
@@ -2,10 +2,9 @@ j2sdk_doc_control() {
     j2se_control
     cat << EOF
 Package: $j2se_package
-Architecture: any
-Depends: 
-Recommends: 
-Provides: 
+Architecture: all
+Section: non-free/doc
+Depends: \${misc:Depends}
 Description: $j2se_title
  The Java(TM) SE JDK is a development environment for building
  applications, applets, and components that can be deployed on the
@@ -38,9 +37,10 @@ j2sdk_doc_run() {
     echo
     diskfree "$j2se_required_space"
     read_maintainer_info
+    get_distribution
     j2se_package="$j2se_vendor-java$j2se_release-doc"
-    j2se_name="jdk$j2se_release-$j2se_vendor-doc"
-    local target="$install_dir$javadoc_base$j2se_name"
+    j2se_name="$j2se_package"
+    local target="$package_dir/$j2se_name"
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"
     rm -rf "$target/.systemPrefs"
@@ -49,8 +49,9 @@ j2sdk_doc_run() {
     j2se_changelog > "$debian_dir/changelog"
     j2sdk_doc_control > "$debian_dir/control"
     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"