AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debian: Revert previous checkin for trusty, it does not have libtomcat8-java

Browse Source
This commit is contained in:
zzz
2017-03-04 14:41:21 +00:00
parent f38ee48ca3
commit 87cff00b99
4 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian-alt/trusty/control
View File

@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 7.0.50~)
# Ant requires java 6 tools.jar:
# Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar
,openjdk-6-jdk
,libtomcat8-java
,dh-apparmor
,gettext
,libgetopt-java
@@ -75,7 +74,6 @@ Section: net
Priority: optional
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless,
libtomcat8-java,
geoip-database,
gettext-base,
libgetopt-java,

8
debian-alt/trusty/i2p-router.install
View File

@@ -54,11 +54,11 @@ pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
# uncomment if not building with libtomcat8-java
#pkg-temp/lib/commons-el.jar usr/share/i2p/lib
pkg-temp/lib/commons-el.jar usr/share/i2p/lib
# legacy name, contains only tomcat-juli, not commons-logging
#pkg-temp/lib/commons-logging.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/commons-logging.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
# uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java

20
debian-alt/trusty/i2p-router.links
View File

@@ -35,19 +35,19 @@ usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
# ubuntu: only in xenial+
# debian: wheezy-backports, jessie+
# legacy name, contains only tomcat-juli, not commons-logging
usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
#usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
#usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
# combined into jasper-runtime.jar in non-package builds
usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
#usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
#usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
#usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
#usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
# combined into commons-el.jar in non-package builds
usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
#usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
# legacy name in lib/
usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
usr/share/java/tomcat8-servlet-api.jar usr/share/i2p/lib/javax.servlet.jar
usr/share/java/tomcat8-jsp-api.jar usr/share/i2p/lib/jsp-api.jar
#usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
#usr/share/java/tomcat8-servlet-api.jar usr/share/i2p/lib/javax.servlet.jar
#usr/share/java/tomcat8-jsp-api.jar usr/share/i2p/lib/jsp-api.jar
# comment out if not building with glassfish-javaee

24
debian-alt/trusty/rules
View File

@@ -106,18 +106,18 @@ endif
@#ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
@# debian and ubuntu: wheezy-backports, jessie+, xenial+
@/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
mkdir -p $(CURDIR)/apps/jetty/jettylib
ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
ln -sf /usr/share/java/tomcat8-jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
ln -sf /usr/share/java/tomcat8-servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
@#/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
@#mkdir -p $(CURDIR)/apps/jetty/jettylib
@#ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
@#ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
@#ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
@#ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
@#ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
@#ln -sf /usr/share/java/tomcat8-jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
@#ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
@#ln -sf /usr/share/java/tomcat8-servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
@#ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
@#ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
@# debian and ubuntu: everywhere
@/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties