[Git][java-team/geogebra][master] 2 commits: Add patch to parse java version 11 (Closes: #904493)

[Tony Mancill]

Tony Mancill pushed to branch master at Debian Java Maintainers / geogebra


Commits:
546bd7d3 by tony mancill at 2018-08-05T23:01:59Z
Add patch to parse java version 11 (Closes: #904493)

- - - - -
b5efd021 by tony mancill at 2018-08-05T23:02:07Z
prepare changelog for upload

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/java11.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+geogebra (4.0.34.0+dfsg1-6) unstable; urgency=medium
+
+  * Team upload.
+  * Add patch to parse java version more generically (Closes: #904493)
+
+ -- tony mancill <tmancill at debian.org>  Sun, 05 Aug 2018 15:13:12 -0700
+
 geogebra (4.0.34.0+dfsg1-5) unstable; urgency=medium
 
   * Remove some leftovers of TopGit, which is officially not used anymore.


=====================================
debian/patches/java11.diff
=====================================
--- /dev/null
+++ b/debian/patches/java11.diff
@@ -0,0 +1,24 @@
+From: tony mancill <tmancill at debian.org>
+Date: Sun, 05 Aug 2018 15:13:12 -0700
+Subject: fix the Java version -> double parsing to be more generic
+
+--- a/geogebra/util/Util.java
++++ b/geogebra/util/Util.java
+@@ -282,8 +282,15 @@
+ 
+ 	if (vm_version.startsWith("1.4.2"))
+ 	    return 1.42;
+-	else
+-	    vm_version = vm_version.substring(0, 3);
++	else {
++            // trim the version string if it contains more than one decimal place
++            if (vm_version.indexOf('.') > 0) {
++		final int secondDecimal = vm_version.indexOf('.', vm_version.indexOf('.') + 1);
++                if (secondDecimal > 0) {
++	            vm_version = vm_version.substring(0, secondDecimal);
++                }
++            }
++        }
+ 	try {
+ 	    return Double.parseDouble(vm_version);
+ 	} catch (Exception e) {


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ no_mac.diff
 version.diff
 use_apache_commons_collections.diff
 fix_addURL.patch
+java11.diff



View it on GitLab: https://salsa.debian.org/java-team/geogebra/compare/ec15a94e800a8820659628a0eb99b4e9a676fca4...b5efd021ad4b8b292fade15aca037e9a071c03e7

-- 
View it on GitLab: https://salsa.debian.org/java-team/geogebra/compare/ec15a94e800a8820659628a0eb99b4e9a676fca4...b5efd021ad4b8b292fade15aca037e9a071c03e7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180805/020276a6/attachment.html>