Changeset a3a17a4f for debian-alt/buster


Ignore:
Timestamp:
Nov 25, 2017 6:59:04 PM (3 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/buster
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.