[openjfx9] 07/11: Depend on antlr+stringtemplate instead of antlr-complete

[Emmanuel Bourg]

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

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

commit 9f42e5746fd170f126d30b39caea9907351ed556
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 11 12:56:49 2017 +0200

    Depend on antlr+stringtemplate instead of antlr-complete
---
 debian/changelog                             |  1 +
 debian/maven.rules                           |  1 +
 debian/patches/02-use-system-libraries.patch | 16 ++++++++++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ebce27..f9e72e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ openjfx9 (9~b181-1) UNRELEASED; urgency=medium
     - Depend on openjdk-9 instead of openjdk-8
     - Updated the watch file to track the Java 9 releases
     - Updated the paths to the modules (modules/foo -> modules/javafx.foo)
+    - Depend on antlr+stringtemplate instead of antlr-complete
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sat, 07 Oct 2017 01:01:42 +0200
 
diff --git a/debian/maven.rules b/debian/maven.rules
index 75bb1b9..820e71a 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,3 +1,4 @@
 junit junit * s/.*/4.x/ * *
 org.antlr antlr* * s/.*/3.x/ * *
 org.antlr stringtemplate * s/.*/3.x/ * *
+org.antlr s/antlr-complete/antlr/ * s/.*/3.x/ * *
diff --git a/debian/patches/02-use-system-libraries.patch b/debian/patches/02-use-system-libraries.patch
index 95330bb..4e2c176 100644
--- a/debian/patches/02-use-system-libraries.patch
+++ b/debian/patches/02-use-system-libraries.patch
@@ -3,7 +3,15 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -2109,7 +2109,7 @@
+@@ -1618,6 +1618,7 @@
+         stubCompile group: "junit", name: "junit", version: "4.8.2"
+ 
+         antlr group: "org.antlr", name: "antlr-complete", version: "3.5.2"
++        antlr group: "org.antlr", name: "stringtemplate", version: "3.x"
+     }
+ 
+     project.ext.moduleSourcePath = defaultModuleSourcePath_GraphicsOne
+@@ -2109,7 +2110,7 @@
      commonModuleSetup(project, [ 'base', 'graphics' ])
  
      dependencies {
@@ -12,7 +20,7 @@ Forwarded: not-needed
      }
  
      classes << {
-@@ -2559,7 +2559,7 @@
+@@ -2559,7 +2560,7 @@
      classes << {
          // Copy all of the download libraries to libs directory for the sake of the IDEs
          File libsDir = rootProject.file("build/libs");
@@ -21,7 +29,7 @@ Forwarded: not-needed
          libsDir.mkdirs();
  
          // Skip copy if file is present.
-@@ -2569,7 +2569,7 @@
+@@ -2569,7 +2570,7 @@
              copy {
                  into libsDir
                  from f.getParentFile()
@@ -30,7 +38,7 @@ Forwarded: not-needed
                  includeEmptyDirs = false
              }
          }
-@@ -3091,12 +3091,13 @@
+@@ -3091,12 +3092,13 @@
              outputs.dir("$webkitOutputDir/$webkitConfig/DerivedSources/WebCore/nativeJava/java")
  
              doLast {

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