echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debian: Back out libhttpclient-java dependency,

Browse Source 
requires 4.4 which is too recent for most distros
This commit is contained in:
zzz
2016-05-01 21:22:38 +00:00
parent 7a49b09b97
commit 17542400b9
5 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.properties
View File

@@ -134,4 +134,8 @@ javac.version=1.6
# Don't compile gnu.getopt classes, we will use libgetopt-java package # Don't compile gnu.getopt classes, we will use libgetopt-java package
#with-libgetopt-java=true #with-libgetopt-java=true
# Don't compile org.apache.http classes, we will use libhttpclient-java and libhttpcore-java packages # Don't compile org.apache.http classes, we will use libhttpclient-java and libhttpcore-java packages
# 2 MB of dependencies vs. 20 KB of copied source
# Requires 4.4 or higher.
# Debian: Not in wheezy/jessie
# Ubuntu: Only in wily and later
#with-libhttpclient-java=true #with-libhttpclient-java=true

4
build.xml
View File

@@ -2032,7 +2032,9 @@
<!-- libgetopt-java --> <!-- libgetopt-java -->
<fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" /> <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
<!-- libhttpclient-java and libhttpcore-java --> <!-- libhttpclient-java and libhttpcore-java -->
<!--
<fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" /> <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
-->
<!-- systray4j --> <!-- systray4j -->
<fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" /> <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
<file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" /> <file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" />
@@ -2103,7 +2105,9 @@
<fileset dir="../i2p-${Extended.Version}/_MTN" /> <fileset dir="../i2p-${Extended.Version}/_MTN" />
<fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" /> <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
<fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" /> <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
<!--
<fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" /> <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
-->
<fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" /> <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
<file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" /> <file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" />
<file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" /> <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />

1
debian/control vendored
View File

@@ -15,7 +15,6 @@ Build-Depends: debhelper (>= 7.0.50~)
,dh-apparmor ,dh-apparmor
,gettext ,gettext
,libgetopt-java ,libgetopt-java
,libhttpclient-java, libhttpcore-java
,libgmp-dev (>= 2:5.0.5) ,libgmp-dev (>= 2:5.0.5)
,libservice-wrapper-java ,libservice-wrapper-java
,hardening-wrapper ,hardening-wrapper

9
debian/i2p-router.links vendored
View File

@@ -92,6 +92,9 @@ usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
# comment out if not building with libhttpclient-java and libhttpcore-java # comment out if not building with libhttpclient-java and libhttpcore-java
# ubuntu and debian: everywhere # 2 MB of dependencies vs. 20 KB of copied source
usr/share/java/httpclient.jar usr/share/i2p/lib/httpclient.jar # Requires 4.4 or higher.
usr/share/java/httpcore.jar usr/share/i2p/lib/httpcore.jar # Debian: Not in wheezy/jessie
# Ubuntu: Only in wily and later
#usr/share/java/httpclient.jar usr/share/i2p/lib/httpclient.jar
#usr/share/java/httpcore.jar usr/share/i2p/lib/httpcore.jar

13
debian/rules vendored
View File

@@ -149,11 +149,14 @@ endif
@mkdir -p $(CURDIR)/core/java/build @mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
@# debian and ubuntu: everywhere @# 2 MB of dependencies vs. 20 KB of copied source
@/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties @# Requires 4.4 or higher.
@mkdir -p $(CURDIR)/core/java/build @# Debian: Not in wheezy/jessie
ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar @# Ubuntu: Only in wily and later
ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar @#/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 TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
echo router.updateDisabled=true > $(I2P)/router.config echo router.updateDisabled=true > $(I2P)/router.config