Debian: Replace glassfish-javaee with libtaglibs-standard-* (ticket #2093)

Only for stretch and later, zesty and later
Copy more files for previous stretch setup to xenial
This commit is contained in:
zzz
2017-11-25 18:59:04 +00:00
parent 7f6ba8cd15
commit a3a17a4f32
15 changed files with 228 additions and 37 deletions

View File

@@ -0,0 +1,74 @@
# history.txt is installed to /usr/share/i2p because
# it's shown in the router console at http://127.0.0.1:7657
# (this is also why I don't use dh_installchangelogs -k for it)
history.txt usr/share/i2p
pkg-temp/blocklist.txt usr/share/i2p
pkg-temp/certificates usr/share/i2p
pkg-temp/clients.config usr/share/i2p
pkg-temp/docs usr/share/i2p/
pkg-temp/eepget usr/bin
pkg-temp/eepsite usr/share/i2p
pkg-temp/geoip usr/share/i2p
pkg-temp/hosts.txt usr/share/i2p
pkg-temp/i2prouter-nowrapper usr/bin
pkg-temp/i2psnark.config usr/share/i2p
pkg-temp/i2ptunnel.config usr/share/i2p
pkg-temp/router.config usr/share/i2p
pkg-temp/systray.config usr/share/i2p
pkg-temp/webapps usr/share/i2p
pkg-temp/lib/addressbook.jar usr/share/i2p/lib
pkg-temp/lib/BOB.jar usr/share/i2p/lib
pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
pkg-temp/lib/i2p.jar usr/share/i2p/lib
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/mstreaming.jar usr/share/i2p/lib
pkg-temp/lib/routerconsole.jar usr/share/i2p/lib
pkg-temp/lib/router.jar usr/share/i2p/lib
pkg-temp/lib/sam.jar usr/share/i2p/lib
pkg-temp/lib/streaming.jar usr/share/i2p/lib
pkg-temp/lib/systray.jar usr/share/i2p/lib
# uncomment if not building with libjetty9-java
# ubuntu: in trusty vivid wily xenial
# debian: in wheezy jessie stretch sid
#pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
#pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib
#pkg-temp/lib/jetty-http.jar usr/share/i2p/lib
#pkg-temp/lib/jetty-io.jar usr/share/i2p/lib
#pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
#pkg-temp/lib/jetty-security.jar usr/share/i2p/lib
#pkg-temp/lib/jetty-servlet.jar usr/share/i2p/lib
#pkg-temp/lib/jetty-servlets.jar usr/share/i2p/lib
#pkg-temp/lib/jetty-start.jar usr/share/i2p/lib
#pkg-temp/lib/jetty-util.jar usr/share/i2p/lib
#pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib
#pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
#pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
#pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
# following two are from libservlet3.0-java which is a dependency of libjetty9-java
#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
# uncomment if not building with libtomcat8-java
#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
# uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
# ubuntu and debian: everywhere
# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
pkg-temp/lib/jstl.jar usr/share/i2p/lib
# uncomment if not building with either glassfish-javaee or libjstl1.1-java
# ubuntu and debian: everywhere
#pkg-temp/lib/standard.jar usr/share/i2p/lib

View File

@@ -0,0 +1,86 @@
usr/share/common-licenses/GPL-2 usr/share/doc/i2p-router/licenses/LICENSE-GPLv2.txt
usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGPLv2.1.txt
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
# ubuntu: in trusty vivid wily xenial
# debian: in wheezy jessie stretch sid
usr/share/java/jetty9-apache-jsp.jar usr/share/i2p/lib/jetty-apache-jsp.jar
usr/share/java/jetty9-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
usr/share/java/jetty9-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
usr/share/java/jetty9-http.jar usr/share/i2p/lib/jetty-http.jar
usr/share/java/jetty9-io.jar usr/share/i2p/lib/jetty-io.jar
# legacy name in lib/
usr/share/java/jetty9-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
usr/share/java/jetty9-security.jar usr/share/i2p/lib/jetty-security.jar
usr/share/java/jetty9-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
usr/share/java/jetty9-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
usr/share/java/jetty9-start.jar usr/share/i2p/lib/jetty-start.jar
usr/share/java/jetty9-util.jar usr/share/i2p/lib/jetty-util.jar
usr/share/java/jetty9-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar
# legacy name in lib/
usr/share/java/jetty9-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
# legacy name in lib/
usr/share/java/jetty9-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
# following two are from libservlet3.1-java which is a dependency of libjetty9-java
# legacy name in lib/
usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar
# combined into javax.servlet.jar in non-package builds
usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
# comment out if not building with libtomcat8-java
# 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
# 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
# combined into commons-el.jar in non-package builds
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
# comment out if not building with glassfish-javaee
# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
#usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
# comment out if not building with libjakarta-taglibs-standard-java
# ubuntu and debian: everywhere
#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
# comment out if not building with libjstl1.1-java
# ubuntu and debian: everywhere
#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar
# comment out if not building with gettext-base
# ubuntu and debian: everywhere
usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
# comment out if not building with libgetopt-java
# ubuntu and debian: everywhere
usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
# comment out if not building with libhttpclient-java and libhttpcore-java
# 2 MB of dependencies vs. 20 KB of copied source
# Requires 4.4 or higher.
# Debian: Not in wheezy/jessie
# Ubuntu: Only in wily and later
#usr/share/java/httpclient.jar usr/share/i2p/lib/httpclient.jar
#usr/share/java/httpcore.jar usr/share/i2p/lib/httpcore.jar