This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository jackrabbit.
commit e39a9bca3d409d896b0ed01b2c83fed01b17f212 Author: Markus Koschany <[email protected]> Date: Fri Jul 15 07:09:18 2016 +0200 Run servlet_api_25.diff through gbp pq import --- debian/patches/servlet_api_25.diff | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/debian/patches/servlet_api_25.diff b/debian/patches/servlet_api_25.diff index 2eab4f2..443c421 100644 --- a/debian/patches/servlet_api_25.diff +++ b/debian/patches/servlet_api_25.diff @@ -1,10 +1,17 @@ -Description: Add some methods for Servlet API 2.5 compat -Author: Damien Raude-Morvan -Last-Update: 2012-01-21 -Forwarded: no +From: Debian Java Maintainers <[email protected]> +Date: Fri, 15 Jul 2016 07:08:57 +0200 +Subject: servlet_api_25 + +--- + .../org/apache/jackrabbit/webdav/WebdavRequestImpl.java | 17 +++++++++++++++++ + .../apache/jackrabbit/webdav/WebdavResponseImpl.java | 9 +++++++++ + 2 files changed, 26 insertions(+) + +diff --git a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java +index 12b961d..05dafa5 100644 --- a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java +++ b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java -@@ -996,4 +996,21 @@ +@@ -1005,4 +1005,21 @@ public class WebdavRequestImpl implements WebdavRequest, DavConstants { public String getRealPath(String s) { return httpRequest.getRealPath(s); } @@ -26,9 +33,11 @@ Forwarded: no + return httpRequest.getLocalAddr(); + } } +diff --git a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java +index 771d00b..23e6a66 100644 --- a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java +++ b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java -@@ -310,4 +310,13 @@ +@@ -310,4 +310,13 @@ public class WebdavResponseImpl implements WebdavResponse { public Locale getLocale() { return httpResponse.getLocale(); } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackrabbit.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
