[sisu-guice] 01/06: 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 sisu-guice.

commit e0cdaa44749e5c6accc7c4c4326e5d6996cc324b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 2 21:40:29 2014 +0200

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

diff --git a/debian/changelog b/debian/changelog
index df47db2..428df19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sisu-guice (3.2.3+dfsg-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build depend on libservlet3.1-java instead of libservlet2.5-java
   * Standards-Version updated to 3.9.6 (no changes)
   * Removed the unused build dependencies on the *-java-doc packages
   * Switch to debhelper level 9
diff --git a/debian/control b/debian/control
index aece4c8..4cb6e70 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends-Indep: glassfish-javaee,
                      libmaven-bundle-plugin-java,
                      libmaven-javadoc-plugin-java,
                      libmunge-maven-plugin-java,
-                     libservlet2.5-java,
+                     libservlet3.1-java,
                      junit4,
                      libbuild-helper-maven-plugin-java
 Standards-Version: 3.9.6
diff --git a/debian/maven.rules b/debian/maven.rules
index 17c9201..15c2157 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,7 +1,7 @@
 
 com.google.guava guava bundle s/.*/debian/ * *
 com.google.guava guava s/jar/bundle/ s/.*/debian/ * *
-javax.servlet servlet-api jar s/.*/2.5/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/ * *
 junit junit jar s/4\..*/4.x/ * *
 org.sonatype.sisu sisu-guice jar s/.*/debian/ * *
 org.sonatype.sisu.inject guice-assistedinject jar s/.*/debian/ * *

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