Changeset c61a185 for debian


Ignore:
Timestamp:
Jul 23, 2012 11:13:28 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
db6b8d3
Parents:
7f18d25
Message:

Debian: Use our Jetty/Tomcat? libs instead of the ones from Debian/Ubuntu? (for now at least).

Tomcat6 & Jetty6 are going to be dropped from the next release of Debian stable
(Wheezy) in favor of Tomcat7 and Jetty8.

Location:
debian
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • debian/control

    r7f18d25 rc61a185  
    1111 default-jdk,
    1212 gettext,
    13  libcommons-el-java,
    14  libcommons-logging-java,
    1513 libgmp3-dev,
    16  libjetty-extra-java,
    17  libjetty-java,
    1814 po-debconf
    1915
     
    7066Priority: optional
    7167Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    72  default-jre-headless | java5-runtime-headless | java6-runtime-headless,
    73  libcommons-logging-java,
    74  libjetty-java,
    75  libtomcat6-java
     68 default-jre-headless | java5-runtime-headless | java6-runtime-headless, libecj-java
    7669Replaces: i2p ( << 0.8.6-5)
    7770Breaks: i2p (<< 0.8.6-5)
  • debian/i2p-router.install

    r7f18d25 rc61a185  
    1919pkg-temp/webapps usr/share/i2p
    2020
    21 # We'll selectively copy things from pkg-temp
    22 # to ensure that potential Jetty jars aren't
    23 # duplicated
    2421pkg-temp/lib/BOB.jar usr/share/i2p/lib
     22pkg-temp/lib/commons-el.jar usr/share/i2p/lib
     23pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
    2524pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
    2625pkg-temp/lib/i2p.jar usr/share/i2p/lib
    2726pkg-temp/lib/i2psnark.jar usr/share/i2p/lib
    2827pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib
     28pkg-temp/lib/jasper-compiler.jar usr/share/i2p/lib
     29pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     30pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    2931pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
     32pkg-temp/lib/jetty-java5-threadpool.jar usr/share/i2p/lib
     33pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
     34pkg-temp/lib/jetty-sslengine.jar usr/share/i2p/lib
     35pkg-temp/lib/jetty-start.jar usr/share/i2p/lib
     36pkg-temp/lib/jetty-util.jar usr/share/i2p/lib
    3037pkg-temp/lib/jrobin.jar usr/share/i2p/lib
    3138pkg-temp/lib/jstl.jar usr/share/i2p/lib
    3239pkg-temp/lib/mstreaming.jar usr/share/i2p/lib
     40pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
     41pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
     42pkg-temp/lib/routerconsole.jar usr/share/i2p/lib
    3343pkg-temp/lib/router.jar usr/share/i2p/lib
    34 pkg-temp/lib/routerconsole.jar usr/share/i2p/lib
    3544pkg-temp/lib/sam.jar usr/share/i2p/lib
    3645pkg-temp/lib/standard.jar usr/share/i2p/lib
    3746pkg-temp/lib/streaming.jar usr/share/i2p/lib
     47pkg-temp/lib/systray4j.jar usr/share/i2p/lib
    3848pkg-temp/lib/systray.jar usr/share/i2p/lib
    39 pkg-temp/lib/systray4j.jar usr/share/i2p/lib
    40 
    41 # These are copied over to avoid depending on libjetty-extra-java
    42 # and pulling in dependencies that we don't care about
    43 pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    44 pkg-temp/lib/jetty-java5-threadpool.jar usr/share/i2p/lib
    45 pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
    46 pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
    47 
    48 # dummy file (copying in case a plugin tries to load it directly)
    49 pkg-temp/lib/jasper-compiler.jar usr/share/i2p/lib
  • debian/i2p-router.links

    r7f18d25 rc61a185  
    44usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
    55
    6 # From libcommons-logging-java
    7 usr/share/java/commons-logging.jar usr/share/i2p/lib/commons-logging.jar
    8 
    9 # From libtomcat6-java
    10 usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
    11 usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
    12 usr/share/java/tomcat-juli.jar usr/share/i2p/lib/tomcat-juli.jar
    13 ## Used by some plugins, such as Pebble. Might be good to include it
    14 ## since we use libtomcat6-java anyway
    156usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
    16 
    17 # From libjetty-java
    18 usr/share/java/jetty.jar usr/share/i2p/lib/org.mortbay.jetty.jar
    19 usr/share/java/jetty-util.jar usr/share/i2p/lib/jetty-util.jar
    20 usr/share/java/jetty-sslengine.jar usr/share/i2p/lib/jetty-sslengine.jar
    21 usr/share/java/jetty-start.jar usr/share/i2p/lib/jetty-start.jar
    22 
    23 # From libservlet2.5-java
    24 usr/share/java/servlet-api-2.5.jar usr/share/i2p/lib/servlet-api.jar
    25 usr/share/java/jsp-api-2.1.jar usr/share/i2p/lib/jsp-api.jar
    26 usr/share/java/el-api-2.1.jar usr/share/i2p/lib/el-api.jar
Note: See TracChangeset for help on using the changeset viewer.