Changeset 6198739 for debian


Ignore:
Timestamp:
Jan 16, 2012 2:10:32 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
ba01451
Parents:
23de1e6 (diff), 4045785 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p' (head 899a1923586f3d7d622bd02e03c87717566617c4)

to branch 'i2p.i2p.zzz.jetty6' (head cb3e33be282b6002f6790609f4a3eef7f42069d3)

Location:
debian
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • debian/control

    r23de1e6 r6198739  
    1111 default-jdk,
    1212 gettext,
     13 libcommons-el-java,
     14 libcommons-logging-java,
    1315 libgmp3-dev,
     16 libjetty-extra-java,
     17 libjetty-java,
    1418 po-debconf
    15 ##Build-Depends-Indep: tor-geoipdb
    1619
    1720Package: i2p
     
    6669Section: net
    6770Priority: optional
    68 Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, default-jre-headless | java5-runtime-headless | java6-runtime-headless
     71Depends: ${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
    6976Replaces: i2p ( << 0.8.6-5)
    7077Breaks: i2p (<< 0.8.6-5)
  • debian/i2p-router.install

    r23de1e6 r6198739  
     1# history.txt is installed to /usr/share/i2p because
     2# it's shown in the router console at http://127.0.0.1:7657
     3# (this is also why I don't use dh_installchangelogs -k for it)
    14history.txt usr/share/i2p
     5
    26pkg-temp/blocklist.txt usr/share/i2p
    37pkg-temp/certificates usr/share/i2p
     
    1115pkg-temp/i2psnark.config usr/share/i2p
    1216pkg-temp/i2ptunnel.config usr/share/i2p
    13 pkg-temp/lib/*.jar usr/share/i2p/lib
    1417pkg-temp/router.config usr/share/i2p
    1518pkg-temp/systray.config usr/share/i2p
    1619pkg-temp/webapps usr/share/i2p
     20
     21# We'll selectively copy things from pkg-temp
     22# to ensure that potential Jetty jars aren't
     23# duplicated
     24pkg-temp/lib/BOB.jar usr/share/i2p/lib
     25pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
     26pkg-temp/lib/i2p.jar usr/share/i2p/lib
     27pkg-temp/lib/i2psnark.jar usr/share/i2p/lib
     28pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib
     29pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
     30pkg-temp/lib/jrobin.jar usr/share/i2p/lib
     31pkg-temp/lib/mstreaming.jar usr/share/i2p/lib
     32pkg-temp/lib/router.jar usr/share/i2p/lib
     33pkg-temp/lib/routerconsole.jar usr/share/i2p/lib
     34pkg-temp/lib/sam.jar usr/share/i2p/lib
     35pkg-temp/lib/standard.jar usr/share/i2p/lib
     36pkg-temp/lib/streaming.jar usr/share/i2p/lib
     37pkg-temp/lib/systray.jar usr/share/i2p/lib
     38pkg-temp/lib/systray4j.jar usr/share/i2p/lib
     39
     40# These are copied over to avoid depending on libjetty-extra-java
     41# and pulling in dependencies that we don't care about
     42pkg-temp/lib/commons-el.jar usr/share/i2p/lib
     43pkg-temp/lib/jetty-java5-threadpool.jar usr/share/i2p/lib
     44pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
  • debian/i2p-router.links

    r23de1e6 r6198739  
    33usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
    44usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
     5
     6# From libcommons-logging-java
     7usr/share/java/commons-logging.jar usr/share/i2p/lib/commons-logging.jar
     8# From libtomcat6-java
     9usr/share/java/jasper.jar usr/share/i2p/lib/jasper.jar
     10usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
     11usr/share/java/tomcat-juli.jar usr/share/i2p/lib/tomcat-juli.jar
     12
     13# From libjetty-java
     14usr/share/java/jetty.jar usr/share/i2p/lib/jetty.jar
     15usr/share/java/jetty-util.jar usr/share/i2p/lib/jetty-util.jar
     16usr/share/java/jetty-sslengine.jar usr/share/i2p/lib/jetty-sslengine.jar
     17usr/share/java/jetty-start.jar usr/share/i2p/lib/jetty-start.jar
     18
     19# From libservlet2.5-java
     20usr/share/java/servlet-api-2.5.jar usr/share/i2p/lib/servlet-api.jar
     21usr/share/java/jsp-api-2.1.jar usr/share/i2p/lib/jsp-api.jar
     22usr/share/java/el-api-2.1.jar usr/share/i2p/lib/el-api.jar
  • debian/patches/series

    r23de1e6 r6198739  
    330003-renaming-jcpuid.patch
    440004-oom-listener.patch
     5#debian-version.patch
     60004-jetty6.patch
  • debian/rules

    r23de1e6 r6198739  
    4444        dh_auto_clean
    4545        ant distclean
    46         # The next line is used by KYTV when building from source packages
    47         #rm -f apps/jetty/jetty-5.1.15.tgz
    4846        rm -f core/c/jbigi/*.[s]o
    4947        rm -rf core/c/jcpuid/lib/
     48        #rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
    5049        debconf-updatepo
    5150
     
    6362        echo router.updateDisabled=true > $(I2P)/router.config
    6463        mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
    65         #-cp -fv /usr/share/tor/geoip $(CURDIR)/pkg-temp/geoip/geoip.txt
    6664       
    6765
Note: See TracChangeset for help on using the changeset viewer.