From d888d4834d3151bf72629ed054aff2d1ced61e65 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Tue, 3 Apr 2012 21:17:14 +0000
Subject: [PATCH] Debian: update symlinks

---
 debian/i2p-router.install |  4 ++++
 debian/i2p-router.links   | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/i2p-router.install b/debian/i2p-router.install
index aa9d9703e..a4e125a2b 100644
--- a/debian/i2p-router.install
+++ b/debian/i2p-router.install
@@ -42,3 +42,7 @@ pkg-temp/lib/systray4j.jar usr/share/i2p/lib
 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
diff --git a/debian/i2p-router.links b/debian/i2p-router.links
index c33f4e3f4..574d2bc36 100644
--- a/debian/i2p-router.links
+++ b/debian/i2p-router.links
@@ -5,13 +5,17 @@ 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.jar
+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/jetty.jar
+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
@@ -22,4 +26,5 @@ 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
 
 # from glassfish-javaee
-/usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/glassfish-javaee.jar
+## some I2P plugins explicitly look for jstl.jar when building
+/usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar