forked from I2P_Developers/i2p.i2p
Debian: Add runtime dependency on libhttpclient-java,
link to /usr/share/java/httpclient.jar and httpcore.jar. This is 2 MB of dependencies to replace 20 KB of copied code, so may not be worth it, esp. for Tails.
This commit is contained in:
2
debian/control
vendored
2
debian/control
vendored
@@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 7.0.50~)
|
||||
,dh-apparmor
|
||||
,gettext
|
||||
,libgetopt-java
|
||||
,libhttpclient-java, libhttpcore-java
|
||||
,libgmp-dev (>= 2:5.0.5)
|
||||
,libservice-wrapper-java
|
||||
,hardening-wrapper
|
||||
@@ -78,6 +79,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
|
||||
geoip-database,
|
||||
gettext-base,
|
||||
libgetopt-java,
|
||||
libhttpclient-java, libhttpcore-java,
|
||||
libjetty8-java, libservlet3.0-java,
|
||||
glassfish-javaee
|
||||
Replaces: i2p ( << 0.8.6-5)
|
||||
|
6
debian/i2p-router.links
vendored
6
debian/i2p-router.links
vendored
@@ -89,3 +89,9 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
|
||||
# comment out if not building with libgetopt-java
|
||||
# ubuntu and debian: everywhere
|
||||
usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
|
||||
|
||||
|
||||
# comment out if not building with libhttpclient-java and libhttpcore-java
|
||||
# ubuntu and debian: everywhere
|
||||
usr/share/java/httpclient.jar usr/share/i2p/lib/httpclient.jar
|
||||
usr/share/java/httpcore.jar usr/share/i2p/lib/httpcore.jar
|
||||
|
6
debian/rules
vendored
6
debian/rules
vendored
@@ -149,6 +149,12 @@ endif
|
||||
@mkdir -p $(CURDIR)/core/java/build
|
||||
ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
|
||||
|
||||
@# debian and ubuntu: everywhere
|
||||
@/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties
|
||||
@mkdir -p $(CURDIR)/core/java/build
|
||||
ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar
|
||||
ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar
|
||||
|
||||
TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
|
||||
echo router.updateDisabled=true > $(I2P)/router.config
|
||||
mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
|
||||
|
Reference in New Issue
Block a user