[h2database] 02/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 40058e69195477febf1a7cd0515e18026713924f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 21 13:10:03 2015 +0100

    Refreshed the patches
---
 debian/changelog                                  |  4 +++-
 debian/patches/01-use-jar-files-from-debian.patch |  6 +++---
 debian/patches/02-servlet-api-compatibility.patch | 17 -----------------
 debian/patches/series                             |  1 -
 4 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efe2ad9..8a5a8a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-h2database (1.4.185-3) UNRELEASED; urgency=medium
+h2database (1.4.190-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - Refreshed the patches
   * Reverted the build dependency on the Servlet API to 2.5
     due to compilation errors with the 3.1 API
   * Watch and download the new releases from GitHub
diff --git a/debian/patches/01-use-jar-files-from-debian.patch b/debian/patches/01-use-jar-files-from-debian.patch
index d022e4a..3a08dfc 100644
--- a/debian/patches/01-use-jar-files-from-debian.patch
+++ b/debian/patches/01-use-jar-files-from-debian.patch
@@ -6,19 +6,19 @@ 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
-@@ -185,14 +185,13 @@
+@@ -197,14 +197,13 @@
          switchSource(debugInfo);
          clean();
          mkdir("temp");
 -        download();
          String classpath = "temp" +
--                File.pathSeparator + "ext/servlet-api-2.4.jar" +
+-                File.pathSeparator + "ext/servlet-api-3.0.1.jar" +
 -                File.pathSeparator + "ext/lucene-core-3.0.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 + "/usr/share/java/servlet-api-2.5.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" +
diff --git a/debian/patches/02-servlet-api-compatibility.patch b/debian/patches/02-servlet-api-compatibility.patch
deleted file mode 100644
index 44f1a3a..0000000
--- a/debian/patches/02-servlet-api-compatibility.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Modify the test to build with the Servlet API 2.5
-Author: Emmanuel Bourg <ebourg at apache.org>
-Bug: https://code.google.com/p/h2database/issues/detail?id=602
---- a/src/test/org/h2/test/unit/TestServlet.java
-+++ b/src/test/org/h2/test/unit/TestServlet.java
-@@ -86,6 +86,11 @@
-         }
- 
-         @Override
-+        public String getContextPath() {
-+            throw new UnsupportedOperationException();
-+        }
-+
-+        @Override
-         public Enumeration<Object> getInitParameterNames() {
-             throw new UnsupportedOperationException();
-         }
diff --git a/debian/patches/series b/debian/patches/series
index b2567b8..94e2056 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-use-jar-files-from-debian.patch
-02-servlet-api-compatibility.patch
 03-osgi-compatibility.patch

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