force use of java 8

diff --git a/debian/changelog b/debian/changelog
index d74c3d90eecb74af6fd0ed955ab79ec073171e42..bce70506f033e7926cd5f19b5197ee5bc44b674b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 openrocket (15.03.2) unstable; urgency=medium
 
   * rework code to fetch from new upstream home on github, closes: #760961
+  * force use of java-8 since app crashes with newer java versions
 
  -- Bdale Garbee <bdale@gag.com>  Sat, 28 Jul 2018 10:29:19 +0800
 

diff --git a/debian/control b/debian/control
index d843ca41c4571467350c4faf43d40f6f0bffc2a8..a3955d63fd4b5acc5b8c03b7bcc5b598c0d02a4b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: https://git.gag.com/?p=debian/openrocket
 
 Package: openrocket
 Architecture: all
-Depends: wget, unzip, default-jre, ${misc:Depends}, ${shlibs:Depends}
+Depends: wget, unzip, default-jre, ${misc:Depends}, ${shlibs:Depends}, openjdk-8-jre-headless
 Description: Model Rocket Simulator
  OpenRocket is a free, fully featured model rocket simulator that allows 
  you to design and simulate your rockets before actually building and 

diff --git a/update-openrocket b/update-openrocket
index 0e908d83291d9ba8be311c7ff3e9d1f88cf8a9bd..a323a555d0bf14c335243f13fd289f53dd38c97c 100755 (executable)
--- a/update-openrocket
+++ b/update-openrocket
@@ -174,7 +174,7 @@ case "$ACTION" in
                        [ "$verbose" != "yes" ] || ( get_installed_version && echo "create /usr/bin/openrocket wrapper" )
 
                        echo "#!/bin/sh" > /usr/bin/openrocket
-                       echo "exec java -jar /usr/lib/openrocket/OpenRocket-$upstream.jar \"\$@\"" >> /usr/bin/openrocket
+                       echo "exec /usr/lib/jvm/java-8-openjdk-amd64/bin/java -jar /usr/lib/openrocket/OpenRocket-$upstream.jar \"\$@\"" >> /usr/bin/openrocket
                        chmod +x /usr/bin/openrocket
 
                        [ "$verbose" != "yes" ] || ( get_installed_version && echo "OpenRocket version: $installed" )