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

Debian: Change dependency from transitional package libservlet3.1-java

Browse Source 
to libjsp-api-java and libservlet-api-java
and update symbolic links to the jars in /usr/share/java
Note that the previous symlink to servlet-api-3.1.jar was
another symlink to servlet-api.jar which was actually API 4 anyway.
This commit is contained in:
zzz
2022-10-19 12:33:06 -04:00
parent d2d9a067ce
commit bed4563257
7 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
debian-alt/bionic/control
View File

@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 9.20160709)
,debconf
,openjdk-8-jdk
,libjetty9-java (>= 9.4)
,libservlet3.1-java
,libjsp-api-java
,libservlet-api-java
,libtaglibs-standard-jstlel-java
,libtomcat9-java
,dh-apparmor
@ -81,7 +82,8 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
libgetopt-java,
libjson-simple-java (>= 2),libjson-simple-java (<< 3),
libjetty9-java (>= 9.4),
libservlet3.1-java,
libjsp-api-java,
libservlet-api-java,
libtaglibs-standard-jstlel-java,
libtomcat9-java,
famfamfam-flag-png

5
debian-alt/bionic/i2p-router.links
View File

@ -26,11 +26,10 @@ usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar
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
usr/share/java/servlet-api.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
usr/share/java/jsp-api.jar usr/share/i2p/lib/jsp-api.jar
# comment out if not building with libtomcat9-java

8
debian-alt/bionic/rules
View File

@ -108,10 +108,10 @@ endif
ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
@# following two are from libservlet3.1-java which is a dependency of libjetty9-java
ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
@# this is roughly the same as tomcat9-jsp-api.jar, we use this one
ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
@# following two are formerly from libservlet3.1-java, now in their own packages
ln -sf /usr/share/java/servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
@# this is roughly the same as tomcat8-jsp-api.jar, we use this one
ln -sf /usr/share/java/jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
@# debian and ubuntu: wheezy-backports, jessie+, xenial+
@/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties

6
debian-alt/focal/rules
View File

@ -106,10 +106,10 @@ endif
ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
@# following two are from libservlet3.1-java which is a dependency of libjetty9-java
ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
@# following two are formerly from libservlet3.1-java, now in their own packages
ln -sf /usr/share/java/servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
@# this is roughly the same as tomcat8-jsp-api.jar, we use this one
ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
ln -sf /usr/share/java/jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
@# debian and ubuntu: buster, disco
@/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties

6
debian/control vendored
View File

@ -12,7 +12,8 @@ Build-Depends: debhelper (>= 9.20160709)
,debconf
,default-jdk
,libjetty9-java (>= 9.4)
,libservlet3.1-java
,libjsp-api-java
,libservlet-api-java
,libtaglibs-standard-jstlel-java
,libtomcat9-java
,dh-apparmor
@ -85,7 +86,8 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
libgetopt-java,
libjson-simple-java (>= 2),libjson-simple-java (<< 3),
libjetty9-java (>= 9.4),
libservlet3.1-java,
libjsp-api-java,
libservlet-api-java,
libtaglibs-standard-jstlel-java,
libtomcat9-java,
famfamfam-flag-png,

6
debian/i2p-router.links vendored
View File

@ -30,11 +30,10 @@ usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar
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
usr/share/java/servlet-api.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
usr/share/java/jsp-api.jar usr/share/i2p/lib/jsp-api.jar
# comment out if not building with libtomcat9-java
@ -50,6 +49,7 @@ usr/share/java/tomcat9-util.jar usr/share/i2p/lib/tomcat-util.jar
usr/share/java/tomcat9-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
# combined into commons-el.jar in non-package builds
usr/share/java/tomcat9-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
-# following two are formerly from libservlet3.1-java, now in their own packages
# legacy name in lib/
usr/share/java/tomcat9-el-api.jar usr/share/i2p/lib/commons-el.jar
# tomcat9 pulls in libeclipse-jdk-core-java, link to it for eepsite webapps needing a compiler

6
debian/rules vendored
View File

@ -118,10 +118,10 @@ endif
ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
@# following two are from libservlet3.1-java which is a dependency of libjetty9-java
ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
@# following two are formerly from libservlet3.1-java, now in their own packages
ln -sf /usr/share/java/servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
@# this is roughly the same as tomcat8-jsp-api.jar, we use this one
ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
ln -sf /usr/share/java/jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
@# debian and ubuntu: buster, disco
@/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties