X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Fjdk-doc.sh;h=e6f94eac7add378171c376c39875cad0777fb044;hp=a1891ba8035d7a85780a8fca7bed7d23e0a78f07;hb=a87614986d49e2eac20bd8fa0b8df85a5419fa46;hpb=0093f783df5682c283ae4183f1277b49b054ba19

diff --git a/lib/jdk-doc.sh b/lib/jdk-doc.sh
index a1891ba..e6f94ea 100644
--- 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"
@@ -49,7 +51,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"