Changeset a3a17a4f for debian-alt


Ignore:
Timestamp:
Nov 25, 2017 6:59:04 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
752c17c
Parents:
7f6ba8cd
Message:

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

Location:
debian-alt
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • debian-alt/README.txt

    r7f6ba8cd ra3a17a4f  
    1010xenial may be copied to yakkety, zesty.
    1111
    12 tails-jessie and tails-wheezy are currently the same as
    13 jessie and wheezy, respectively. If they diverge, put the changes here.
     12Not maintained:
     13wheezy files are not maintained. Use the precise files instead.
     14jessie files may not be maintained. Use the trusty files instead.
    1415
    1516Note on systemd:
  • debian-alt/buster/control

    r7f6ba8cd ra3a17a4f  
    1010 ,openjdk-8-jdk
    1111 ,libjetty9-java (>= 9.2.22)
    12  ,glassfish-javaee
     12 ,libtaglibs-standard-jstlel-java
    1313 ,libtomcat8-java
    1414 ,dh-apparmor
     
    7676 openjdk-8-jre-headless | java8-runtime-headless,
    7777 libjetty9-java,
    78  glassfish-javaee,
     78 libtaglibs-standard-jstlel-java,
    7979 libtomcat8-java,
    8080 geoip-database,
  • debian-alt/buster/rules

    r7f6ba8cd ra3a17a4f  
    5353        rm -f $(CURDIR)/override.properties
    5454        rm -f $(CURDIR)/apps/susidns/src/lib/standard.jar
     55        rm -f $(CURDIR)/apps/susidns/src/lib/jstl.jar
     56        rm -f $(CURDIR)/apps/susidns/src/lib/jstlel.jar
    5557        debconf-updatepo
    5658
     
    120122        ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
    121123
    122         @# debian and ubuntu: everywhere
    123         @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
     124        @# debian and ubuntu: stretch+, zesty+
     125        @/bin/echo -e "with-libtaglibs-standard=true" >> $(CURDIR)/override.properties
     126        ln -sf /usr/share/java/taglibs-standard-spec.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
     127        ln -sf /usr/share/java/taglibs-standard-impl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
     128        ln -sf /usr/share/java/taglibs-standard-jstlel.jar $(CURDIR)/apps/susidns/src/lib/jstlel.jar
     129
     130        @# debian and ubuntu: everywhere
     131        @#/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
    124132        @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
    125133        @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
    126         ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
     134        @#ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
    127135
    128136        @# debian and ubuntu: everywhere
  • debian-alt/doc/debian-build.txt

    r7f6ba8cd ra3a17a4f  
    7474reprepro -v update precise
    7575reprepro -v update trusty
    76 reprepro -v update vivid
    7776reprepro -v update xenial
    7877reprepro -v update zesty
  • debian-alt/doc/dependencies.txt

    r7f6ba8cd ra3a17a4f  
    99instructions are at https://geti2p.net/debian
    1010
    11 This document is current as of release 0.9.30, 2017-05-03.
     11This document is current as of release 0.9.33, scheduled 2018-01
    1212
    1313
     
    5252  They are removed in the Debian source package.
    5353
    54 * glassfish-javaee
     54* libtaglibs-standard-*-java (stretch and later, zesty and later only)
     55  Provides JSTL 1.2, solves the glassfish-javaee problem described below.
     56
     57* glassfish-javaee (wheezy, jessie, xenial and earlier only)
    5558  We need jstl.jar and standard.jar version 1.2.
    5659  This is an ancient and terrible package, but it's the only place we've found version 1.2 jars.
Note: See TracChangeset for help on using the changeset viewer.