From: Bdale Garbee <bdale@gag.com>
Date: Sat, 28 Jul 2018 02:53:33 +0000 (+0800)
Subject: force use of java 8
X-Git-Tag: debian/15.03.2~2
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=3b5af951dcf37e3b10c418f91415cce4b937823c;p=debian%2Fopenrocket

force use of java 8
---

diff --git a/debian/changelog b/debian/changelog
index d74c3d90..bce70506 100644
--- 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 d843ca41..a3955d63 100644
--- 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 0e908d83..a323a555 100755
--- 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" )