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 dependency for famfamfam-flag-png (ticket #2270)

Browse Source
This commit is contained in:
zzz
2018-06-27 16:16:08 +00:00
parent c02f685307
commit 9b17b52b39
18 changed files with 114 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.tx/config
View File

@ -451,8 +451,9 @@ trans.zh_CN = installer/resources/locale-man/man_zh.po
[I2P.eepsite] [I2P.eepsite]
;; ;;
;; For any new translations, add links in index.html ;; For any new translations, add links in index.html,
;; and copy new flags in build.xml preppkg-base target ;; and copy new flags in build.xml copyflags-unlesspkg target,
;; and add to debian/i2p-router.links and debian-alt/*/i2p-router.links
;; ;;
type = HTML type = HTML
source_file = installer/resources/eepsite/docroot/help/index.html source_file = installer/resources/eepsite/docroot/help/index.html

2
build.properties
View File

@ -158,6 +158,8 @@ javac.version=1.7
#with-gettext-base=true #with-gettext-base=true
# 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 bundle flags, we will use famfamfam-flag-png package
#with-famfamfam-flag-png=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 # 2 MB of dependencies vs. 20 KB of copied source
# Requires 4.4 or higher. # Requires 4.4 or higher.

11
build.xml
View File

@ -1279,7 +1279,7 @@
</target> </target>
<!-- see targets below for conditional copying --> <!-- see targets below for conditional copying -->
<target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg, truncatehistory"> <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg, copyflags-unlesspkg, truncatehistory">
<!-- if updater200 was run previously, it left *.pack files in pkg-temp --> <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
<!-- Also remove deletelist.txt used for updater only --> <!-- Also remove deletelist.txt used for updater only -->
<delete> <delete>
@ -1325,10 +1325,13 @@
<copy todir="pkg-temp/eepsite/" > <copy todir="pkg-temp/eepsite/" >
<fileset dir="installer/resources/eepsite/" excludes="**/.placeholder" /> <fileset dir="installer/resources/eepsite/" excludes="**/.placeholder" />
</copy> </copy>
<copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
</target>
<target name="copyflags-unlesspkg" unless="${with-famfamfam-flag-png}" >
<copy todir="pkg-temp/eepsite/docroot/help/lib/" > <copy todir="pkg-temp/eepsite/docroot/help/lib/" >
<fileset dir="installer/resources/icons/flags/" includes="az.png cn.png de.png es.png fr.png ir.png it.png jp.png nl.png pl.png pt.png ru.png se.png us.png" /> <fileset dir="installer/resources/icons/flags/" includes="az.png cn.png de.png es.png fr.png ir.png it.png jp.png nl.png pl.png pt.png ru.png se.png us.png" />
</copy> </copy>
<copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
<copy todir="pkg-temp/docs/icons/flags" > <copy todir="pkg-temp/docs/icons/flags" >
<!-- base flags/ dir only. flags16x11/ and flags48x48/ dirs already copied by prepConsoleDocs target --> <!-- base flags/ dir only. flags16x11/ and flags48x48/ dirs already copied by prepConsoleDocs target -->
<fileset dir="installer/resources/icons/flags" /> <fileset dir="installer/resources/icons/flags" />
@ -2410,6 +2413,7 @@
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" /> <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
<!-- libjakarta-taglibs-standard-java or glassfish-javaee or libtaglibs-standard --> <!-- libjakarta-taglibs-standard-java or glassfish-javaee or libtaglibs-standard -->
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
<fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" />
<!-- anything added above, add in debian-release-tarball also --> <!-- anything added above, add in debian-release-tarball also -->
</delete> </delete>
<tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2"> <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
@ -2493,6 +2497,7 @@
--> -->
<!-- libjakarta-taglibs-standard-java or glassfish-javaee --> <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
<!-- famfamfam-flag-png is in trusty but not precise, so leave them in the source package for both -->
<!-- anything added above, add in debian-release-tarball also --> <!-- anything added above, add in debian-release-tarball also -->
</delete> </delete>
<tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2"> <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
@ -2569,6 +2574,7 @@
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" /> <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
--> -->
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
<fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" />
<!-- anything added above, add in debian-tarball also --> <!-- anything added above, add in debian-tarball also -->
</delete> </delete>
<tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2"> <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
@ -2639,6 +2645,7 @@
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" /> <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" /> <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
<fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" />
<!-- anything added above, add in debian-tarball also --> <!-- anything added above, add in debian-tarball also -->
</delete> </delete>
<tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2"> <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">

1
debian-alt/buster/control
View File

@ -81,6 +81,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
libjetty9-java, libjetty9-java,
libtaglibs-standard-jstlel-java, libtaglibs-standard-jstlel-java,
libtomcat8-java, libtomcat8-java,
famfamfam-flag-png
Replaces: i2p ( << 0.8.6-5) Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5) Breaks: i2p (<< 0.8.6-5)
Recommends: libjbigi-jni, ttf-dejavu Recommends: libjbigi-jni, ttf-dejavu

