[h2database] 03/04: 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 h2database.

commit 4d745e48f19fe9d0b05e413f4d07da73be6438d8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 3 13:00:46 2016 +0200

    Refreshed the patches
---
 debian/changelog                                  |  4 +++-
 debian/patches/01-use-jar-files-from-debian.patch | 12 +++++-------
 debian/patches/04-reproducible-javadoc.patch      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1185c1..e518ee7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-h2database (1.4.191-2) UNRELEASED; urgency=medium
+h2database (1.4.192-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - Refreshed the patches
   * Team upload.
   * Set the locale when generating the javadoc to improve the reproducibility
   * Standards-Version updated to 3.9.8 (no changes)
diff --git a/debian/patches/01-use-jar-files-from-debian.patch b/debian/patches/01-use-jar-files-from-debian.patch
index 8c45725..5af909c 100644
--- a/debian/patches/01-use-jar-files-from-debian.patch
+++ b/debian/patches/01-use-jar-files-from-debian.patch
@@ -6,24 +6,22 @@ Author: Sebastian Reichel <sre at debian.org>
 Last-Update: 2011-07-13
 --- a/src/tools/org/h2/build/Build.java
 +++ b/src/tools/org/h2/build/Build.java
-@@ -196,14 +196,13 @@
-         switchSource(debugInfo);
-         clean();
+@@ -203,12 +203,12 @@
          mkdir("temp");
--        download();
+         download();
          String classpath = "temp" +
 -                File.pathSeparator + "ext/servlet-api-3.0.1.jar" +
--                File.pathSeparator + "ext/lucene-core-3.0.2.jar" +
+-                File.pathSeparator + "ext/lucene-core-3.6.2.jar" +
 -                File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
 -                File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
 -                File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
--                File.pathSeparator + "ext/jts-1.13.jar" +
+-                File.pathSeparator + "ext/jts-core-1.14.0.jar" +
 +                File.pathSeparator + "/usr/share/java/servlet-api-3.0.jar" +
 +                File.pathSeparator + "/usr/share/java/lucene3-core.jar" +
 +                File.pathSeparator + "/usr/share/java/slf4j-api.jar" +
 +                File.pathSeparator + "/usr/share/java/org.eclipse.osgi.jar" +
 +                File.pathSeparator + "/usr/share/java/osgi.compendium.jar" +
 +                File.pathSeparator + "/usr/share/java/jts.jar" +
-                 File.pathSeparator + System.getProperty("java.home") + "/../lib/tools.jar";
+                 File.pathSeparator + javaToolsJar;
          FileList files;
          if (clientOnly) {
diff --git a/debian/patches/04-reproducible-javadoc.patch b/debian/patches/04-reproducible-javadoc.patch
index 3aa4c56..c32c078 100644
--- a/debian/patches/04-reproducible-javadoc.patch
+++ b/debian/patches/04-reproducible-javadoc.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/src/tools/org/h2/build/BuildBase.java
 +++ b/src/tools/org/h2/build/BuildBase.java
-@@ -476,6 +476,10 @@
+@@ -522,6 +522,10 @@
       * @param args the command line arguments to pass
       */
      protected void javadoc(String...args) {

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