[h2database] 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 h2database.

commit 67535840cc0a7353d1df65d8ec7a71bc434af94d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 11 22:00:43 2016 +0100

    Refreshed the patches
---
 debian/changelog                                  |  7 ++
 debian/patches/01-use-jar-files-from-debian.patch |  2 +-
 debian/patches/05-servlet-api-compatibility.patch | 82 -----------------------
 debian/patches/series                             |  1 -
 4 files changed, 8 insertions(+), 84 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 44f0ca2..97da8e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+h2database (1.4.193-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 11 Nov 2016 21:56:21 +0100
+
 h2database (1.4.192-3) unstable; urgency=medium
 
   * Transition to the Servlet API 3.1
diff --git a/debian/patches/01-use-jar-files-from-debian.patch b/debian/patches/01-use-jar-files-from-debian.patch
index 2b86525..c039369 100644
--- a/debian/patches/01-use-jar-files-from-debian.patch
+++ b/debian/patches/01-use-jar-files-from-debian.patch
@@ -12,7 +12,7 @@ Last-Update: 2011-07-13
          mkdir("temp");
 -        download();
          String classpath = "temp" +
--                File.pathSeparator + "ext/servlet-api-3.0.1.jar" +
+-                File.pathSeparator + "ext/servlet-api-3.1.0.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" +
diff --git a/debian/patches/05-servlet-api-compatibility.patch b/debian/patches/05-servlet-api-compatibility.patch
deleted file mode 100644
index e004e74..0000000
--- a/debian/patches/05-servlet-api-compatibility.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Description: Fixes the compatibility with the latest version of the Servlet API
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
---- a/src/test/org/h2/test/server/TestWeb.java
-+++ b/src/test/org/h2/test/server/TestWeb.java
-@@ -624,6 +624,11 @@
-         }
- 
-         @Override
-+        public long getContentLengthLong() {
-+            return 0;
-+        }
-+
-+        @Override
-         public String getContentType() {
-             return null;
-         }
-@@ -846,6 +851,11 @@
-         }
- 
-         @Override
-+        public String changeSessionId() {
-+            return null;
-+        }
-+
-+        @Override
-         public Principal getUserPrincipal() {
-             return null;
-         }
-@@ -938,6 +948,10 @@
-             return null;
-         }
- 
-+        @Override
-+        public <T extends javax.servlet.http.HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, javax.servlet.ServletException {
-+            return null;
-+        }
-     }
- 
-     /**
-@@ -1017,6 +1031,11 @@
-         }
- 
-         @Override
-+        public void setContentLengthLong(long len) {
-+            // ignore
-+        }
-+
-+        @Override
-         public void setContentType(String arg0) {
-             // ignore
-         }
-@@ -1157,6 +1176,15 @@
-             }
-         }
- 
-+        @Override
-+        public boolean isReady() {
-+            return true;
-+        }
-+
-+        @Override
-+        public void setWriteListener(javax.servlet.WriteListener writeListener) {
-+
-+        }
-     }
- 
- }
---- a/src/test/org/h2/test/unit/TestServlet.java
-+++ b/src/test/org/h2/test/unit/TestServlet.java
-@@ -146,6 +146,11 @@
-             throw new UnsupportedOperationException();
-         }
- 
-+        @Override
-+        public String getVirtualServerName() {
-+            throw new UnsupportedOperationException();
-+        }
-+
-         /**
-          * @deprecated as of servlet API 2.1
-          */
diff --git a/debian/patches/series b/debian/patches/series
index e74963d..2912c0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01-use-jar-files-from-debian.patch
 03-osgi-compatibility.patch
 04-reproducible-javadoc.patch
-05-servlet-api-compatibility.patch

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