Changeset 87cff00


Ignore:
Timestamp:
Mar 4, 2017 2:41:21 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
319ce9b
Parents:
f38ee48
Message:

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

Location:
debian-alt/trusty
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • debian-alt/trusty/control

    rf38ee48 r87cff00  
    1313# Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar
    1414 ,openjdk-6-jdk
    15  ,libtomcat8-java
    1615 ,dh-apparmor
    1716 ,gettext
     
    7675Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    7776 openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless,
    78  libtomcat8-java,
    7977 geoip-database,
    8078 gettext-base,
  • debian-alt/trusty/i2p-router.install

    rf38ee48 r87cff00  
    5555
    5656# uncomment if not building with libtomcat8-java
    57 #pkg-temp/lib/commons-el.jar usr/share/i2p/lib
     57pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    5858# legacy name, contains only tomcat-juli, not commons-logging
    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
     59pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
     60pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     61pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    6262
    6363
  • debian-alt/trusty/i2p-router.links

    rf38ee48 r87cff00  
    3636# debian: wheezy-backports, jessie+
    3737# 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
     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
    4040# 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
     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
    4545# combined into commons-el.jar in non-package builds
    46 usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
     46#usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
    4747# legacy name in lib/
    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
     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
    5151
    5252
  • debian-alt/trusty/rules

    rf38ee48 r87cff00  
    107107
    108108        @# 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
     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
    121121
    122122        @# debian and ubuntu: everywhere
Note: See TracChangeset for help on using the changeset viewer.