diff --git a/debian-alt/doc/dependencies.txt b/debian-alt/doc/dependencies.txt index 5a307a2a2b..044d2fbdaa 100644 --- a/debian-alt/doc/dependencies.txt +++ b/debian-alt/doc/dependencies.txt @@ -25,10 +25,6 @@ Current Runtime Dependencies We require openjdk-7-java to build, and any Java 7, 8, or 9 runtime to run. Java 9 may still have some issues; see https://trac.i2p2.de/ticket/1870 for status -* libecj-java - This is for compilation on-the-fly of webapps, but we don't really support that, - not sure why it's in there, to be researched, candidate for removal. - * geoip-database In non-Debian builds we bundle our own geoip data; for Debian builds we use the system data. diff --git a/debian-alt/xenial/i2p-router.links b/debian-alt/xenial/i2p-router.links index 5fd470ffa3..9091e0e960 100644 --- a/debian-alt/xenial/i2p-router.links +++ b/debian-alt/xenial/i2p-router.links @@ -3,7 +3,6 @@ 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 # comment out if not building with libjetty9-java diff --git a/debian/apparmor/i2p b/debian/apparmor/i2p index 224356849c..b4039df224 100644 --- a/debian/apparmor/i2p +++ b/debian/apparmor/i2p @@ -63,6 +63,7 @@ /usr/share/java/standard.jar r, /usr/share/java/standard-*.jar r, /usr/share/java/tomcat8-*.jar r, + /usr/share/java/taglibs-standard-*.jar r, # GeoIP data /usr/share/GeoIP/* r, diff --git a/debian/control b/debian/control index 0e51a2c737..1f3dd98e64 100644 --- a/debian/control +++ b/debian/control @@ -76,7 +76,6 @@ Section: net Priority: optional Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, openjdk-9-jre-headless | openjdk-8-jre-headless | openjdk-7-jre-headless | default-jre-headless | java9-runtime-headless | java8-runtime-headless | java7-runtime-headless, - libecj-java, geoip-database, gettext-base, libgetopt-java, diff --git a/debian/i2p-router.links b/debian/i2p-router.links index fe0970d41e..fb535be9b5 100644 --- a/debian/i2p-router.links +++ b/debian/i2p-router.links @@ -3,7 +3,6 @@ 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 # comment out if not building with libjetty9-java