Improved the detection of the JRE/JDK version (supports 2 digits Java 7 updates)...

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

diff --git a/lib/j2sdk-doc.sh b/lib/j2sdk-doc.sh
index 5b1353151c66a9e313d0ed5da8a3def70cd906e6..be98bfdf93f0b203f01d40312cd6c217fa5a4f3a 100644 (file)
--- a/lib/j2sdk-doc.sh
+++ b/lib/j2sdk-doc.sh
@@ -13,7 +13,7 @@ Description: $j2se_title
  Java(TM) platform.
  .
  This package provides the official API documentation published
- by Sun Microsystems.
+ by Oracle.
  .
  This package has been automatically created with java-package ($version).
 EOF
@@ -28,8 +28,8 @@ Abstract: This is the API Javadoc provided by the vendor
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/j2sdk$j2se_release-$j2se_vendor-doc/index.html
-Files: /usr/share/doc/j2sdk$j2se_release-$j2se_vendor-doc/*.html
+Index: /usr/share/doc/$j2se_vendor-java$j2se_release-doc/index.html
+Files: /usr/share/doc/$j2se_vendor-java$j2se_release-doc/*.html
 
 EOF
 }
@@ -39,8 +39,8 @@ j2sdk_doc_run() {
     echo
     diskfree "$j2se_required_space"
     read_maintainer_info
-    j2se_package="$j2se_vendor-j2sdk$j2se_release-doc"
-    j2se_name="j2sdk$j2se_release-$j2se_vendor-doc"
+    j2se_package="$j2se_vendor-java$j2se_release-doc"
+    j2se_name="jdk$j2se_release-$j2se_vendor-doc"
     local target="$install_dir$javadoc_base$j2se_name"
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"