[squirrel-sql] 03/03: java 8…

[Thorsten Glaser]

This is an automated email from the git hooks/post-receive script.

tg pushed a commit to branch master
in repository squirrel-sql.

commit 776c5655de97c02ec97650bca7a0b28b54ec0eec
Author: mirabilos <t.glaser at tarent.de>
Date:   Wed Nov 23 14:53:13 2016 +0100

    java 8…
---
 debian/changelog                     |  1 +
 debian/patches/series                |  1 +
 debian/patches/version-madness.patch | 13 +++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e5e83bb..c105526 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ squirrel-sql (3.2.0+dfsg-1) UNRELEASED; urgency=low
   * Moved the package to Git
   * Make the package at least build with sid as of November 2016
   * Remove squirrel-sql-plugin-laf from standard plugins, not installable
+  * Start with Java™ 8
 
  -- Vladimir Kotov <vladimir at kotov.lv>  Wed, 09 Jan 2011 23:35:28 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 68e7b79..4fd82d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 disable_autoupdate.dpatch
 drop_parent_pom.patch
 adapt_to_newer_jgoodies.patch
+version-madness.patch
diff --git a/debian/patches/version-madness.patch b/debian/patches/version-madness.patch
new file mode 100644
index 0000000..6563907
--- /dev/null
+++ b/debian/patches/version-madness.patch
@@ -0,0 +1,13 @@
+# DP: There is such thing as Java™ 8, you know…
+
+--- a/installer/squirrelsql-launcher/src/main/resources/squirrel-sql.sh
++++ b/installer/squirrelsql-launcher/src/main/resources/squirrel-sql.sh
+@@ -72,7 +72,7 @@ cd "$UNIX_STYLE_HOME"
+ # should be able to be run by that version or higher. The arguments to JavaVersionChecker below specify the 
+ # minimum acceptable version (first arg) and any other acceptable subsequent versions.  <MAJOR>.<MINOR> should 
+ # be all that is necessary for the version form. 
+-$JAVACMD -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 1.6 1.7
++$JAVACMD -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 1.6 1.7 1.8
+ if [ "$?" = "1" ]; then
+ 	exit
+ fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/squirrel-sql.git