Debian: Use our Jetty/Tomcat libs instead of the ones from Debian/Ubuntu (for now at least).

Tomcat6 & Jetty6 are going to be dropped from the next release of Debian stable
(Wheezy) in favor of Tomcat7 and Jetty8.

debian/control

@@ -10,11 +10,7 @@ Build-Depends: debhelper (>= 7.0.50~),
  debconf,
  default-jdk,
  gettext,
- libcommons-el-java,
- libcommons-logging-java,
  libgmp3-dev,
- libjetty-extra-java,
- libjetty-java,
  po-debconf
 
 Package: i2p
@@ -69,10 +65,7 @@ Architecture: all
 Section: net
 Priority: optional
 Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
- default-jre-headless | java5-runtime-headless | java6-runtime-headless,
- libcommons-logging-java,
- libjetty-java,
- libtomcat6-java
+ default-jre-headless | java5-runtime-headless | java6-runtime-headless, libecj-java
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)
 Recommends: libjbigi-jni (>= ${source:Version}), libjbigi-jni (<< ${source:Version}.1~), ttf-dejavu

debian/i2p-router.install

@@ -18,32 +18,31 @@ pkg-temp/router.config usr/share/i2p
 pkg-temp/systray.config usr/share/i2p
 pkg-temp/webapps usr/share/i2p
 
-# We'll selectively copy things from pkg-temp
-# to ensure that potential Jetty jars aren't
-# duplicated
 pkg-temp/lib/BOB.jar usr/share/i2p/lib
+pkg-temp/lib/commons-el.jar usr/share/i2p/lib
+pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
 pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
 pkg-temp/lib/i2p.jar usr/share/i2p/lib
 pkg-temp/lib/i2psnark.jar usr/share/i2p/lib
 pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib
+pkg-temp/lib/jasper-compiler.jar usr/share/i2p/lib
+pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
+pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
 pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-java5-threadpool.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-sslengine.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-start.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-util.jar usr/share/i2p/lib
 pkg-temp/lib/jrobin.jar usr/share/i2p/lib
 pkg-temp/lib/jstl.jar usr/share/i2p/lib
 pkg-temp/lib/mstreaming.jar usr/share/i2p/lib
-pkg-temp/lib/router.jar usr/share/i2p/lib
+pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
+pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
 pkg-temp/lib/routerconsole.jar usr/share/i2p/lib
+pkg-temp/lib/router.jar usr/share/i2p/lib
 pkg-temp/lib/sam.jar usr/share/i2p/lib
 pkg-temp/lib/standard.jar usr/share/i2p/lib
 pkg-temp/lib/streaming.jar usr/share/i2p/lib
-pkg-temp/lib/systray.jar usr/share/i2p/lib
 pkg-temp/lib/systray4j.jar usr/share/i2p/lib
-
-# These are copied over to avoid depending on libjetty-extra-java
-# and pulling in dependencies that we don't care about
-pkg-temp/lib/commons-el.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-java5-threadpool.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
-pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
-
-# dummy file (copying in case a plugin tries to load it directly)
-pkg-temp/lib/jasper-compiler.jar usr/share/i2p/lib
+pkg-temp/lib/systray.jar usr/share/i2p/lib

debian/i2p-router.links

@@ -3,24 +3,4 @@ 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
 
-# From libcommons-logging-java
-usr/share/java/commons-logging.jar usr/share/i2p/lib/commons-logging.jar
-
-# From libtomcat6-java
-usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
-usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
-usr/share/java/tomcat-juli.jar usr/share/i2p/lib/tomcat-juli.jar
-## Used by some plugins, such as Pebble. Might be good to include it
-## since we use libtomcat6-java anyway
 usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
-
-# From libjetty-java
-usr/share/java/jetty.jar usr/share/i2p/lib/org.mortbay.jetty.jar
-usr/share/java/jetty-util.jar usr/share/i2p/lib/jetty-util.jar
-usr/share/java/jetty-sslengine.jar usr/share/i2p/lib/jetty-sslengine.jar
-usr/share/java/jetty-start.jar usr/share/i2p/lib/jetty-start.jar
-
-# From libservlet2.5-java
-usr/share/java/servlet-api-2.5.jar usr/share/i2p/lib/servlet-api.jar
-usr/share/java/jsp-api-2.1.jar usr/share/i2p/lib/jsp-api.jar
-usr/share/java/el-api-2.1.jar usr/share/i2p/lib/el-api.jar