[freeplane] 01/01: add patch for LP:1572160 (groovy operator precedence)

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit d49468d8549b7050c9cb5090eb945e5d634718de
Author: Felix Natter <fnatter at gmx.net>
Date:   Thu May 19 20:09:39 2016 +0200

    add patch for LP:1572160 (groovy operator precedence)
---
 debian/changelog                     |  4 +++-
 debian/patches/98_groovy2.4fix.patch | 16 ++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 780f523..6fae597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-freeplane (1.3.15-4) UNRELEASED; urgency=medium
+freeplane (1.3.15-4) unstable; urgency=medium
 
   * Team upload.
   * Depend on groovy instead of groovy2
   * Standards-Version updated to 3.9.8 (no changes)
   * Use secure Vcs-* URLs
+  * Add operator precedence fix for groovy2.4 (Thanks to Gergely Papp),
+    LP: #1572160
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 13 May 2016 16:38:43 +0200
 
diff --git a/debian/patches/98_groovy2.4fix.patch b/debian/patches/98_groovy2.4fix.patch
new file mode 100644
index 0000000..9489a4a
--- /dev/null
+++ b/debian/patches/98_groovy2.4fix.patch
@@ -0,0 +1,16 @@
+Description: Fix operator ambiguity in addon install script
+Author: Gergely Papp <gergely.papp at itworks.hu>
+Applied-Upstream: https://github.com/freeplane/freeplane/commit/1762d5b8a90cf900ed954d4444087e50efa06c07
+Reviewed-by: Felix Natter <fnatter at gmx.net>
+Last-Update: 2016-05-19
+--- a/freeplane_plugin_script/scripts/installScriptAddOn.groovy
++++ b/freeplane_plugin_script/scripts/installScriptAddOn.groovy
+@@ -502,7 +502,7 @@
+ 
+ boolean confirmInstall(ScriptAddOnProperties addOn, ScriptAddOnProperties installedAddOn) {
+ 	def screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+-	def dialogPrefSize = new Dimension((int) screenSize.getWidth() * 3 / 5, (int) screenSize.getHeight() * 1 / 2);
++	def dialogPrefSize = new Dimension((int) (screenSize.getWidth() * 3 / 5), (int) (screenSize.getHeight() * 1 / 2));
+ 	def warning = textUtils.removeTranslateComment(textUtils.getText('addons.installer.warning'))
+ 	def addOnDetailsPanel = new AddOnDetailsPanel(addOn, warning)
+ 	addOnDetailsPanel.maxWidth = 500
diff --git a/debian/patches/series b/debian/patches/series
index 69ea220..5557fed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 93_jgoodies1.6.patch
 95_run_jflex.patch
 97_jmapviewer1.11.patch
+98_groovy2.4fix.patch

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