X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Fj2sdk.sh;h=dfb0e04ffdc774a5a01d0b6045e233c0c5216464;hp=0947c25ccba3e675313e4a77245e037b8865720f;hb=c1fb4d0a58160b37808c25744cd4e75e2ba5e5ab;hpb=ca8b5d176518ea838461b92229d2fbebb3731de8

diff --git a/lib/j2sdk.sh b/lib/j2sdk.sh
index 0947c25..dfb0e04 100644
--- a/lib/j2sdk.sh
+++ b/lib/j2sdk.sh
@@ -1,12 +1,5 @@
-function j2sdk_readme() {
-    j2se_readme
-}
-
-function j2sdk_changelog() {
-    j2se_changelog
-}
 
-function j2sdk_control() {
+j2sdk_control() {
     j2se_control
     cat << EOF
 Package: $j2se_package
@@ -16,11 +9,11 @@ Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2, libstdc++5
 Provides: java-virtual-machine, java-runtime, java2-runtime, java-browser-plugin, java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java-sdk, java2-sdk, j2sdk$j2se_release, j2re$j2se_release
 Replaces: ${j2se_package}debian
 Description: $j2se_title
- The Java(TM) 2 SDK is a development environment for building
+ The Java(TM) SE JDK is a development environment for building
  applications, applets, and components that can be deployed on the
  Java(TM) platform.
  .
- The Java(TM) 2 SDK software includes tools useful for developing and
+ The Java(TM) SE JDK software includes tools useful for developing and
  testing programs written in the Java programming language and running
  on the Java platform. These tools are designed to be used from the
  command line. Except for appletviewer, these tools do not provide a
@@ -30,39 +23,25 @@ Description: $j2se_title
 EOF
 }
 
-function j2sdk_copyright() {
-    j2se_copyright
-}
-
-function j2sdk_install_scripts() {
-    j2se_install_scripts
-}
-
-function j2sdk_info() {
-    j2se_info
-}
-
-function j2sdk_build() {
-    j2se_build
-}
-
 # build debian package
-function j2sdk_run() {
+j2sdk_run() {
     echo
     diskfree "$j2se_required_space"
     read_maintainer_info
-    j2se_package="$j2se_vendor-j2sdk$j2se_release"
-    j2se_base="/usr/lib/jvm/j2sdk$j2se_release-$j2se_vendor"
-    local target="$install_dir$j2se_base"
+    j2se_package="$j2se_vendor-java$j2se_release-jdk"
+    j2se_name="jdk$j2se_release-$j2se_vendor"
+    local target="$install_dir$jvm_base$j2se_name"
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"
     rm -rf "$target/.systemPrefs"
-    j2sdk_readme > "$debian_dir/README.Debian"
-    j2sdk_changelog > "$debian_dir/changelog"
+    echo "7" > "$debian_dir/compat"
+    j2se_readme > "$debian_dir/README.Debian"
+    j2se_changelog > "$debian_dir/changelog"
     j2sdk_control > "$debian_dir/control"
-    j2sdk_copyright > "$debian_dir/copyright"
-    j2sdk_install_scripts
+    j2se_copyright > "$debian_dir/copyright"
+    j2se_install_scripts
     install -d "$target/debian"
-    j2sdk_info > "$target/debian/info"
-    j2sdk_build
+    j2se_info > "$target/debian/info"
+    eval "$j2se_jinfo" > "$install_dir$jvm_base.$j2se_name.jinfo"
+    j2se_build
 }