[pkg-java] r16756 - trunk/hsqldb/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-05-27 13:28:30 +0000 (Mon, 27 May 2013)
New Revision: 16756

Modified:
   trunk/hsqldb/debian/control
   trunk/hsqldb/debian/rules
Log:
Transition to the Servlet API 3.0



Modified: trunk/hsqldb/debian/control
===================================================================
--- trunk/hsqldb/debian/control	2013-05-27 13:09:07 UTC (rev 16755)
+++ trunk/hsqldb/debian/control	2013-05-27 13:28:30 UTC (rev 16756)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5), default-jdk, ant (>= 1.7), libservlet2.5-java, maven-repo-helper, javahelper
+Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5), default-jdk, ant (>= 1.7), libservlet3.0-java, maven-repo-helper, javahelper
 Standards-Version: 3.9.4
 Homepage: http://hsqldb.org
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/hsqldb
@@ -11,7 +11,7 @@
 
 Package: libhsqldb-java
 Architecture: all
-Depends: libservlet2.5-java, ${misc:Depends}
+Depends: libservlet3.0-java, ${misc:Depends}
 Suggests: libhsqldb-java-doc
 Conflicts: openoffice.org-base (<< 1:2.3.1~m8)
 Description: Java SQL database engine

Modified: trunk/hsqldb/debian/rules
===================================================================
--- trunk/hsqldb/debian/rules	2013-05-27 13:09:07 UTC (rev 16755)
+++ trunk/hsqldb/debian/rules	2013-05-27 13:28:30 UTC (rev 16756)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME = /usr/lib/jvm/default-java
-DEB_JARS = servlet-api-2.5
+DEB_JARS = servlet-api-3.0
 DEB_ANT_BUILDFILE = build/build.xml
 DEB_ANT_BUILD_TARGET = hsqldb hsqldbutil javadoc
 DEB_ANT_ARGS += -Dant.build.javac.target=1.5 -Dant.build.javac.source=1.5