Changeset 9b17b52


Ignore:
Timestamp:
Jun 27, 2018 4:16:08 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
bc4ee0fc, d8cc2a3
Parents:
c02f685
Message:

Debian: Add dependency for famfamfam-flag-png (ticket #2270)

Files:
18 edited

Legend:

Unmodified
Added
Removed
  • .tx/config

    rc02f685 r9b17b52  
    452452[I2P.eepsite]
    453453;;
    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
    456457;;
    457458type = HTML
  • build.properties

    rc02f685 r9b17b52  
    159159# Don't compile gnu.getopt classes, we will use libgetopt-java package
    160160#with-libgetopt-java=true
     161# Don't bundle flags, we will use famfamfam-flag-png package
     162#with-famfamfam-flag-png=true
    161163# Don't compile org.apache.http classes, we will use libhttpclient-java and libhttpcore-java packages
    162164# 2 MB of dependencies vs. 20 KB of copied source
  • build.xml

    rc02f685 r9b17b52  
    12801280
    12811281    <!-- 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">
    12831283        <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
    12841284        <!-- Also remove deletelist.txt used for updater only -->
     
    13261326            <fileset dir="installer/resources/eepsite/" excludes="**/.placeholder" />
    13271327        </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}" >
    13281332        <copy todir="pkg-temp/eepsite/docroot/help/lib/" >
    13291333            <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" />
    13301334        </copy>
    1331         <copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
    13321335        <copy todir="pkg-temp/docs/icons/flags" >
    13331336          <!-- base flags/ dir only. flags16x11/ and flags48x48/ dirs already copied by prepConsoleDocs target -->
     
    24112414            <!-- libjakarta-taglibs-standard-java or glassfish-javaee or libtaglibs-standard -->
    24122415            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
     2416            <fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" />
    24132417            <!-- anything added above, add in debian-release-tarball also -->
    24142418        </delete>
     
    24942498            <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
    24952499            <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 -->
    24962501            <!-- anything added above, add in debian-release-tarball also -->
    24972502        </delete>
     
    25702575           -->
    25712576            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
     2577            <fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" />
    25722578            <!-- anything added above, add in debian-tarball also -->
    25732579        </delete>
     
    26402646            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
    26412647            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
     2648            <fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" />
    26422649            <!-- anything added above, add in debian-tarball also -->
    26432650        </delete>
  • debian-alt/buster/control

    rc02f685 r9b17b52  
    8282 libtaglibs-standard-jstlel-java,
    8383 libtomcat8-java,
     84 famfamfam-flag-png
    8485Replaces: i2p ( << 0.8.6-5)
    8586Breaks: i2p (<< 0.8.6-5)
  • debian-alt/buster/rules

    rc02f685 r9b17b52  
    155155        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    156156
     157        @# debian: everywhere; ubuntu: trusty+
     158        @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
     159
    157160        @# 2 MB of dependencies vs. 20 KB of copied source
    158161        @# Requires 4.4 or higher.
  • debian-alt/jessie/control

    rc02f685 r9b17b52  
    8080 gettext-base,
    8181 libgetopt-java,
     82 famfamfam-flag-png
    8283Replaces: i2p ( << 0.8.6-5)
    8384Breaks: i2p (<< 0.8.6-5)
  • debian-alt/jessie/i2p-router.links

    rc02f685 r9b17b52  
    7777
    7878
     79# comment out if not building with famfamfam-flag-png
     80# ubuntu: trusty+
     81# debian: everywhere
     82usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags
     83usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png
     84usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png
     85usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png
     86usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png
     87usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png
     88usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png
     89usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png
     90usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png
     91usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png
     92usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png
     93usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png
     94
     95
    7996# comment out if not building with libhttpclient-java and libhttpcore-java
    8097# 2 MB of dependencies vs. 20 KB of copied source
  • debian-alt/jessie/rules

    rc02f685 r9b17b52  
    144144        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    145145
     146        @# debian: everywhere; ubuntu: trusty+
     147        @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
     148
    146149        @# 2 MB of dependencies vs. 20 KB of copied source
    147150        @# Requires 4.4 or higher.
  • debian-alt/trusty/control

    rc02f685 r9b17b52  
    8181 gettext-base,
    8282 libgetopt-java,
    83  glassfish-javaee
     83 glassfish-javaee,
     84 famfamfam-flag-png
    8485Replaces: i2p ( << 0.8.6-5)
    8586Breaks: i2p (<< 0.8.6-5)
  • debian-alt/trusty/i2p-router.links

    rc02f685 r9b17b52  
    7777
    7878
     79# comment out if not building with famfamfam-flag-png
     80# ubuntu: trusty+
     81# debian: everywhere
     82usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags
     83usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png
     84usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png
     85usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png
     86usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png
     87usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png
     88usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png
     89usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png
     90usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png
     91usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png
     92usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png
     93usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png
     94
     95
    7996# comment out if not building with libhttpclient-java and libhttpcore-java
    8097# 2 MB of dependencies vs. 20 KB of copied source
  • debian-alt/trusty/rules

    rc02f685 r9b17b52  
    144144        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    145145
     146        @# debian: everywhere; ubuntu: trusty+
     147        @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
     148
    146149        @# 2 MB of dependencies vs. 20 KB of copied source
    147150        @# Requires 4.4 or higher.
  • debian-alt/xenial/control

    rc02f685 r9b17b52  
    8383 gettext-base,
    8484 libgetopt-java,
     85 famfamfam-flag-png
    8586Replaces: i2p ( << 0.8.6-5)
    8687Breaks: i2p (<< 0.8.6-5)
  • debian-alt/xenial/i2p-router.links

    rc02f685 r9b17b52  
    7777
    7878
     79# comment out if not building with famfamfam-flag-png
     80# ubuntu: trusty+
     81# debian: everywhere
     82usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags
     83usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png
     84usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png
     85usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png
     86usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png
     87usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png
     88usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png
     89usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png
     90usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png
     91usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png
     92usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png
     93usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png
     94
     95
    7996# comment out if not building with libhttpclient-java and libhttpcore-java
    8097# 2 MB of dependencies vs. 20 KB of copied source
  • debian-alt/xenial/rules

    rc02f685 r9b17b52  
    143143        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    144144
     145        @# debian: everywhere; ubuntu: trusty+
     146        @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
     147
    145148        @# 2 MB of dependencies vs. 20 KB of copied source
    146149        @# Requires 4.4 or higher.
  • debian/control

    rc02f685 r9b17b52  
    8080 libjetty9-java,
    8181 libtaglibs-standard-jstlel-java,
    82  libtomcat8-java
     82 libtomcat8-java,
     83 famfamfam-flag-png
    8384Replaces: i2p ( << 0.8.6-5)
    8485Breaks: i2p (<< 0.8.6-5)
  • debian/i2p-router.links

    rc02f685 r9b17b52  
    8383
    8484
     85# comment out if not building with famfamfam-flag-png
     86# ubuntu: trusty+
     87# debian: everywhere
     88usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags
     89usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png
     90usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png
     91usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png
     92usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png
     93usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png
     94usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png
     95usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png
     96usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png
     97usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png
     98usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png
     99usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png
     100
     101
    85102# comment out if not building with libhttpclient-java and libhttpcore-java
    86103# 2 MB of dependencies vs. 20 KB of copied source
  • debian/rules

    rc02f685 r9b17b52  
    152152        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    153153
     154        @# debian: everywhere; ubuntu: trusty+
     155        @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
     156
    154157        @# 2 MB of dependencies vs. 20 KB of copied source
    155158        @# Requires 4.4 or higher.
  • history.txt

    rc02f685 r9b17b52  
     12018-06-27 zzz
     2  * Debian: Add dependency for famfamfam-flag-png (ticket #2270)
     3
     42018-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
    111* 2018-06-26 0.9.35 released
    212
Note: See TracChangeset for help on using the changeset viewer.