[openjfx] 01/03: Fixed a build failure with antlr 3.5.2

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository openjfx.

commit c297746d27db96c6bfafe31512dbe61df832d01f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 23 15:37:10 2015 +0200

    Fixed a build failure with antlr 3.5.2
---
 debian/changelog                             | 6 ++++++
 debian/control                               | 1 +
 debian/patches/02-use-system-libraries.patch | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 535bdf8..553e2d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openjfx (8u40-b25-3) UNRELEASED; urgency=medium
+
+  * Fixed a build failure with antlr 3.5.2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 23 Jul 2015 15:14:41 +0200
+
 openjfx (8u40-b25-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index d7b37cf..969aa4f 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends: antlr3,
                libpng-dev,
                libqt4-dev,
                libsqlite3-dev,
+               libstringtemplate-java,
                libswt-gtk-3-java,
                libudev-dev,
                libwerken.xpath-java,
diff --git a/debian/patches/02-use-system-libraries.patch b/debian/patches/02-use-system-libraries.patch
index 5be25d6..8e00385 100644
--- a/debian/patches/02-use-system-libraries.patch
+++ b/debian/patches/02-use-system-libraries.patch
@@ -132,7 +132,7 @@ Forwarded: not-needed
      }
  }
  
-@@ -81,11 +83,11 @@
+@@ -81,11 +83,12 @@
  getConfigurations().create("antlr3");
  
  dependencies {
@@ -142,6 +142,7 @@ Forwarded: not-needed
 -    antlr3      group: "org.antlr", name: "stringtemplate", version: "3.2"
 -    antlr3      group: "org.antlr", name: "antlr",          version: "3.1.3"
 +    compile     group: "org.antlr", name: "antlr",          version: "3.x"
++    compile     group: "org.antlr", name: "stringtemplate", version: "3.x"
 +    testCompile group: "junit",     name: "junit",          version: "4.x"
 +    antlr3      group: "org.antlr", name: "antlr-runtime",  version: "3.x"
 +    antlr3      group: "org.antlr", name: "stringtemplate", version: "3.x"

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