Changeset ee138a2


Ignore:
Timestamp:
Mar 26, 2016 2:44:37 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
51e04f7
Parents:
5405792
Message:

Build:
Don't bundle launch4j licenses in non-windows builds
Clarify in LICENSES.txt that launch4j is not bundled in non-windows builds and packages
Debian:
Change maintainer
Remove Debian patch that drops the launch4j licenses

Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    r5405792 ree138a2  
    107107Installer:
    108108   Launch4j 3.0.1:
     109   (Launch4j is only included in the upstream source package and Windows binaries.
     110    Not applicable for non-Windows binaries or Debian/Launchpad packages.)
    109111   Copyright (c) 2004, 2008 Grzegorz Kowal
    110112   See licenses/LICENSE-Launch4j.txt (in binary packages)
  • build.xml

    r5405792 ree138a2  
    6868            <echo message=" " />
    6969            <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential \" />
    70             <echo message="                   quilt libcommons-logging-java dh-apparmor" />
     70            <echo message="                   quilt libcommons-logging-java dh-apparmor dh-systemd" />
    7171            <echo message=" " />
    7272            <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
     
    11121112    </target>
    11131113
    1114     <target name="preppkg-windows" depends="preppkg-base, buildUtilityJar, buildexe">
     1114    <target name="preppkg-windows" depends="preppkg-base, preplicenses-windows, buildUtilityJar, buildexe">
    11151115        <copy file="build/i2p.exe" todir="pkg-temp/" failonerror="false" />
    11161116        <copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
     
    12021202    </target>
    12031203
     1204    <!-- does NOT include launch4j licenses for Windows builds -->
    12041205    <target name="preplicenses">
    12051206        <copy file="LICENSE.txt" todir="pkg-temp/" />
     
    12071208          <fileset dir="licenses/" />
    12081209        </copy>
     1210        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
     1211        <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
     1212    </target>
     1213
     1214
     1215    <!-- DOES include launch4j licenses for Windows builds -->
     1216    <target name="preplicenses-windows" depends="preplicenses">
    12091217        <!--
    12101218              The license in launch4j/ is a BSD license for launch4j
     
    12131221         -->
    12141222        <copy file="installer/lib/launch4j/head/LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Launch4j.txt" />
    1215         <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    12161223        <!--  Not sure if these are used or should be included -->
    12171224        <copy file="installer/lib/launch4j/lib/foxtrot.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Foxtrot.txt" />
     
    12191226        <copy file="installer/lib/launch4j/lib/JGoodies.Looks.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Looks.txt" />
    12201227        <copy file="installer/lib/launch4j/lib/XStream.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-XStream.txt" />
    1221         <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
    12221228    </target>
    12231229
  • debian/control

    r5405792 ree138a2  
    11Source: i2p
    2 Maintainer: Kill Your TV <killyourtv@i2pmail.org>
     2Maintainer: zzz <zzz@i2pmail.org>
    33Section: net
    44Standards-Version: 3.9.6
    55Priority: optional
    6 Bugs: mailto:killyourtv@i2pmail.org
     6Bugs: mailto:zzz@i2pmail.org
    77Homepage: https://geti2p.net
    88Build-Depends: debhelper (>= 7.0.50~)
  • debian/patches/series

    r5405792 ree138a2  
    220002-jbigi-soname.patch
    330003-rename-jcpuid.patch
    4 0004-remove-launch4j.patch
Note: See TracChangeset for help on using the changeset viewer.