Changeset 1754240 for debian


Ignore:
Timestamp:
May 1, 2016 9:22:38 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
cb2790b
Parents:
7a49b09
Message:

Debian: Back out libhttpclient-java dependency,
requires 4.4 which is too recent for most distros

Location:
debian
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • debian/control

    r7a49b09 r1754240  
    1616 ,gettext
    1717 ,libgetopt-java
    18  ,libhttpclient-java, libhttpcore-java
    1918 ,libgmp-dev (>= 2:5.0.5)
    2019 ,libservice-wrapper-java
  • debian/i2p-router.links

    r7a49b09 r1754240  
    9393
    9494# comment out if not building with libhttpclient-java and libhttpcore-java
    95 # ubuntu and debian: everywhere
    96 usr/share/java/httpclient.jar usr/share/i2p/lib/httpclient.jar
    97 usr/share/java/httpcore.jar usr/share/i2p/lib/httpcore.jar
     95# 2 MB of dependencies vs. 20 KB of copied source
     96# Requires 4.4 or higher.
     97# Debian: Not in wheezy/jessie
     98# Ubuntu: Only in wily and later
     99#usr/share/java/httpclient.jar usr/share/i2p/lib/httpclient.jar
     100#usr/share/java/httpcore.jar usr/share/i2p/lib/httpcore.jar
  • debian/rules

    r7a49b09 r1754240  
    150150        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    151151
    152         @# debian and ubuntu: everywhere
    153         @/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties
    154         @mkdir -p $(CURDIR)/core/java/build
    155         ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar
    156         ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar
     152        @# 2 MB of dependencies vs. 20 KB of copied source
     153        @# Requires 4.4 or higher.
     154        @# Debian: Not in wheezy/jessie
     155        @# Ubuntu: Only in wily and later
     156        @#/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties
     157        @#mkdir -p $(CURDIR)/core/java/build
     158        @#ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar
     159        @#ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar
    157160
    158161        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
Note: See TracChangeset for help on using the changeset viewer.