Changeset 1af23a4 for debian


Ignore:
Timestamp:
Oct 10, 2016 12:31:28 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
72105e2
Parents:
6b7d22c2
Message:

Debian: Don't use glassfish-javaee.jar for jstl.jar (ticket #1793)

Location:
debian
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • debian/i2p-router.install

    r6b7d22c2 r1af23a4  
    6565# uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
    6666# ubuntu and debian: everywhere
    67 #pkg-temp/lib/jstl.jar usr/share/i2p/lib
     67# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
     68pkg-temp/lib/jstl.jar usr/share/i2p/lib
    6869
    6970
  • debian/i2p-router.links

    r6b7d22c2 r1af23a4  
    6868
    6969# comment out if not building with glassfish-javaee
    70 usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
     70# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
     71#usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
    7172usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
    7273
  • debian/rules

    r6b7d22c2 r1af23a4  
    131131        @# debian and ubuntu: everywhere
    132132        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
    133         ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
     133        @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
     134        @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
    134135        ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
    135136
Note: See TracChangeset for help on using the changeset viewer.