Changeset a3a17a4f for debian


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
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • debian/control

    r7f6ba8cd ra3a17a4f  
    1111 ,openjdk-7-jdk
    1212 ,libjetty9-java
    13  ,glassfish-javaee
     13 ,libtaglibs-standard-jstlel-java
    1414 ,libtomcat8-java
    1515 ,dh-apparmor
     
    8282 libgetopt-java,
    8383 libjetty9-java,
    84  glassfish-javaee,
     84 libtaglibs-standard-jstlel-java,
    8585 libtomcat8-java
    8686Replaces: i2p ( << 0.8.6-5)
  • debian/i2p-router.install

    r7f6ba8cd ra3a17a4f  
    6464
    6565
    66 # uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
     66# uncomment if not building with either glassfish-javaee, libjakarta-taglibs-standard-java or libtaglibs-standard
    6767# ubuntu and debian: everywhere
    6868# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
    69 pkg-temp/lib/jstl.jar usr/share/i2p/lib
     69#pkg-temp/lib/jstl.jar usr/share/i2p/lib
    7070
    7171
    72 # uncomment if not building with either glassfish-javaee or libjstl1.1-java
     72# uncomment if not building with either glassfish-javaee, libjstl1.1-java or libtaglibs-standard
    7373# ubuntu and debian: everywhere
    7474#pkg-temp/lib/standard.jar usr/share/i2p/lib
  • debian/i2p-router.links

    r7f6ba8cd ra3a17a4f  
    5252
    5353
     54# comment out if not building with libtaglibs-standard
     55usr/share/java/taglibs-standard-spec.jar usr/share/i2p/lib/jstl.jar
     56usr/share/java/taglibs-standard-impl.jar usr/share/i2p/lib/standard.jar
     57usr/share/java/taglibs-standard-jstlel.jar usr/share/i2p/lib/jstlel.jar
     58
     59
    5460# comment out if not building with glassfish-javaee
    5561# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
    5662#usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
    57 usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
     63#usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
    5864
    5965
  • debian/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.