use our jstl.jar instead of glassfish

This commit is contained in:
kytv
2012-04-26 18:19:48 +00:00
parent 3ccc102412
commit 53c7f7d602
3 changed files with 1 additions and 6 deletions

1
debian/control vendored
View File

@@ -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

View File

@@ -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

View File

@@ -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