And the second part of the patch.
diff --git a/debian/ant.properties b/debian/ant.properties index 52a1e11..a01b354 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -25,8 +25,8 @@ debian.build.classpath = /usr/share/java/mina2-core.jar;\ /usr/share/java/jaudiotagger.jar;\ /usr/share/java/xmlrpc-server.jar;\ /usr/share/java/xmlrpc-common.jar;\ -/usr/share/tomcat6/lib/catalina.jar;\ -/usr/share/tomcat6/lib/tomcat-coyote.jar;\ +/usr/share/java/tomcat-catalina.jar;\ +/usr/share/java/tomcat-coyote.jar;\ /usr/share/java/glassfish-javaee.jar;\ /usr/share/java/jython.jar;\ /usr/share/java/xercesImpl.jar @@ -37,10 +37,10 @@ debian.test.classpath = /usr/share/java/junit4.jar;\ /usr/share/java/commons-logging.jar;\ /usr/share/java/log4j-1.2.jar;\ /usr/share/java/groboutils-testingjunit-core.jar;\ -/usr/share/tomcat6/lib/catalina.jar;\ +/usr/share/java/tomcat-catalina.jar;\ /usr/share/java/tomcat-juli.jar;\ -/usr/share/tomcat6/lib/annotations-api.jar;\ -/usr/share/tomcat6/lib/el-api.jar +/usr/share/java/tomcat-annotations-api.jar;\ +/usr/share/java/el-api-2.2.jar
# For plugins
red5.root = ../../
diff --git a/debian/control b/debian/control
index 31bf437..1a374b7 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Build-Depends-Indep: ant-optional,
libspring-core-java,
libspring-test-java,
libspring-web-java,
- libtomcat6-java (>= 6.0.20-7),
+ libtomcat7-java,
libxerces2-java,
libxmlrpc3-server-java
Standards-Version: 3.9.4
@@ -95,7 +95,7 @@ Architecture: all
Depends: adduser (>= 3.11),
default-jre-headless (>= 1:1.6) | java6-runtime-headless,
libred5-java (= ${source:Version}),
- libtomcat6-java (>= 6.0.20-7),
+ libtomcat7-java,
${misc:Depends}
Conflicts: red5
Description: flash streaming server
signature.asc
Description: OpenPGP digital signature
