Changeset 0703a29 for debian-alt


Ignore:
Timestamp:
Mar 11, 2017 3:24:23 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
aea20a5
Parents:
072d990 (diff), db0381d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p.zzz.jetty9' (head 80022f6ef552acd1382d45103969aa7c17b1d794)

to branch 'i2p.i2p' (head 3b4b418ae8be95d52228fc7c325fc52e0223e4fe)

Location:
debian-alt
Files:
9 added
10 edited

Legend:

Unmodified
Added
Removed
  • debian-alt/README.txt

    r072d990 r0703a29  
    1 The files in ../debian/ are for jessie/stable.
     1The files in ../debian/ are for stretch.
     2You may also use them for jessie if you have libjetty9-java from jessie-backports.
     3
    24Alternates are in the subdirectories here.
     5To use them, copy them over the files in ../debian/  .
    36
    4 trusty may be copied to utopic, vivid, wily, xenial.
     7Built file compatibility:
     8trusty may be copied to vivid.
     9trusty may be used for jessie without libjetty9-java from backports.
     10xenial may be copied to yakkety, zesty.
    511
    612tails-jessie and tails-wheezy are currently the same as
  • debian-alt/doc/dependencies.txt

    r072d990 r0703a29  
    4242  In non-Debian builds we bundle the source code; it's removed in the Debian source package.
    4343
    44 * libjetty8-java
    45   For /usr/share/java/jetty8-*.jar.
     44* libjetty9-java
     45  For /usr/share/java/jetty9-*.jar.
    4646  In non-Debian builds we bundle the jars; it's removed in the Debian source package.
    4747  For some Debian and Ubuntu releases, these seem to be much older than what we're bundling,
     
    5353  Jetty 9 ticket is https://trac.i2p2.de/ticket/1512
    5454  Updating Jetty may break external plugins. Extensive testing is required.
    55   Note that the libjetty8-java dependency brings in libservlet3.0-java which we require.
     55  Note that the libjetty9-java dependency brings in libservlet3.0-java which we require.
    5656
    5757* glassfish-javaee
  • debian-alt/precise/control

    r072d990 r0703a29  
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
    10  ,ant-optional
    1110 ,debconf
    1211 ,openjdk-7-jdk
     
    7776Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    7877 openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless,
    79  libecj-java,
    8078 geoip-database,
    8179 gettext-base,
  • debian-alt/precise/i2p-router.install

    r072d990 r0703a29  
    3535
    3636
    37 # uncomment if not building with libjetty8-java
     37# uncomment if not building with libjetty9-java
    3838# ubuntu: in trusty vivid wily xenial
    3939# debian: in wheezy jessie stretch sid
     
    5252pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
    5353pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
    54 # following two are from libservlet3.0-java which is a dependency of libjetty8-java
    55 pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    5654
    5755
    58 # uncomment if not building with either libtomcat6-java or libtomcat7-java
     56# uncomment if not building with libtomcat8-java
    5957pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    6058# legacy name, contains only tomcat-juli, not commons-logging
    6159pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
    6260pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     61pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    6362
    6463
  • debian-alt/precise/i2p-router.links

    r072d990 r0703a29  
    44usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
    55
    6 usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
     6
     7# comment out if not building with libjetty9-java
     8# ubuntu: in trusty vivid wily xenial
     9# debian: in wheezy jessie stretch sid
     10#usr/share/java/jetty9-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
     11#usr/share/java/jetty9-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
     12#usr/share/java/jetty9-http.jar usr/share/i2p/lib/jetty-http.jar
     13#usr/share/java/jetty9-io.jar usr/share/i2p/lib/jetty-io.jar
     14# legacy name in lib/
     15#usr/share/java/jetty9-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
     16#usr/share/java/jetty9-security.jar usr/share/i2p/lib/jetty-security.jar
     17#usr/share/java/jetty9-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
     18#usr/share/java/jetty9-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
     19#usr/share/java/jetty9-start.jar usr/share/i2p/lib/jetty-start.jar
     20#usr/share/java/jetty9-util.jar usr/share/i2p/lib/jetty-util.jar
     21#usr/share/java/jetty9-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
     22#usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar
     23# legacy name in lib/
     24#usr/share/java/jetty9-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
     25# legacy name in lib/
     26#usr/share/java/jetty9-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
     27# following two are from libservlet3.1-java which is a dependency of libjetty9-java
     28# legacy name in lib/
     29#usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar
     30# combined into javax.servlet.jar in non-package builds
     31#usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
    732
    833
    9 # comment out if not building with libjetty8-java
    10 # ubuntu: in trusty vivid wily xenial
    11 # debian: in wheezy jessie stretch sid
    12 #usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
    13 #usr/share/java/jetty8-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
    14 #usr/share/java/jetty8-http.jar usr/share/i2p/lib/jetty-http.jar
    15 #usr/share/java/jetty8-io.jar usr/share/i2p/lib/jetty-io.jar
     34# comment out if not building with libtomcat8-java
     35# ubuntu: only in xenial+
     36# debian: wheezy-backports, jessie+
     37# legacy name, contains only tomcat-juli, not commons-logging
     38#usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
     39#usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
     40# combined into jasper-runtime.jar in non-package builds
     41#usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
     42#usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
     43#usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
     44#usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
     45# combined into commons-el.jar in non-package builds
     46#usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
    1647# legacy name in lib/
    17 #usr/share/java/jetty8-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
    18 #usr/share/java/jetty8-security.jar usr/share/i2p/lib/jetty-security.jar
    19 #usr/share/java/jetty8-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
    20 #usr/share/java/jetty8-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
    21 #usr/share/java/jetty8-start.jar usr/share/i2p/lib/jetty-start.jar
    22 #usr/share/java/jetty8-util.jar usr/share/i2p/lib/jetty-util.jar
    23 #usr/share/java/jetty8-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
    24 #usr/share/java/jetty8-xml.jar usr/share/i2p/lib/jetty-xml.jar
    25 # legacy name in lib/
    26 #usr/share/java/jetty8-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
    27 # legacy name in lib/
    28 #usr/share/java/jetty8-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
    29 # following two are from libservlet3.0-java which is a dependency of libjetty8-java
    30 # legacy name in lib/
    31 #usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
    32 # combined into javax.servlet.jar in non-package builds
    33 #usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
    34 
    35 
    36 # comment out if not building with libtomcat6-java
    37 # ubuntu: only in precise trusty vivid
    38 # debian: only in wheezy
    39 # legacy name, contains only tomcat-juli, not commons-logging
    40 #usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
    41 #usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
    42 # combined into jasper-runtime.jar in non-package builds
    43 #usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
    44 # combined into commons-el.jar in non-package builds
    45 #usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
    46 # following is from libservlet2.5-java which is a dependency of libtomcat6-java
    47 # legacy name in lib/
    48 #usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
    49 
    50 
    51 # comment out if not building with libtomcat7-java
    52 # ubuntu: only in precise trusty vivid
    53 # debian: only in wheezy
    54 # legacy name, contains only tomcat-juli, not commons-logging
    55 #usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
    56 #usr/share/java/tomcat-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
    57 # combined into jasper-runtime.jar in non-package builds
    58 #usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
    59 # tomcat 7 only
    60 #usr/share/java/tomcat-api.jar usr/share/i2p/lib/tomcat-api.jar
    61 #usr/share/java/tomcat-util.jar usr/share/i2p/lib/tomcat-util.jar
    62 # combined into commons-el.jar in non-package builds
    63 #usr/share/java/tomcat-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
    64 # following is from libservlet3.0-java which is a dependency of libtomcat7-java
    65 # legacy name in lib/
    66 #usr/share/java/el-api-2.2.jar usr/share/i2p/lib/commons-el.jar
     48#usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
     49#usr/share/java/tomcat8-servlet-api.jar usr/share/i2p/lib/javax.servlet.jar
     50#usr/share/java/tomcat8-jsp-api.jar usr/share/i2p/lib/jsp-api.jar
    6751
    6852
  • debian-alt/precise/rules

    r072d990 r0703a29  
    8585        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    8686
    87         @# ubuntu: not in precise
    88         @# debian: in wheezy jessie stretch sid
    89         @#/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
     87        @# ubuntu: in xenial
     88        @# debian: in jessie-backports stretch sid
     89        @#/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    9090        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    91         @#ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
    92         @#ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
    93         @#ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
    94         @#ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
    95         @#ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
    96         @#ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
    97         @#ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
    98         @#ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
    99         @#ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
    100         @#ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
    101         @#ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
    102         @#ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
    103         @#ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
    104         @#ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
    105         @# following two are from libservlet3.0-java which is a dependency of libjetty8-java
    106         @#ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    107         @#ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    108 
    109         @# ubuntu: only in precise trusty vivid
    110         @# debian: only in wheezy
    111         @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
     91        @#ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
     92        @#ln -sf /usr/share/java/jetty9-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
     93        @#ln -sf /usr/share/java/jetty9-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
     94        @#ln -sf /usr/share/java/jetty9-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
     95        @#ln -sf /usr/share/java/jetty9-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
     96        @#ln -sf /usr/share/java/jetty9-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
     97        @#ln -sf /usr/share/java/jetty9-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
     98        @#ln -sf /usr/share/java/jetty9-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
     99        @#ln -sf /usr/share/java/jetty9-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
     100        @#ln -sf /usr/share/java/jetty9-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
     101        @#ln -sf /usr/share/java/jetty9-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
     102        @#ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
     103        @#ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
     104        @#ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
     105        @# following two are from libservlet3.1-java which is a dependency of libjetty9-java
     106        @#ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     107        @#ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
     108
     109        @# debian and ubuntu: wheezy-backports, jessie+, xenial+
     110        @#/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
    112111        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    113         @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    114         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    115         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    116         @#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    117         @# following is from libservlet2.5-java which is a dependency of libtomcat6-java
    118         @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    119 
    120         @# debian and ubuntu: everywhere
    121         @#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
    122         @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    123         @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    124         @#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
    125         @#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    126         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    127         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    128         @#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    129         @# following is from libservlet3.0-java which is a dependency of libtomcat7-java
    130         @#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     112        @#ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     113        @#ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     114        @#ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     115        @#ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     116        @#ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     117        @#ln -sf /usr/share/java/tomcat8-jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
     118        @#ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     119        @#ln -sf /usr/share/java/tomcat8-servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     120        @#ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
     121        @#ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
    131122
    132123        @# debian and ubuntu: everywhere
  • debian-alt/trusty/rules

    r072d990 r0703a29  
    8484        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    8585
    86         @# ubuntu: not in precise
    87         @# debian: in wheezy jessie stretch sid
    88         @/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
    89         mkdir -p $(CURDIR)/apps/jetty/jettylib
    90         ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
    91         ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
    92         ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
    93         ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
    94         ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
    95         ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
    96         ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
    97         ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
    98         ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
    99         ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
    100         ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
    101         ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
    102         ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
    103         ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
    104         @# following two are from libservlet3.0-java which is a dependency of libjetty8-java
    105         ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    106         ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    107 
    108         @# ubuntu: only in precise trusty vivid
    109         @# debian: only in wheezy
    110         @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
     86        @# ubuntu: in xenial
     87        @# debian: in jessie-backports stretch sid
     88        @#/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    11189        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    112         @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    113         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    114         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    115         @#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    116         @# following is from libservlet2.5-java which is a dependency of libtomcat6-java
    117         @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    118 
    119         @# debian and ubuntu: everywhere
    120         @#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
     90        @#ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
     91        @#ln -sf /usr/share/java/jetty9-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
     92        @#ln -sf /usr/share/java/jetty9-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
     93        @#ln -sf /usr/share/java/jetty9-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
     94        @#ln -sf /usr/share/java/jetty9-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
     95        @#ln -sf /usr/share/java/jetty9-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
     96        @#ln -sf /usr/share/java/jetty9-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
     97        @#ln -sf /usr/share/java/jetty9-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
     98        @#ln -sf /usr/share/java/jetty9-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
     99        @#ln -sf /usr/share/java/jetty9-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
     100        @#ln -sf /usr/share/java/jetty9-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
     101        @#ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
     102        @#ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
     103        @#ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
     104        @# following two are from libservlet3.1-java which is a dependency of libjetty9-java
     105        @#ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     106        @#ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
     107
     108        @# debian and ubuntu: wheezy-backports, jessie+, xenial+
     109        @#/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
    121110        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    122         @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    123         @#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
    124         @#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    125         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    126         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    127         @#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    128         @# following is from libservlet3.0-java which is a dependency of libtomcat7-java
    129         @#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     111        @#ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     112        @#ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     113        @#ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     114        @#ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     115        @#ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     116        @#ln -sf /usr/share/java/tomcat8-jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
     117        @#ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     118        @#ln -sf /usr/share/java/tomcat8-servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     119        @#ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
     120        @#ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
    130121
    131122        @# debian and ubuntu: everywhere
  • debian-alt/wheezy/control

    r072d990 r0703a29  
    11Source: i2p
    2 Maintainer: Kill Your TV <killyourtv@i2pmail.org>
     2Maintainer: zzz <zzz@i2pmail.org>
    33Section: net
    44Standards-Version: 3.9.6
     
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
    10  ,ant-optional
    1110 ,debconf
    12  ,default-jdk | openjdk-7-jdk | openjdk-6-jdk
     11 ,default-jdk | openjdk-7-jdk
     12 ,libtomcat8-java
     13 ,glassfish-javaee
    1314 ,gettext
    1415 ,dh-apparmor
     
    7273Priority: optional
    7374Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    74  openjdk-8-jre-headless | openjdk-7-jre-headless | openjdk-6-jre-headless | default-jre-headless | java8-runtime-headless | java7-runtime-headless | java6-runtime-headless, libecj-java
     75 openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless,
     76 libtomcat8-java,
     77 geoip-database,
     78 gettext-base,
     79 libgetopt-java,
     80 glassfish-javaee
    7581Replaces: i2p ( << 0.8.6-5)
    7682Breaks: i2p (<< 0.8.6-5)
  • debian-alt/xenial/control

    r072d990 r0703a29  
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
    10  ,ant-optional
    1110 ,debconf
    1211 ,openjdk-8-jdk
     12 ,libjetty9-java
    1313 ,glassfish-javaee
     14 ,libtomcat8-java
    1415 ,dh-apparmor
    1516 ,gettext
     
    7475Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    7576 openjdk-8-jre-headless | java8-runtime-headless,
    76  libecj-java,
     77 libjetty9-java,
     78 glassfish-javaee,
     79 libtomcat8-java,
    7780 geoip-database,
    7881 gettext-base,
    7982 libgetopt-java,
    80  glassfish-javaee
    8183Replaces: i2p ( << 0.8.6-5)
    8284Breaks: i2p (<< 0.8.6-5)
  • debian-alt/xenial/rules

    r072d990 r0703a29  
    8484        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    8585
    86         @# ubuntu: not in precise
    87         @# debian: in wheezy jessie stretch sid
    88         @/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
     86        @# ubuntu: in xenial
     87        @# debian: in jessie-backports stretch sid
     88        @/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    8989        mkdir -p $(CURDIR)/apps/jetty/jettylib
    90         ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
    91         ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
    92         ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
    93         ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
    94         ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
    95         ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
    96         ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
    97         ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
    98         ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
    99         ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
    100         ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
    101         ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
    102         ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
    103         ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
    104         @# following two are from libservlet3.0-java which is a dependency of libjetty8-java
    105         ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    106         ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    107 
    108         @# ubuntu: only in precise trusty vivid
    109         @# debian: only in wheezy
    110         @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
    111         @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    112         @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    113         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    114         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    115         @#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    116         @# following is from libservlet2.5-java which is a dependency of libtomcat6-java
    117         @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    118 
    119         @# debian and ubuntu: everywhere
    120         @#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
    121         @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    122         @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    123         @#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
    124         @#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    125         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    126         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    127         @#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    128         @# following is from libservlet3.0-java which is a dependency of libtomcat7-java
    129         @#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     90        ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
     91        ln -sf /usr/share/java/jetty9-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
     92        ln -sf /usr/share/java/jetty9-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
     93        ln -sf /usr/share/java/jetty9-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
     94        ln -sf /usr/share/java/jetty9-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
     95        ln -sf /usr/share/java/jetty9-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
     96        ln -sf /usr/share/java/jetty9-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
     97        ln -sf /usr/share/java/jetty9-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
     98        ln -sf /usr/share/java/jetty9-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
     99        ln -sf /usr/share/java/jetty9-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
     100        ln -sf /usr/share/java/jetty9-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
     101        ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
     102        ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
     103        ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
     104        @# following two are from libservlet3.1-java which is a dependency of libjetty9-java
     105        ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     106        @# this is roughly the same as tomcat8-jsp-api.jar, we use this one
     107        ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
     108
     109        @# debian and ubuntu: wheezy-backports, jessie+, xenial+
     110        @/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
     111        mkdir -p $(CURDIR)/apps/jetty/jettylib
     112        ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     113        ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     114        ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     115        ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     116        ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     117        ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     118        ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
     119        ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
    130120
    131121        @# debian and ubuntu: everywhere
Note: See TracChangeset for help on using the changeset viewer.