Changeset 9b17b52
- Timestamp:
- Jun 27, 2018 4:16:08 PM (3 years ago)
- Branches:
- master
- Children:
- bc4ee0fc, d8cc2a3
- Parents:
- c02f685
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
.tx/config
rc02f685 r9b17b52 452 452 [I2P.eepsite] 453 453 ;; 454 ;; For any new translations, add links in index.html 455 ;; and copy new flags in build.xml preppkg-base target 454 ;; For any new translations, add links in index.html, 455 ;; and copy new flags in build.xml copyflags-unlesspkg target, 456 ;; and add to debian/i2p-router.links and debian-alt/*/i2p-router.links 456 457 ;; 457 458 type = HTML -
build.properties
rc02f685 r9b17b52 159 159 # Don't compile gnu.getopt classes, we will use libgetopt-java package 160 160 #with-libgetopt-java=true 161 # Don't bundle flags, we will use famfamfam-flag-png package 162 #with-famfamfam-flag-png=true 161 163 # Don't compile org.apache.http classes, we will use libhttpclient-java and libhttpcore-java packages 162 164 # 2 MB of dependencies vs. 20 KB of copied source -
build.xml
rc02f685 r9b17b52 1280 1280 1281 1281 <!-- see targets below for conditional copying --> 1282 <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg, truncatehistory">1282 <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg, copyflags-unlesspkg, truncatehistory"> 1283 1283 <!-- if updater200 was run previously, it left *.pack files in pkg-temp --> 1284 1284 <!-- Also remove deletelist.txt used for updater only --> … … 1326 1326 <fileset dir="installer/resources/eepsite/" excludes="**/.placeholder" /> 1327 1327 </copy> 1328 <copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" /> 1329 </target> 1330 1331 <target name="copyflags-unlesspkg" unless="${with-famfamfam-flag-png}" > 1328 1332 <copy todir="pkg-temp/eepsite/docroot/help/lib/" > 1329 1333 <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" /> 1330 1334 </copy> 1331 <copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />1332 1335 <copy todir="pkg-temp/docs/icons/flags" > 1333 1336 <!-- base flags/ dir only. flags16x11/ and flags48x48/ dirs already copied by prepConsoleDocs target --> … … 2411 2414 <!-- libjakarta-taglibs-standard-java or glassfish-javaee or libtaglibs-standard --> 2412 2415 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> 2416 <fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" /> 2413 2417 <!-- anything added above, add in debian-release-tarball also --> 2414 2418 </delete> … … 2494 2498 <!-- libjakarta-taglibs-standard-java or glassfish-javaee --> 2495 2499 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> 2500 <!-- famfamfam-flag-png is in trusty but not precise, so leave them in the source package for both --> 2496 2501 <!-- anything added above, add in debian-release-tarball also --> 2497 2502 </delete> … … 2570 2575 --> 2571 2576 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> 2577 <fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" /> 2572 2578 <!-- anything added above, add in debian-tarball also --> 2573 2579 </delete> … … 2640 2646 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" /> 2641 2647 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> 2648 <fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" /> 2642 2649 <!-- anything added above, add in debian-tarball also --> 2643 2650 </delete> -
debian-alt/buster/control
rc02f685 r9b17b52 82 82 libtaglibs-standard-jstlel-java, 83 83 libtomcat8-java, 84 famfamfam-flag-png 84 85 Replaces: i2p ( << 0.8.6-5) 85 86 Breaks: i2p (<< 0.8.6-5) -
debian-alt/buster/rules
rc02f685 r9b17b52 155 155 ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar 156 156 157 @# debian: everywhere; ubuntu: trusty+ 158 @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties 159 157 160 @# 2 MB of dependencies vs. 20 KB of copied source 158 161 @# Requires 4.4 or higher. -
debian-alt/jessie/control
rc02f685 r9b17b52 80 80 gettext-base, 81 81 libgetopt-java, 82 famfamfam-flag-png 82 83 Replaces: i2p ( << 0.8.6-5) 83 84 Breaks: i2p (<< 0.8.6-5) -
debian-alt/jessie/i2p-router.links
rc02f685 r9b17b52 77 77 78 78 79 # comment out if not building with famfamfam-flag-png 80 # ubuntu: trusty+ 81 # debian: everywhere 82 usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags 83 usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png 84 usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png 85 usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png 86 usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png 87 usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png 88 usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png 89 usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png 90 usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png 91 usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png 92 usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png 93 usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png 94 95 79 96 # comment out if not building with libhttpclient-java and libhttpcore-java 80 97 # 2 MB of dependencies vs. 20 KB of copied source -
debian-alt/jessie/rules
rc02f685 r9b17b52 144 144 ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar 145 145 146 @# debian: everywhere; ubuntu: trusty+ 147 @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties 148 146 149 @# 2 MB of dependencies vs. 20 KB of copied source 147 150 @# Requires 4.4 or higher. -
debian-alt/trusty/control
rc02f685 r9b17b52 81 81 gettext-base, 82 82 libgetopt-java, 83 glassfish-javaee 83 glassfish-javaee, 84 famfamfam-flag-png 84 85 Replaces: i2p ( << 0.8.6-5) 85 86 Breaks: i2p (<< 0.8.6-5) -
debian-alt/trusty/i2p-router.links
rc02f685 r9b17b52 77 77 78 78 79 # comment out if not building with famfamfam-flag-png 80 # ubuntu: trusty+ 81 # debian: everywhere 82 usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags 83 usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png 84 usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png 85 usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png 86 usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png 87 usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png 88 usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png 89 usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png 90 usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png 91 usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png 92 usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png 93 usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png 94 95 79 96 # comment out if not building with libhttpclient-java and libhttpcore-java 80 97 # 2 MB of dependencies vs. 20 KB of copied source -
debian-alt/trusty/rules
rc02f685 r9b17b52 144 144 ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar 145 145 146 @# debian: everywhere; ubuntu: trusty+ 147 @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties 148 146 149 @# 2 MB of dependencies vs. 20 KB of copied source 147 150 @# Requires 4.4 or higher. -
debian-alt/xenial/control
rc02f685 r9b17b52 83 83 gettext-base, 84 84 libgetopt-java, 85 famfamfam-flag-png 85 86 Replaces: i2p ( << 0.8.6-5) 86 87 Breaks: i2p (<< 0.8.6-5) -
debian-alt/xenial/i2p-router.links
rc02f685 r9b17b52 77 77 78 78 79 # comment out if not building with famfamfam-flag-png 80 # ubuntu: trusty+ 81 # debian: everywhere 82 usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags 83 usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png 84 usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png 85 usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png 86 usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png 87 usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png 88 usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png 89 usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png 90 usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png 91 usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png 92 usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png 93 usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png 94 95 79 96 # comment out if not building with libhttpclient-java and libhttpcore-java 80 97 # 2 MB of dependencies vs. 20 KB of copied source -
debian-alt/xenial/rules
rc02f685 r9b17b52 143 143 ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar 144 144 145 @# debian: everywhere; ubuntu: trusty+ 146 @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties 147 145 148 @# 2 MB of dependencies vs. 20 KB of copied source 146 149 @# Requires 4.4 or higher. -
debian/control
rc02f685 r9b17b52 80 80 libjetty9-java, 81 81 libtaglibs-standard-jstlel-java, 82 libtomcat8-java 82 libtomcat8-java, 83 famfamfam-flag-png 83 84 Replaces: i2p ( << 0.8.6-5) 84 85 Breaks: i2p (<< 0.8.6-5) -
debian/i2p-router.links
rc02f685 r9b17b52 83 83 84 84 85 # comment out if not building with famfamfam-flag-png 86 # ubuntu: trusty+ 87 # debian: everywhere 88 usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags 89 usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png 90 usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png 91 usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png 92 usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png 93 usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png 94 usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png 95 usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png 96 usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png 97 usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png 98 usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png 99 usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png 100 101 85 102 # comment out if not building with libhttpclient-java and libhttpcore-java 86 103 # 2 MB of dependencies vs. 20 KB of copied source -
debian/rules
rc02f685 r9b17b52 152 152 ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar 153 153 154 @# debian: everywhere; ubuntu: trusty+ 155 @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties 156 154 157 @# 2 MB of dependencies vs. 20 KB of copied source 155 158 @# Requires 4.4 or higher. -
history.txt
rc02f685 r9b17b52 1 2018-06-27 zzz 2 * Debian: Add dependency for famfamfam-flag-png (ticket #2270) 3 4 2018-06-26 zzz 5 * Console: Move modified flags to new dir (ticket #2270) 6 * Console servlets: Move to new package (ticket #2265) 7 * NTCP pumper: Reduce false positives in failsafe code (ticket #2237) 8 * NTCP2: Initial checkins (proposal #111) 9 * Streaming: Enforce valid port in setters 10 1 11 * 2018-06-26 0.9.35 released 2 12
Note: See TracChangeset
for help on using the changeset viewer.