[openjfx] 02/03: Refreshed the patches

[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 3d50347856db3d3e8b881825b2b8ca6e5ca3c115
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat May 7 22:30:33 2016 +0200

    Refreshed the patches
---
 debian/changelog                             | 4 +++-
 debian/patches/02-use-system-libraries.patch | 8 +++++---
 debian/patches/05-set-antlr-timeout.patch    | 2 +-
 debian/patches/10-javadoc-locale.patch       | 4 ++--
 debian/patches/12-generic-qmake-spec.patch   | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aec2f82..6c3dcf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-openjfx (8u60-b27-5) UNRELEASED; urgency=medium
+openjfx (8u91-b14-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Build with gradle-debian-helper
   * Use override_dh_*-{arch,indep} to split the arch all/any operations
   * Simplified the clean target
diff --git a/debian/patches/02-use-system-libraries.patch b/debian/patches/02-use-system-libraries.patch
index e860f0c..e436e3d 100644
--- a/debian/patches/02-use-system-libraries.patch
+++ b/debian/patches/02-use-system-libraries.patch
@@ -37,20 +37,22 @@ Forwarded: not-needed
                  includeEmptyDirs = false
              }
          }
-@@ -2510,11 +2510,13 @@
+@@ -2509,13 +2509,13 @@
+ 
          def compileNativeTask = task("compileNative${t.capital}", dependsOn: generateHeaders) << {
              println "Building Webkit configuration /$webkitConfig/ into $webkitOutputDir"
-             
+-
 +/*
              def dependencyFile = configurations.webkit.filter(
                      { File f -> f.getName().contains(classifier) }
                  ).getSingleFile()
              ant.unzip(src:  dependencyFile,
                        dest: webkitOutputDir)
+-
 +*/
- 
              exec {
                  workingDir("$projectDir/src/main/native")
+                 commandLine("perl", "Tools/Scripts/set-webkit-configuration", "--$webkitConfig")
 --- a/buildSrc/build.gradle
 +++ b/buildSrc/build.gradle
 @@ -82,6 +82,7 @@
diff --git a/debian/patches/05-set-antlr-timeout.patch b/debian/patches/05-set-antlr-timeout.patch
index b7f5c7c..03f5107 100644
--- a/debian/patches/05-set-antlr-timeout.patch
+++ b/debian/patches/05-set-antlr-timeout.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/buildSrc/build.gradle
 +++ b/buildSrc/build.gradle
-@@ -117,7 +117,7 @@
+@@ -115,7 +115,7 @@
      def grammars = fileTree(src).include("**/*.g")
      main = "org.antlr.Tool"
      classpath = configurations.antlr3
diff --git a/debian/patches/10-javadoc-locale.patch b/debian/patches/10-javadoc-locale.patch
index cedc697..a864e3e 100644
--- a/debian/patches/10-javadoc-locale.patch
+++ b/debian/patches/10-javadoc-locale.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/build.gradle
 +++ b/build.gradle
-@@ -1214,6 +1214,7 @@
+@@ -1218,6 +1218,7 @@
          } else {
              options.links(JDK_DOCS);
          }
@@ -11,7 +11,7 @@ Forwarded: no
          options.addBooleanOption("XDignore.symbol.file").setValue(true);
          options.addBooleanOption("Xdoclint:none").setValue(!IS_DOC_LINT);
          options.addBooleanOption("javafx").setValue(true);
-@@ -2753,6 +2754,7 @@
+@@ -2755,6 +2756,7 @@
      options.windowTitle("${javadocTitle}")
      options.header("${javadocHeader}")
      options.bottom("${javadocBottom}")
diff --git a/debian/patches/12-generic-qmake-spec.patch b/debian/patches/12-generic-qmake-spec.patch
index 1f0b458..d24102b 100644
--- a/debian/patches/12-generic-qmake-spec.patch
+++ b/debian/patches/12-generic-qmake-spec.patch
@@ -3,7 +3,7 @@ Author: Matthias Klose <doko at ubuntu.com>
 Forwarded: no
 --- a/build.gradle
 +++ b/build.gradle
-@@ -2548,17 +2548,9 @@
+@@ -2550,17 +2550,9 @@
                          "QMAKE_LFLAGS"   : "-m64",
                      ])
                  } else if (t.name == "linux") {

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