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 443bdfdecdc28d8db7c10541330d09a465f13f88..e6f94eac7add378171c376c39875cad0777fb044 100644 (file)
--- a/lib/jdk-doc.sh
+++ b/lib/jdk-doc.sh
@@ -2,7 +2,8 @@ j2sdk_doc_control() {
     j2se_control
     cat << EOF
 Package: $j2se_package
-Architecture: any
+Architecture: all
+Section: non-free/doc
 Depends: \${misc:Depends}
 Description: $j2se_title
  The Java(TM) SE JDK is a development environment for building
@@ -36,8 +37,9 @@ 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"
+    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"