[SCM] SiteMesh: web-page layout and decoration framework branch, master, updated. debian/2.4.1+dfsg-2-9-g2093a8f

[Emmanuel Bourg]

The following commit has been merged in the master branch:
commit ae3b59ed281b8062d5e2530eecb240a4bbb29217
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jun 16 00:04:59 2013 +0200

    Transition to the Servlet API 3.0

diff --git a/debian/classpath-debian b/debian/classpath-debian
index ecd04b1..a50d296 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -1,5 +1,5 @@
 usr/share/java/JFlex.jar
-usr/share/java/servlet-api-2.5.jar
+usr/share/java/servlet-api-3.0.jar
 usr/share/java/jsp-api-2.1.jar
 usr/share/java/velocity-tools-view.jar
 usr/share/java/freemarker.jar
diff --git a/debian/control b/debian/control
index f70867c..b5fe0a8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: Miguel Landaeta <miguel at miguel.cc>
 Section: java
 Priority: optional
 Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk, javahelper, jflex,
- libservlet2.5-java, velocity, libvelocity-tools-java,
+ libservlet3.0-java, velocity, libvelocity-tools-java,
  libfreemarker-java, junit, ant-optional, default-jdk-doc
 Standards-Version: 3.9.4
 Homepage: http://www.opensymphony.com/sitemesh/
@@ -13,7 +13,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/sitemesh.git
 
 Package: libsitemesh-java
 Architecture: all
-Depends: libfreemarker-java, libservlet2.5-java, velocity,
+Depends: libfreemarker-java, libservlet3.0-java, velocity,
  libvelocity-tools-java, ${misc:Depends}
 Suggests: junit
 Description: web-page layout and decoration framework

-- 
SiteMesh: web-page layout and decoration framework