3
debian-alt/buster/rules
View File

@ -154,6 +154,9 @@ 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: everywhere; ubuntu: trusty+
@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
@# 2 MB of dependencies vs. 20 KB of copied source @# 2 MB of dependencies vs. 20 KB of copied source
@# Requires 4.4 or higher. @# Requires 4.4 or higher.
@# Debian: Not in wheezy/jessie @# Debian: Not in wheezy/jessie

1
debian-alt/jessie/control
View File

@ -79,6 +79,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
geoip-database, geoip-database,
gettext-base, gettext-base,
libgetopt-java, libgetopt-java,
famfamfam-flag-png
Replaces: i2p ( << 0.8.6-5) Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5) Breaks: i2p (<< 0.8.6-5)
Recommends: libjbigi-jni, ttf-dejavu Recommends: libjbigi-jni, ttf-dejavu

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

@ -76,6 +76,23 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
# comment out if not building with famfamfam-flag-png
# ubuntu: trusty+
# debian: everywhere
usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags
usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png
usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png
usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png
usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png
usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png
usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png
usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png
usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png
usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png
usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png
usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png
# comment out if not building with libhttpclient-java and libhttpcore-java # comment out if not building with libhttpclient-java and libhttpcore-java
# 2 MB of dependencies vs. 20 KB of copied source # 2 MB of dependencies vs. 20 KB of copied source
# Requires 4.4 or higher. # Requires 4.4 or higher.

3
debian-alt/jessie/rules
View File

@ -143,6 +143,9 @@ 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: everywhere; ubuntu: trusty+
@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
@# 2 MB of dependencies vs. 20 KB of copied source @# 2 MB of dependencies vs. 20 KB of copied source
@# Requires 4.4 or higher. @# Requires 4.4 or higher.
@# Debian: Not in wheezy/jessie @# Debian: Not in wheezy/jessie

3
debian-alt/trusty/control
View File

@ -80,7 +80,8 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
geoip-database, geoip-database,
gettext-base, gettext-base,
libgetopt-java, libgetopt-java,
glassfish-javaee glassfish-javaee,
famfamfam-flag-png
Replaces: i2p ( << 0.8.6-5) Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5) Breaks: i2p (<< 0.8.6-5)
Recommends: libjbigi-jni, ttf-dejavu Recommends: libjbigi-jni, ttf-dejavu

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

@ -76,6 +76,23 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
# comment out if not building with famfamfam-flag-png
# ubuntu: trusty+
# debian: everywhere
usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags
usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png
usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png
usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png
usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png
usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png
usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png
usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png
usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png
usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png
usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png
usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png
# comment out if not building with libhttpclient-java and libhttpcore-java # comment out if not building with libhttpclient-java and libhttpcore-java
# 2 MB of dependencies vs. 20 KB of copied source # 2 MB of dependencies vs. 20 KB of copied source
# Requires 4.4 or higher. # Requires 4.4 or higher.

3
debian-alt/trusty/rules
View File

