X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Fjre.sh;h=5231e383ca96004a91bfafa027d0166fabcdf215;hp=864f14106f968579358fe2adc9d4b2580090d24e;hb=20c3538c03a7f4182a001ac8319f516466df7219;hpb=1c05d6f0e114cff3d49a4a32348a0c154012ac1d

diff --git a/lib/jre.sh b/lib/jre.sh
index 864f141..5231e38 100644
--- a/lib/jre.sh
+++ b/lib/jre.sh
@@ -5,17 +5,15 @@ j2re_control() {
 Package: $j2se_package
 Architecture: any
 Depends: \${shlibs:Depends}
-Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2
-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
+Recommends: netbase
+Provides: java-virtual-machine, java-runtime, java2-runtime, java${j2se_release}-runtime, java$((${j2se_release}-1))-runtime, java$((${j2se_release}-2))-runtime, java-runtime-headless, java2-runtime-headless, java${j2se_release}-runtime-headless, java$((${j2se_release}-1))-runtime-headless, java$((${j2se_release}-2))-runtime-headless, java-browser-plugin
 Description: $j2se_title
  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
- browsers). It is not a development environment and doesn't contain
- development tools such as compilers or debuggers. For development
- tools, see the Java 2 SDK, Standard Edition.
+ necessary to run programs written in the Java programming language.
+ It is not a development environment and does not contain development
+ tools such as compilers or debuggers.  For development tools, see the
+ Java SE Development Kit (JDK).
  .
  This package has been automatically created with java-package ($version).
 EOF
@@ -32,11 +30,13 @@ j2re_run() {
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"
     rm -rf "$target/.systemPrefs"
-    echo "7" > "$debian_dir/compat"
+    echo "9" > "$debian_dir/compat"
     j2se_readme > "$debian_dir/README.Debian"
     j2se_changelog > "$debian_dir/changelog"
     j2re_control > "$debian_dir/control"
     j2se_copyright > "$debian_dir/copyright"
+    j2se_rules > "$debian_dir/rules"
+    chmod +x "$debian_dir/rules"
     j2se_install_scripts
     install -d "$target/debian"
     j2se_info > "$target/debian/info"