Group commands to create debian/install.

diff --git a/lib/jdk.sh b/lib/jdk.sh
index 220f2132d0ce44799c5d51e1998a357f39abd7db..25d7d9ce7b565ed3e69b2b4c8f95ed5f85e5e69c 100644 (file)
--- a/lib/jdk.sh
+++ b/lib/jdk.sh
@@ -49,13 +49,13 @@ j2sdk_run() {
     j2se_changelog > "$debian_dir/changelog"
     j2sdk_control > "$debian_dir/control"
     j2se_copyright > "$debian_dir/copyright"
     j2se_changelog > "$debian_dir/changelog"
     j2sdk_control > "$debian_dir/control"
     j2se_copyright > "$debian_dir/copyright"

-    echo "$j2se_name $jvm_base" > "$debian_dir/install"

     j2se_rules > "$debian_dir/rules"
     chmod +x "$debian_dir/rules"
     j2se_install_scripts
     install -d "$target/debian"
     j2se_info > "$target/debian/info"
     eval "$j2se_jinfo" > "$package_dir/.$j2se_name.jinfo"
     j2se_rules > "$debian_dir/rules"
     chmod +x "$debian_dir/rules"
     j2se_install_scripts
     install -d "$target/debian"
     j2se_info > "$target/debian/info"
     eval "$j2se_jinfo" > "$package_dir/.$j2se_name.jinfo"

-    echo ".$j2se_name.jinfo $jvm_base" >> "$debian_dir/install"
+    echo ".$j2se_name.jinfo $jvm_base" > "$debian_dir/install"
+    echo "$j2se_name $jvm_base" >> "$debian_dir/install"

     j2se_build
 }
     j2se_build
 }

diff --git a/lib/jre.sh b/lib/jre.sh
index 9154993c9f5c3ea98a486dbbe73b2ecc5746a517..b19e6cefaab40471ccc6eb698bac773e79a625ee 100644 (file)
--- a/lib/jre.sh
+++ b/lib/jre.sh
@@ -35,13 +35,13 @@ j2re_run() {
     j2se_changelog > "$debian_dir/changelog"
     j2re_control > "$debian_dir/control"
     j2se_copyright > "$debian_dir/copyright"
     j2se_changelog > "$debian_dir/changelog"
     j2re_control > "$debian_dir/control"
     j2se_copyright > "$debian_dir/copyright"

-    echo "$j2se_name $jvm_base" > "$debian_dir/install"

     j2se_rules > "$debian_dir/rules"
     chmod +x "$debian_dir/rules"
     j2se_install_scripts
     install -d "$target/debian"
     j2se_info > "$target/debian/info"
     eval "$j2se_jinfo" > "$package_dir/.$j2se_name.jinfo"
     j2se_rules > "$debian_dir/rules"
     chmod +x "$debian_dir/rules"
     j2se_install_scripts
     install -d "$target/debian"
     j2se_info > "$target/debian/info"
     eval "$j2se_jinfo" > "$package_dir/.$j2se_name.jinfo"

-    echo ".$j2se_name.jinfo $jvm_base" >> "$debian_dir/install"
+    echo ".$j2se_name.jinfo $jvm_base" > "$debian_dir/install"
+    echo "$j2se_name $jvm_base" >> "$debian_dir/install"

     j2se_build
 }
     j2se_build
 }