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

Debian: Add libjson-simple-java dependency

Browse Source
This commit is contained in:
zzz
2018-11-19 14:58:20 +00:00
parent 54184f2889
commit d263e42e1e
21 changed files with 88 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
debian-alt/bionic/rules
View File

@ -154,6 +154,11 @@ endif
@mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
@# debian: jessie+; ubuntu: trusty+
@/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
@mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
@# debian: everywhere; ubuntu: trusty+
@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties

2
debian-alt/buster/control
View File

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

5
debian-alt/buster/rules
View File

@ -154,6 +154,11 @@ endif
@mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
@# debian: jessie+; ubuntu: trusty+
@/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
@mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
@# debian: everywhere; ubuntu: trusty+
@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties

7
debian-alt/doc/dependencies.txt
View File

@ -8,7 +8,7 @@ improve our official packages and support other packagers.
Our packages are available at https://deb.i2p2.de/ and
instructions are at https://geti2p.net/debian
This document is current as of release 0.9.37, 2018-10-04.
This document is current as of release 0.9.38, 2018-01-xx.
Build-only Dependencies
@ -46,6 +46,11 @@ Current Runtime Dependencies
For /usr/share/java/gnu-getopt.jar.
In non-Debian builds we bundle the source code; it's removed in the Debian source package.
* libjson-simple-java (jessie and later, trusty and later only)
For /usr/share/java/json-simple.jar.
In non-Debian builds we bundle the 1.1.1 source code; it's removed in the Debian source package.
Compatible with 1.x and 2.x only; not compatible with 3.x.
* libjetty9-java
For /usr/share/java/jetty9-*.jar.
In non-Debian builds we bundle the jars; it's removed in the Debian source package.

2
debian-alt/jessie/control
View File

@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 7.0.50~)
,dh-apparmor
,gettext
,libgetopt-java
,libjson-simple-java (< 3)
,libgmp-dev (>= 2:5.0.2)
,libservice-wrapper-java
,hardening-wrapper
@ -78,6 +79,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
libtomcat8-java,
geoip-database,
gettext-base,
libjson-simple-java (< 3),
libgetopt-java,
famfamfam-flag-png
Replaces: i2p ( << 0.8.6-5)

5
debian-alt/jessie/i2p-router.links
View File

@ -76,6 +76,11 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
# comment out if not building with libjson-simple-java
# ubuntu: trusty+; debian: jessie+
usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar
# comment out if not building with famfamfam-flag-png
# ubuntu: trusty+
# debian: everywhere

5
debian-alt/jessie/rules
View File

@ -143,6 +143,11 @@ endif
@mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
@# debian: jessie+; ubuntu: trusty+
@/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
@mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
@# debian: everywhere; ubuntu: trusty+
@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties

2
debian-alt/trusty/control
View File

@ -18,6 +18,7 @@ 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
@ -80,6 +81,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
geoip-database,
gettext-base,
libgetopt-java,
libjson-simple-java (< 3),
glassfish-javaee,
famfamfam-flag-png
Replaces: i2p ( << 0.8.6-5)

5
debian-alt/trusty/i2p-router.links
View File

@ -76,6 +76,11 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
# comment out if not building with libjson-simple-java
# ubuntu: trusty+; debian: jessie+
usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar
# comment out if not building with famfamfam-flag-png
# ubuntu: trusty+
# debian: everywhere

5
debian-alt/trusty/rules
View File

@ -143,6 +143,11 @@ endif
@mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
@# debian: jessie+; ubuntu: trusty+
@/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
@mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
@# debian: everywhere; ubuntu: trusty+
@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties

2
debian-alt/xenial/control
View File

@ -17,6 +17,7 @@ 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
@ -82,6 +83,7 @@ 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)

5
debian-alt/xenial/i2p-router.links
View File

@ -76,6 +76,11 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
# comment out if not building with libjson-simple-java
# ubuntu: trusty+; debian: jessie+
usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar
# comment out if not building with famfamfam-flag-png
# ubuntu: trusty+
# debian: everywhere

5
debian-alt/xenial/rules
View File

@ -142,6 +142,11 @@ endif
@mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
@# debian: jessie+; ubuntu: trusty+
@/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
@mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
@# debian: everywhere; ubuntu: trusty+
@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties