[libquartz2-java] 34/63: Build depend on libservlet3.1-java instead of libservlet2.5-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 libquartz2-java.

commit c7dc596f8d7ae038d001cc2a36b4d35d3939e390
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Sep 7 22:31:06 2014 +0000

    Build depend on libservlet3.1-java instead of libservlet2.5-java
---
 debian/changelog   | 1 +
 debian/control     | 4 ++--
 debian/maven.rules | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 95365dc..2b115bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libquartz-java (1:1.7.3-4) UNRELEASED; urgency=low
 
   [ Emmanuel Bourg ]
   * debian/control:
+    - Build depend on libservlet3.1-java instead of libservlet2.5-java
     - Use canonical URLs for the Vcs-* fields
     - Updated Standards-Version to 3.9.5 (no changes)
   * Switch to debhelper level 9
diff --git a/debian/control b/debian/control
index c5248de..885b378 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,8 @@ Build-Depends-Indep: default-jdk-doc,
                      libcommons-validator-java,
                      liblog4j1.2-java-doc,
                      libmaven-javadoc-plugin-java,
-                     libservlet2.5-java,
-                     libservlet2.5-java-doc
+                     libservlet3.1-java,
+                     libservlet3.1-java-doc
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libquartz-java
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libquartz-java/
diff --git a/debian/maven.rules b/debian/maven.rules
index 5d1109f..0a917f9 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -26,3 +26,4 @@ org.quartz-scheduler quartz jar s/.*/debian/ * *
 log4j log4j * s/1\.2\..*/1.2.x/ * *
 asm * * s/3\..*/3.x/ * *
 s/org.apache.openejb/javax/ javaee-api jar s/.*/debian/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *

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