[jtharness] 11/24: Depend on libservlet3.1-java instead of libservlet3.0-java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jtharness.

commit 126ed89ea67b43b8a8a47ed01f6accaf0b3cc6db
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 29 21:02:02 2014 +0000

    Depend on libservlet3.1-java instead of libservlet3.0-java
---
 debian/changelog                     | 1 +
 debian/control                       | 4 ++--
 debian/patches/02_dependencies.patch | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c1f482..cf773fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jtharness (4.4.0-MR1-Rel-b19-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * debian/control:
+    - Depend on libservlet3.1-java instead of libservlet3.0-java
     - Fixed the Vcs-Svn URL
     - Standards-Version updated to 3.9.6 (no changes)
     - Improved the package description
diff --git a/debian/control b/debian/control
index f33fd5d..d60fa1f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends-Indep: default-jdk,
                      javahelp2,
                      librxtx-java,
                      libasm3-java,
-                     libservlet3.0-java
+                     libservlet3.1-java
 Standards-Version: 3.9.6
 Homepage: http://jtharness.java.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjtharness-java
@@ -21,7 +21,7 @@ Architecture: all
 Depends: junit4,
          librxtx-java,
          libasm3-java,
-         libservlet3.0-java,
+         libservlet3.1-java,
          ${java:Depends},
          ${misc:Depends}
 Description: General purpose test harness for Java
diff --git a/debian/patches/02_dependencies.patch b/debian/patches/02_dependencies.patch
index 20bc85b..da0ded5 100644
--- a/debian/patches/02_dependencies.patch
+++ b/debian/patches/02_dependencies.patch
@@ -22,7 +22,7 @@ Index: jtharness-4.4.0-MR1-Rel-b19/build/local.properties
  
  # location of jar with servlet API implementation
 -servletjar = servlet-api.jar
-+servletjar = /usr/share/java/tomcat-servlet-api-3.0.jar
++servletjar = /usr/share/java/servlet-api-3.1.jar
  
  # bytecode library (BCEL or ASM)
  # these are not interchangable

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