From 53c7f7d6025e8c3575853a5b9e5665fe96e1934b Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Thu, 26 Apr 2012 18:19:48 +0000
Subject: [PATCH] use our jstl.jar instead of glassfish
---
debian/control | 1 -
debian/i2p-router.install | 1 +
debian/i2p-router.links | 5 -----
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/debian/control b/debian/control
index 3b68354d7a..7941f4617a 100644
--- a/debian/control
+++ b/debian/control
@@ -70,7 +70,6 @@ Section: net
Priority: optional
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
default-jre-headless | java5-runtime-headless | java6-runtime-headless,
- glassfish-javaee,
libcommons-logging-java,
libjetty-java,
libtomcat6-java
diff --git a/debian/i2p-router.install b/debian/i2p-router.install
index a4e125a2bd..c6f649c8ff 100644
--- a/debian/i2p-router.install
+++ b/debian/i2p-router.install
@@ -28,6 +28,7 @@ pkg-temp/lib/i2psnark.jar usr/share/i2p/lib
pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib
pkg-temp/lib/jetty-i2p.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/routerconsole.jar usr/share/i2p/lib
diff --git a/debian/i2p-router.links b/debian/i2p-router.links
index 96ced7debb..f66cafb4a1 100644
--- a/debian/i2p-router.links
+++ b/debian/i2p-router.links
@@ -24,8 +24,3 @@ usr/share/java/jetty-start.jar usr/share/i2p/lib/jetty-start.jar
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
-
-# from glassfish-javaee
-## some I2P plugins explicitly look for jstl.jar when building, but linking this
-## to jstl.jar caused SusiDNS and I2P-Bote to break.
-/usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/glassfish-javaee.jar
--
GitLab