Change installation directory to be jdk|jre-relase.update-vendor-arch

[sven/java-package.git] / lib / j2re.sh

diff --git a/lib/j2re.sh b/lib/j2re.sh
index 2a8c05acdbacd3e5db18a90de8782c08daf5d56b..608d1bdabd97828d802c4bc321369bcf0fdd13ec 100644 (file)
--- a/lib/j2re.sh
+++ b/lib/j2re.sh
@@ -6,10 +6,10 @@ Package: $j2se_package
 Architecture: any
 Depends: \${shlibs:Depends}
 Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2
-Provides: java-virtual-machine, java-runtime, java2-runtime, java-runtime-headless, java2-runtime-headless, java-browser-plugin, j2re${j2se_release}
+Provides: java-virtual-machine, java-runtime, java2-runtime, java5-runtime, java6-runtime, java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java-browser-plugin, j2re${j2se_release}
 Replaces: ${j2se_package}debian
 Description: $j2se_title
- The Java(TM) 2 Runtime Environment contains the Java virtual machine,
+ The Java(TM) SE Runtime Environment contains the Java virtual machine,
  runtime class libraries, and Java application launcher that are
  necessary to run programs written in the Java progamming language
  (this includes the Java 2 Plug-In for Netscape and Mozilla
@@ -26,8 +26,8 @@ j2re_run() {
     echo
     diskfree "$j2se_required_space"
     read_maintainer_info
-    j2se_package="$j2se_vendor-j2re$j2se_release"
-    j2se_name="j2re$j2se_release-$j2se_vendor"
+    j2se_package="$j2se_vendor-java$j2se_release-jre"
+    j2se_name="jre-$j2se_version-$j2se_vendor-$j2se_arch"
     local target="$install_dir$jvm_base$j2se_name"
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"