Debian:

Prep for dependency on libtomcat7
Doesn't work yet, breaks susidns.
glassfish-javaee for jstl.jar and standard.jar version 1.2 won't work with tomcat7,
it's ancient and not compatible with recent el libs.
Add back option to depend on libjakarta-taglibs-standard and libjstl1.1-java which are version 1.1.2,
but not clear if they will work with tomcat7 either, even though they are
dependencies of libjetty8-extra-java.
We switched from JSTL 1.1.2 to JSTL 1.2 when we went from Jetty 5 to Jetty 6 in 2012.
1.2 libs are not available anywhere except for Glassfish, and
Debian only has the ancient Java EE 5 Glassfish 2.1.
Not clear there's any way to get susidns (and bote) to work with both Tomcat 6 and 7.
- Fix wrong jsp-api version
- Fix other minor errors in install and links files.
- Log stack trace for Jetty warnings if log level is WARN
- SusiDNS: Move standard.jar and jstl.jar out of WEB-INF/lib, where Tomcat 7 build refuses to find them

debian/i2p-router.links

@@ -3,7 +3,7 @@ usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGP
 usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
 usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
 
-usr/share/java/eclipse-ecj.jar /usr/share/i2p/lib/eclipse-ecj.jar
+usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
 
 
 # comment out if not building with libjetty8-java
@@ -33,24 +33,49 @@ usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
 usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
 
 
-# comment out if not building with libservlet2.5-java
-# ubuntu: only in wily
-# debian: in wheezy jessie stretch sid
-#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
-
-
 # comment out if not building with libtomcat6-java
 # ubuntu: only in precise trusty vivid
 # debian: only in wheezy
-# todo: see if libtomcat7-java will work
 # legacy name, contains only tomcat-juli, not commons-logging
 #usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
 #usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
 # combined into jasper-runtime.jar in non-package builds
 #usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
+# combined into commons-el.jar in non-package builds
+#usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
+# following is from libservlet2.5-java which is a dependency of libtomcat6-java
+# legacy name in lib/
+#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
+
+
+# comment out if not building with libtomcat7-java
+# ubuntu: only in precise trusty vivid
+# debian: only in wheezy
+# legacy name, contains only tomcat-juli, not commons-logging
+#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
+#usr/share/java/tomcat-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
+# combined into jasper-runtime.jar in non-package builds
+#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
+# tomcat 7 only
+#usr/share/java/tomcat-api.jar usr/share/i2p/lib/tomcat-api.jar
+#usr/share/java/tomcat-util.jar usr/share/i2p/lib/tomcat-util.jar
+# combined into commons-el.jar in non-package builds
+#usr/share/java/tomcat-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
+# following is from libservlet3.0-java which is a dependency of libtomcat7-java
+# legacy name in lib/
+#usr/share/java/el-api-2.2.jar usr/share/i2p/lib/commons-el.jar
 
 
 # comment out if not building with glassfish-javaee
-# ubuntu and debian: everywhere
 usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
 usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
+
+
+# comment out if not building with libjakarta-taglibs-standard-java
+# ubuntu and debian: everywhere
+#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
+
+
+# comment out if not building with libjstl1.1-java
+# ubuntu and debian: everywhere
+#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar