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

Util: Update json-simple lib to 2.3.0 2017-10-04

Browse Source 
Bundle 2.0 API only; remove 1.1 API
Convert DoH, NDT, and i2pcontrol to the 2.x API
Fix i2pcontrol handling of number values and serialization for 2.x API
Remove xenial dependency on libjson-simple-java, it has only 1.1
Set min and max version constraint on libjson-simple-java for bionic+
Based on patch from Gilles Filippini
ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901827
This does not support 3.x but the patch for that will be smaller.
This commit is contained in:
zzz
2020-05-31 12:37:37 +00:00
parent 4fd834d13e
commit f985004be0
38 changed files with 3525 additions and 2275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian-alt/bionic/control
View File

@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9.20160709)
,bash-completion
,gettext
,libgetopt-java
,libjson-simple-java (<< 3)
,libjson-simple-java (>= 2),libjson-simple-java (<< 3)
,libgmp-dev (>= 2:5.0.5)
,libservice-wrapper-java
,po-debconf
@ -78,7 +78,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
geoip-database,
gettext-base,
libgetopt-java,
libjson-simple-java (<< 3),
libjson-simple-java (>= 2),libjson-simple-java (<< 3),
libjetty9-java (>= 9.4),
libtaglibs-standard-jstlel-java,
libtomcat8-java,

2
debian-alt/xenial/control
View File

@ -17,7 +17,6 @@ Build-Depends: debhelper (>= 7.0.50~)
,bash-completion
,gettext
,libgetopt-java
,libjson-simple-java (<< 3)
,libgmp-dev (>= 2:5.0.2)
,libservice-wrapper-java
,hardening-wrapper
@ -83,7 +82,6 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
geoip-database,
gettext-base,
libgetopt-java,
libjson-simple-java (<< 3),
famfamfam-flag-png
Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5)