Changeset f38ee48 for debian-alt


Ignore:
Timestamp:
Mar 4, 2017 2:24:48 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
87cff00
Parents:
ec6c244
Message:

Move setting of InstanceManager? to WebAppConfiguration? to avoid race
Fix up LICENSES.txt
Build.xml cleanup
Debian:

  • Add support for with-libtomcat8-java but not with-libjetty9-java for wheezy/jessie
  • Fix wheezy/precise/trusty build files to use tomcat8 but not jetty9 packages
  • Remove build dependency on ant-optional, not required
  • Remove some remaining eclipse-ecj dependencies
  • Add short README files for wheezy and jessie
Location:
debian-alt
Files:
2 added
12 edited

Legend:

Unmodified
Added
Removed
  • debian-alt/README.txt

    rec6c244 rf38ee48  
    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/precise/control

    rec6c244 rf38ee48  
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
    10  ,ant-optional
    1110 ,debconf
    1211 ,openjdk-7-jdk
     
    1413# Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar
    1514 ,openjdk-6-jdk
     15 ,libtomcat8-java
    1616 ,glassfish-javaee
    1717 ,dh-apparmor
     
    7777Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    7878 openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless,
    79  libecj-java,
     79 libtomcat8-java,
    8080 geoip-database,
    8181 gettext-base,
  • debian-alt/precise/i2p-router.install

    rec6c244 rf38ee48  
    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.1-java which is a dependency of libjetty9-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
    59 pkg-temp/lib/commons-el.jar usr/share/i2p/lib
     56# uncomment if not building with libtomcat8-java
     57#pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    6058# legacy name, contains only tomcat-juli, not commons-logging
    61 pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
    62 pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     59#pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
     60#pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     61#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    6362
    6463
  • debian-alt/precise/i2p-router.links

    rec6c244 rf38ee48  
    33usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
    44usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
    5 
    6 usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
    75
    86
     
    3230# combined into javax.servlet.jar in non-package builds
    3331#usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
     32
     33
     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
     38usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
     39usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
     40# combined into jasper-runtime.jar in non-package builds
     41usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
     42usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
     43usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
     44usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
     45# combined into commons-el.jar in non-package builds
     46usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
     47# legacy name in lib/
     48usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
     49usr/share/java/tomcat8-servlet-api.jar usr/share/i2p/lib/javax.servlet.jar
     50usr/share/java/tomcat8-jsp-api.jar usr/share/i2p/lib/jsp-api.jar
    3451
    3552
  • debian-alt/precise/rules

    rec6c244 rf38ee48  
    8585        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    8686
    87         @# ubuntu: not in precise
    88         @# debian: in wheezy jessie stretch sid
     87        @# ubuntu: in xenial
     88        @# debian: in jessie-backports stretch sid
    8989        @#/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    9090        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     
    107107        @#ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    108108
     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-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
     122
    109123        @# debian and ubuntu: everywhere
    110124        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
  • debian-alt/trusty/control

    rec6c244 rf38ee48  
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
    10  ,ant-optional
    1110 ,debconf
    1211 ,openjdk-7-jdk
     
    1413# Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar
    1514 ,openjdk-6-jdk
     15 ,libtomcat8-java
    1616 ,dh-apparmor
    1717 ,gettext
     
    7676Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    7777 openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless,
    78  libecj-java,
     78 libtomcat8-java,
    7979 geoip-database,
    8080 gettext-base,
  • debian-alt/trusty/i2p-router.install

    rec6c244 rf38ee48  
    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 libjetty9-java
    55 pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    5654
    5755
    5856# uncomment if not building with libtomcat8-java
    59 pkg-temp/lib/commons-el.jar usr/share/i2p/lib
     57#pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    6058# legacy name, contains only tomcat-juli, not commons-logging
    61 pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
    62 pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     59#pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
     60#pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     61#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    6362
    6463
  • debian-alt/trusty/i2p-router.links

    rec6c244 rf38ee48  
    33usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
    44usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
    5 
    6 usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
    75
    86
     
    3230# combined into javax.servlet.jar in non-package builds
    3331#usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
     32
     33
     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
     38usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
     39usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
     40# combined into jasper-runtime.jar in non-package builds
     41usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
     42usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
     43usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
     44usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
     45# combined into commons-el.jar in non-package builds
     46usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
     47# legacy name in lib/
     48usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
     49usr/share/java/tomcat8-servlet-api.jar usr/share/i2p/lib/javax.servlet.jar
     50usr/share/java/tomcat8-jsp-api.jar usr/share/i2p/lib/jsp-api.jar
    3451
    3552
  • debian-alt/trusty/rules

    rec6c244 rf38ee48  
    8484        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    8585
    86         @# ubuntu: not in precise
    87         @# debian: in wheezy jessie stretch sid
     86        @# ubuntu: in xenial
     87        @# debian: in jessie-backports stretch sid
    8888        @#/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    8989        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     
    106106        @#ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    107107
     108        @# debian and ubuntu: wheezy-backports, jessie+, xenial+
     109        @/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
     110        mkdir -p $(CURDIR)/apps/jetty/jettylib
     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
     121
    108122        @# debian and ubuntu: everywhere
    109123        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
  • debian-alt/wheezy/control

    rec6c244 rf38ee48  
    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

    rec6c244 rf38ee48  
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
    10  ,ant-optional
    1110 ,debconf
    1211 ,openjdk-8-jdk
  • debian-alt/xenial/rules

    rec6c244 rf38ee48  
    8484        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    8585
    86         @# ubuntu: not in precise
    87         @# debian: in wheezy jessie stretch sid
     86        @# ubuntu: in xenial
     87        @# debian: in jessie-backports stretch sid
    8888        @/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    8989        mkdir -p $(CURDIR)/apps/jetty/jettylib
     
    108108
    109109        @# debian and ubuntu: wheezy-backports, jessie+, xenial+
    110         /bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
     110        @/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
    111111        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
    112115        ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    113         ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.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
    114118        ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    115119        ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
    116         ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    117         ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    118         ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    119         ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    120120
    121121        @# debian and ubuntu: everywhere
Note: See TracChangeset for help on using the changeset viewer.