@ -143,6 +143,9 @@ 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: everywhere; ubuntu: trusty+
@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
@# 2 MB of dependencies vs. 20 KB of copied source @# 2 MB of dependencies vs. 20 KB of copied source
@# Requires 4.4 or higher. @# Requires 4.4 or higher.
@# Debian: Not in wheezy/jessie @# Debian: Not in wheezy/jessie

1
debian-alt/xenial/control
View File

@ -82,6 +82,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
geoip-database, geoip-database,
gettext-base, gettext-base,
libgetopt-java, libgetopt-java,
famfamfam-flag-png
Replaces: i2p ( << 0.8.6-5) Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5) Breaks: i2p (<< 0.8.6-5)
Recommends: libjbigi-jni, ttf-dejavu Recommends: libjbigi-jni, ttf-dejavu

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

@ -76,6 +76,23 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
# comment out if not building with famfamfam-flag-png
# ubuntu: trusty+
# debian: everywhere
usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags
usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png
usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png
usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png
usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png
usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png
usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png
usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png
usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png
usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png
usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png
usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png
# comment out if not building with libhttpclient-java and libhttpcore-java # comment out if not building with libhttpclient-java and libhttpcore-java
# 2 MB of dependencies vs. 20 KB of copied source # 2 MB of dependencies vs. 20 KB of copied source
# Requires 4.4 or higher. # Requires 4.4 or higher.

3
debian-alt/xenial/rules
View File

@ -142,6 +142,9 @@ 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: everywhere; ubuntu: trusty+
@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
@# 2 MB of dependencies vs. 20 KB of copied source @# 2 MB of dependencies vs. 20 KB of copied source
@# Requires 4.4 or higher. @# Requires 4.4 or higher.
@# Debian: Not in wheezy/jessie @# Debian: Not in wheezy/jessie

3
debian/control vendored
View File

@ -79,7 +79,8 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
libgetopt-java, libgetopt-java,
libjetty9-java, libjetty9-java,
libtaglibs-standard-jstlel-java, libtaglibs-standard-jstlel-java,
libtomcat8-java libtomcat8-java,
famfamfam-flag-png
Replaces: i2p ( << 0.8.6-5) Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5) Breaks: i2p (<< 0.8.6-5)
Recommends: libjbigi-jni, ttf-dejavu Recommends: libjbigi-jni, ttf-dejavu

17
debian/i2p-router.links vendored
View File

@ -82,6 +82,23 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
# comment out if not building with famfamfam-flag-png
# ubuntu: trusty+
# debian: everywhere
usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags
usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png
usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png
usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png
usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png
usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png
usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png
usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png
usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png
usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png
usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png
usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png
# comment out if not building with libhttpclient-java and libhttpcore-java # comment out if not building with libhttpclient-java and libhttpcore-java
# 2 MB of dependencies vs. 20 KB of copied source # 2 MB of dependencies vs. 20 KB of copied source
# Requires 4.4 or higher. # Requires 4.4 or higher.

3
debian/rules vendored
View File

@ -151,6 +151,9 @@ 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: everywhere; ubuntu: trusty+
@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
@# 2 MB of dependencies vs. 20 KB of copied source @# 2 MB of dependencies vs. 20 KB of copied source
@# Requires 4.4 or higher. @# Requires 4.4 or higher.
@# Debian: Not in wheezy/jessie @# Debian: Not in wheezy/jessie

10
history.txt
View File

@ -1,3 +1,13 @@
2018-06-27 zzz
* Debian: Add dependency for famfamfam-flag-png (ticket #2270)
2018-06-26 zzz
* Console: Move modified flags to new dir (ticket #2270)
* Console servlets: Move to new package (ticket #2265)
* NTCP pumper: Reduce false positives in failsafe code (ticket #2237)
* NTCP2: Initial checkins (proposal #111)
* Streaming: Enforce valid port in setters
* 2018-06-26 0.9.35 released * 2018-06-26 0.9.35 released
2018-06-23 zzz 2018-06-23 zzz