Changeset e2f048b for debian


Ignore:
Timestamp:
Apr 1, 2016 6:19:06 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d6b1f81
Parents:
a493a28
Message:

Debian:
Add dependency on libjetty8-java and libservlet3.0-java packages
Remove those binaries in debian builds
Prep for dependency on libservlet2.5-java package
Prep for dependency on libtomcat6-java package
Prep for dependency on libtomcat7-java package
Prep for dependency on libjakarta-taglibs-standard-java package
Prep for dependency on libjstl1.1-java package
Add build properties for building with packages
Rework of apps/jetty/build.xml for building with packages
Redefine debian/ as the files for the jessie build
Make debian-alt directories for ubuntu builds
Move debian/changelog to debian-alt/trusty/changelog
Move debian-alt/jessie/changelog to debian/changelog
Add apps/jetty/jettylib/jsp-api.jar to classpath for jsp builds

Location:
debian
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • debian/changelog

    ra493a28 re2f048b  
    1 i2p (0.9.25-1ubuntu1) trusty; urgency=medium
    2 
    3   * New upstream version 0.9.25
    4 
    5  -- zzz on i2p (key signing) <zzz@i2pmail.org>  Sat, 26 Mar 2016 12:12:12 +0000
    6 
    7 i2p (0.9.24-1ubuntu1) trusty; urgency=medium
    8 
    9   * Upload to PPA
    10 
    11  -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 30 Jan 2016 14:12:27 +0000
     1i2p (0.9.25-1~deb8u+1) stable; urgency=medium
     2
     3  * Backport to Jessie
     4
     5 -- zzz on i2p <zzz@i2pmail.org>  Tue, 29 Mar 2016 18:12:12 +0000
    126
    137i2p (0.9.24-1) unstable; urgency=medium
     
    119113
    120114 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 20 Jun 2015 11:22:28 +0000
     115
    121116i2p (0.9.20-2) unstable; urgency=medium
    122117
     
    332327    - Update GeoIP data
    333328
     329 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 01 Nov 2014 23:34:28 +0000
     330
    334331i2p (0.9.15-1) unstable; urgency=medium
    335332
    336   * New Upstream release
     333  * New Upstream Version
    337334    - Add support for Ed25519 signatures
    338335    - i2psnark move to separate config file for each torrent to better support
     
    371368      + Fix update buttons
    372369      + Don't filter parameter names starting with "nofilter_"
    373       + Re-allow configadvanced, news URL, and unsigned update URL if
    374         routerconsole.advanced=true
    375       + Re-allow plugin install if routerconsole.advanced=true or
    376         routerconsole.enablePluginInstall=true
    377       + Only allow whitelisted plugin signers, unless
    378         routerconsole.allowUntrustedPlugins=true
    379       + Re-allow clients.config changes if routerconsole.advanced=true or
    380         routerconsole.enableClientChange=true
     370      + Re-allow configadvanced, news URL, and unsigned update URL if routerconsole.advanced=true
     371      + Re-allow plugin install if routerconsole.advanced=true or routerconsole.enablePluginInstall=true
     372      + Only allow whitelisted plugin signers, unless routerconsole.allowUntrustedPlugins=true
     373      + Re-allow clients.config changes if routerconsole.advanced=true or routerconsole.enableClientChange=true
    381374      + More escaping
    382375    - i2psnark: Fix add torrent form
     
    402395      for better compatibility with Vuze
    403396  * Other
    404     - Reseeding now fetches a signed zip file containing router infos for
    405       security and speed
     397    - Reseeding now fetches a signed zip file containing router infos for security and speed
    406398    - Use JVM's AES implementation if it is faster
    407399    - More advanced options shown in the i2ptunnel edit pages
    408     - Per-message reliabilitiy settings in I2CP and error propagation back
    409       from router to client
     400    - Per-message reliabilitiy settings in I2CP and error propagation back from router to client
    410401    - Lots of findbugs fixes and cleanups
    411402    - Support signature types in SAM, bump rev to 3.1
     
    449440i2p (0.9.11-1) unstable; urgency=medium
    450441
    451   * New release
    452   * Debconf: New Korean and Polish translations
    453 
    454  -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 09 Feb 2014 00:00:00 +0000
     442  * New Upstream Version
     443  * Debconf: New Japanese and Korean translations
     444
     445 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 08 Feb 2014 22:31:59 +0000
    455446
    456447i2p (0.9.10-1) unstable; urgency=medium
    457448
    458   * New release
     449  * New Upstream Version
    459450  * Remove /var/lib/i2p when i2p package is purged.
    460451  * Bump standards version to 3.9.5 (no changes needed)
     
    462453 -- Kill Your TV <killyourtv@i2pmail.org>  Wed, 22 Jan 2014 16:00:24 +0000
    463454
    464 i2p (0.9.9-1) unstable; urgency=medium
    465 
    466   * New Upstream release
     455i2p (0.9.9-1deb8u1) unstable; urgency=medium
     456
     457  * New Upstream Version
     458  * Drop from debian/patches (already in 0.9.9):
     459    - 0006-allow-webapps-to-be-preseeded.patch
     460    - 0007-geoipv6-fix.patch
     461    - 0008-IPv6-categories-in-netdb.patch
     462    - 0009-mark-ipv6-only-as-experimental.patch
     463    - 0010-snark-start-torrent-by-default.patch
     464    - 0011-fix-start-and-start-all-buttons.patch
     465    - 0012-add-no.i2p-registrar.patch
     466    - 0013-persistent-keying-for-SOCKS-tunnels.patch
     467    - 0014-post-limiter.patch
     468    - 0015-home-remove-config-when-restoring-default.patch
     469    - 0016-new-netdb-categories.patch
     470    - 0017-updated-trac-links.patch
    467471  * debconf:
    468472    - Updated French translation
     
    471475 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 07 Dec 2013 18:17:24 +0000
    472476
    473 i2p (0.9.8-1) unstable; urgency=low
     477i2p (0.9.8.1-deb8u1) stable; urgency=low
     478
     479  * Change initscript to grant read/write permissions to members of the i2psvc
     480    group.
     481  * Postinst: Silence a misleading warning
     482
     483 -- Kill Your TV <killyourtv@i2pmail.org>  Thu, 07 Nov 2013 00:22:48 +0000
     484
     485i2p (0.9.8.1-1deb1) stable; urgency=low
     486
     487  * New upstream version 0.9.8.1. Initially I was not going to build 0.9.8.1
     488    packages since 0.9.8.1 was a Windows-only point release but I thought it
     489    would be good to have it in Tails. At the same time we may as well
     490    cherry-pick some easy bugfixes/updates from mtn.
     491  * debian/rules: Set the builddistribution specific versions
     492  * use xz for the 'debian' quilt 3.0 tarball
     493  * Cherry-picked fixes/updates:
     494    - Allow webapps.config to be preseeded by distributions
     495    - IPv6:
     496      + GeoIPv6 fixes (ticket #1096)
     497      + Add IPv6 NetDB categories
     498      + Mark IPv6-only as experimental
     499    - I2PSnark:
     500      + Start torrent by default
     501      + Fix start and start-all buttons on text browsers and Opera
     502        (ticket #1093)
     503    - I2PTunnel:
     504      + Post limiter
     505      + Persistent keying for SOCKS tunnels (ticket #1088)
     506    - Add no.i2p registrar
     507    - Remove config when restoring default settings
     508    - Additional NetDB categories
     509    - Change Trac links to HTTPS
     510
     511 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 05 Nov 2013 17:34:38 +0000
     512
     513i2p (0.9.8-1) stable; urgency=low
    474514
    475515  * New Upstream Version
     
    478518 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 30 Sep 2013 16:14:40 +0000
    479519
    480 i2p (0.9.7.1-1) unstable; urgency=low
     520i2p (0.9.7.1-1) stable; urgency=low
    481521
    482522  * New upstream version 0.9.7.1
    483523  * Compress packages with xz
    484524
    485  -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 10 Aug 2013 22:10:08 +0000
     525 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 10 Aug 2013 19:02:24 +0000
    486526
    487527i2p (0.9.7-2) unstable; urgency=low
    488528
    489529  * Bugfix: Add missing ; to i2prouter script.
    490   * Test scripts with "sh -n" in the build target
    491530
    492531 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 16 Jul 2013 11:08:48 +0000
     
    504543
    505544  * New upstream release
    506   * i2prouter: allow overrides to be set in /etc/default/i2p
    507 
    508  -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 27 May 2013 00:00:00 +0000
     545
     546 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 27 May 2013 23:18:54 +0000
    509547
    510548i2p (0.9.5-2) unstable; urgency=low
    511549
    512550  * debian/i2p.postinst: Explicitly set permissions on /etc/i2p/wrapper.config
    513     to compensate for stricter umasks.
    514 
    515  -- Kill Your TV <killyourtv@i2pmail.org>  Sun, 31 Mar 2013 12:50:17 +0000
     551    to compensate for stricter umasks. Fixes #906.
     552
     553 -- Kill Your TV <killyourtv@i2pmail.org>  Sun, 31 Mar 2013 12:53:43 +0000
    516554
    517555i2p (0.9.5-1) unstable; urgency=low
     
    524562 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 08 Mar 2013 23:04:51 +0000
    525563
    526 i2p (0.9.4-3) unstable; urgency=low
     564i2p (0.9.4+repack-3) unstable; urgency=low
    527565
    528566  * Backport fix from MTN for ticket #817
     
    530568 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 22 Dec 2012 13:07:47 +0000
    531569
    532 i2p (0.9.4-2) unstable; urgency=low
     570i2p (0.9.4+repack-2) unstable; urgency=low
    533571
    534572  * Add missing build-dep on libservice-wrapper-java
     
    536574 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 17 Dec 2012 20:40:07 +0000
    537575
    538 i2p (0.9.4-1) stable; urgency=low
     576i2p (0.9.4+repack-1) unstable; urgency=low
    539577
    540578  * explicitly prefer openjdk-*-headless over default-jre-headless. Debian
     
    573611 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 17 Dec 2012 23:59:59 +0000
    574612
    575 i2p (0.9.3-1) stable; urgency=low
     613i2p (0.9.3+repack-1) unstable; urgency=low
    576614
    577615  * New Upstream release
    578   * Upstream changelog (full details in history.txt):
     616  * Upstream changelog:
    579617    - Active Queue Management
    580618    - I2PSnark DHT: Several bug fixes, enable by default.
     
    607645 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 27 Oct 2012 16:47:37 +0000
    608646
    609 i2p (0.9.2-2) stable; urgency=high
     647i2p (0.9.2+repack-2) unstable; urgency=high
    610648
    611649  * Fix stupid bug in i2prouter
     
    613651 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 22 Sep 2012 13:57:39 +0000
    614652
    615 i2p (0.9.2-1) stable; urgency=low
     653i2p (0.9.2+repack-1) stable; urgency=low
    616654
    617655  * New upstream release (see history.txt for details)
     
    619657 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 21 Sep 2012 18:13:32 +0000
    620658
    621 i2p (0.9.1-1) stable; urgency=low
     659i2p (0.9.1+repack-1) unstable; urgency=low
    622660
    623661  * New upstream version 0.9.1
     
    634672 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 30 Jul 2012 17:41:04 +0000
    635673
    636 i2p (0.9-1) stable; urgency=low
     674i2p (0.9-1) unstable; urgency=low
    637675
    638676  * New Upstream Version
     
    640678 -- Kill Your TV <killyourtv@i2pmail.org>  Wed, 02 May 2012 16:33:11 +0000
    641679
    642 i2p (0.8.13-2) stable; urgency=low
     680i2p (0.8.13-2) unstable; urgency=low
    643681
    644682  * Fix bug in postinst cause by changes to adduser's behaviour.
     
    687725 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 06 Jan 2012 02:49:03 +0000
    688726
    689 i2p (0.8.11-2) stable; urgency=medium
     727i2p (0.8.11+repack-2) stable; urgency=medium
    690728
    691729  * Fix STUPID bug running I2P with i2prouter. Thanks soundwave.
     
    693731 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 08 Nov 2011 20:02:05 +0000
    694732
    695 i2p (0.8.11-1) stable; urgency=low
     733i2p (0.8.11+repack-1) stable; urgency=low
    696734
    697735  * New Upstream Version
     
    700738 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 07 Nov 2011 19:20:15 +0000
    701739
    702 i2p (0.8.10-1) stable; urgency=medium
     740i2p (0.8.10+repack-1) stable; urgency=medium
    703741
    704742  * New upstream version
     
    706744 -- Kill Your TV <killyourtv@i2pmail.org>  Thu, 20 Oct 2011 05:25:04 +0000
    707745
    708 i2p (0.8.9-1) stable; urgency=medium
     746i2p (0.8.9+repack-1) stable; urgency=medium
    709747
    710748  * New upstream version
     
    712750 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 11 Oct 2011 19:55:08 +0000
    713751
    714 i2p (0.8.8-3) UNRELEASED; urgency=low
     752i2p (0.8.8+repack-3) UNRELEASED; urgency=low
    715753
    716754  * Add dump option to initscript
     
    718756 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 06 Sep 2011 12:42:22 +0000
    719757
    720 i2p (0.8.8-2) stable; urgency=medium
     758i2p (0.8.8+repack-2) stable; urgency=medium
    721759
    722760  * Backport patch from mtn 04ec606 to fix trac #515
     
    728766 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 02 Sep 2011 23:32:32 +0000
    729767
    730 i2p (0.8.8-1) stable; urgency=low
     768i2p (0.8.8+repack-1) stable; urgency=low
    731769
    732770  * New Upstream Version
  • debian/control

    ra493a28 re2f048b  
    1111 ,debconf
    1212 ,openjdk-7-jdk
     13 ,libjetty8-java, libservlet3.0-java
    1314 ,dh-apparmor
    1415 ,gettext
     
    7374 openjdk-8-jre-headless | openjdk-7-jre-headless | default-jre-headless | java8-runtime-headless | java7-runtime-headless,
    7475 libecj-java,
    75  geoip-database
     76 geoip-database,
     77 libjetty8-java, libservlet3.0-java
    7678Replaces: i2p ( << 0.8.6-5)
    7779Breaks: i2p (<< 0.8.6-5)
  • debian/i2p-router.install

    ra493a28 re2f048b  
    2121
    2222pkg-temp/lib/BOB.jar usr/share/i2p/lib
    23 pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    24 pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
    2523pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
    2624pkg-temp/lib/i2p.jar usr/share/i2p/lib
    2725pkg-temp/lib/i2psnark.jar usr/share/i2p/lib
    2826pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib
    29 pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
    30 pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    31 pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
    32 pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib
    33 pkg-temp/lib/jetty-http.jar usr/share/i2p/lib
    34 pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
    35 pkg-temp/lib/jetty-io.jar usr/share/i2p/lib
    36 pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
    37 pkg-temp/lib/jetty-security.jar usr/share/i2p/lib
    38 pkg-temp/lib/jetty-servlet.jar usr/share/i2p/lib
    39 pkg-temp/lib/jetty-servlets.jar usr/share/i2p/lib
    40 pkg-temp/lib/jetty-start.jar usr/share/i2p/lib
    41 pkg-temp/lib/jetty-util.jar usr/share/i2p/lib
    42 pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib
    43 pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
    4427pkg-temp/lib/jrobin.jar usr/share/i2p/lib
    45 pkg-temp/lib/jstl.jar usr/share/i2p/lib
    4628pkg-temp/lib/mstreaming.jar usr/share/i2p/lib
    47 pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
    48 pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
    4929pkg-temp/lib/routerconsole.jar usr/share/i2p/lib
    5030pkg-temp/lib/router.jar usr/share/i2p/lib
    5131pkg-temp/lib/sam.jar usr/share/i2p/lib
    52 pkg-temp/lib/standard.jar usr/share/i2p/lib
    5332pkg-temp/lib/streaming.jar usr/share/i2p/lib
    5433pkg-temp/lib/systray4j.jar usr/share/i2p/lib
    5534pkg-temp/lib/systray.jar usr/share/i2p/lib
     35
     36
     37# uncomment if not building with libjetty8-java
     38# ubuntu: only in wily
     39# debian: in wheezy jessie stretch sid
     40#pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
     41#pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib
     42#pkg-temp/lib/jetty-http.jar usr/share/i2p/lib
     43#pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
     44#pkg-temp/lib/jetty-io.jar usr/share/i2p/lib
     45#pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
     46#pkg-temp/lib/jetty-security.jar usr/share/i2p/lib
     47#pkg-temp/lib/jetty-servlet.jar usr/share/i2p/lib
     48#pkg-temp/lib/jetty-servlets.jar usr/share/i2p/lib
     49#pkg-temp/lib/jetty-start.jar usr/share/i2p/lib
     50#pkg-temp/lib/jetty-util.jar usr/share/i2p/lib
     51#pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib
     52#pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
     53#pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
     54#pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
     55# following two are from libservlet3.0-java which is a dependency of libjetty8-java
     56#pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     57#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
     58
     59
     60# uncomment if not building with libservlet2.5-java
     61# ubuntu: only in wily
     62# debian: in wheezy jessie stretch sid
     63pkg-temp/lib/commons-el.jar usr/share/i2p/lib
     64
     65
     66# uncomment if not building with libtomcat6-java
     67# ubuntu: only in precise trusty vivid
     68# debian: only in wheezy
     69# todo: see if libtomcat7-java will work
     70# legacy name, contains only tomcat-juli, not commons-logging
     71pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
     72
     73
     74# uncomment if not building with libjakarta-taglibs-standard-java
     75# ubuntu: only in wily
     76# debian: in wheezy jessie stretch sid
     77pkg-temp/lib/jstl.jar usr/share/i2p/lib
     78
     79
     80# uncomment if not building with libjstl1.1-java
     81# ubuntu: in precise trusty vivid wily xenial
     82# debian: in wheezy jessie stretch sid
     83pkg-temp/lib/standard.jar usr/share/i2p/lib
  • debian/i2p-router.links

    ra493a28 re2f048b  
    44usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
    55
    6 usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
     6usr/share/java/eclipse-ecj.jar /usr/share/i2p/lib/eclipse-ecj.jar
     7
     8
     9# comment out if not building with libjetty8-java
     10# ubuntu: only in wily
     11# debian: in wheezy jessie stretch sid
     12usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
     13usr/share/java/jetty8-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
     14usr/share/java/jetty8-http.jar usr/share/i2p/lib/jetty-http.jar
     15usr/share/java/jetty8-io.jar usr/share/i2p/lib/jetty-io.jar
     16# legacy name in lib/
     17usr/share/java/jetty8-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
     18usr/share/java/jetty8-security.jar usr/share/i2p/lib/jetty-security.jar
     19usr/share/java/jetty8-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
     20usr/share/java/jetty8-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
     21usr/share/java/jetty8-start.jar usr/share/i2p/lib/jetty-start.jar
     22usr/share/java/jetty8-util.jar usr/share/i2p/lib/jetty-util.jar
     23usr/share/java/jetty8-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
     24usr/share/java/jetty8-xml.jar usr/share/i2p/lib/jetty-xml.jar
     25# legacy name in lib/
     26usr/share/java/jetty8-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
     27# legacy name in lib/
     28usr/share/java/jetty8-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
     29# following two are from libservlet3.0-java which is a dependency of libjetty8-java
     30# legacy name in lib/
     31usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
     32# combined into javax.servlet.jar in non-package builds
     33usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
     34
     35
     36# comment out if not building with libservlet2.5-java
     37# ubuntu: only in wily
     38# debian: in wheezy jessie stretch sid
     39#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
     40
     41
     42# comment out if not building with libtomcat6-java
     43# ubuntu: only in precise trusty vivid
     44# debian: only in wheezy
     45# todo: see if libtomcat7-java will work
     46# legacy name, contains only tomcat-juli, not commons-logging
     47#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
     48#usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
     49# combined into jasper-runtime.jar in non-package builds
     50#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
     51
     52
     53# comment out if not building with libjakarta-taglibs-standard-java
     54# ubuntu: only in wily
     55# debian: in wheezy jessie stretch sid
     56#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
     57
     58
     59# comment out if not building with libjstl1.1-java
     60# ubuntu: in precise trusty vivid wily xenial
     61# debian: in wheezy jessie stretch sid
     62#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar
  • debian/repack.sh

    ra493a28 re2f048b  
    3232                        --delete '*/installer/resources/geoip.txt' \
    3333                        --delete '*/installer/resources/geoipv6.dat.gz' \
     34                        --delete '*/apps/jetty/apache-tomcat/*' \
     35                        --delete '*/apps/jetty/apache-tomcat-deployer/*' \
     36                        --delete '*/apps/jetty/jetty-distribution-*/*' \
     37                        --delete '*/apps/susidns/src/WEB-INF/lib/jstl.jar' \
     38                        --delete '*/apps/susidns/src/WEB-INF/lib/standard.jar' \
    3439                        --delete '*/debian/*' > "$tdir/${fname}"
    3540
  • debian/rules

    ra493a28 re2f048b  
    7777        @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
    7878        @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
     79        @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
     80
     81        # debian and ubuntu: everywhere
    7982        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    80         @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
     83
     84        # ubuntu: only in wily
     85        # debian: in wheezy jessie stretch sid
     86        @/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
     87        ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
     88        ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
     89        ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
     90        ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
     91        ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
     92        ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
     93        ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
     94        ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
     95        ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
     96        ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
     97        ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
     98        ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
     99        ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
     100        ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
     101
     102        # ubuntu: only in wily
     103        # debian: in wheezy jessie stretch sid
     104        #@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
     105        #ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     106        #ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
     107        #ln -sf /usr/share/java/servlet-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     108
     109        # ubuntu: only in precise trusty vivid
     110        # debian: only in wheezy
     111        #@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
     112        #ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
     113        #ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     114        #ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     115        #ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     116
     117        # debian and ubuntu: everywhere
     118        #@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
     119        #ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
     120        #ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     121        #ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     122        #ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     123
     124        # ubuntu: only in wily
     125        # debian: in wheezy jessie stretch sid
     126        #@/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties
     127        #ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
     128
     129        # debian and ubuntu: everywhere
     130        #@/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties
     131        #ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/jstl.jar
     132
    81133        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
    82134        echo router.updateDisabled=true > $(I2P)/router.config
Note: See TracChangeset for help on using the changeset viewer.