Changeset a493a28


Ignore:
Timestamp:
Mar 31, 2016 10:42:52 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
e2f048b
Parents:
e69f39f6 (diff), f3c679e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p' (head 809274054ef446273ea312a631fe7482fa53c030)

to branch 'i2p.i2p.zzz.debian' (head 437e22ee74e32e103bb8475007b1d1a2f995ef28)

Files:
9 added
4 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    re69f39f6 ra493a28  
    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 dh-systemd" />
     70            <echo message="                   quilt libcommons-logging-java dh-apparmor dh-systemd libservice-wrapper-java" />
    7171            <echo message=" " />
    7272            <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
     
    951951        <ant dir="apps/i2psnark/java/" target="distclean" />
    952952        <ant dir="apps/jetty/" target="distclean" />
     953        <ant dir="apps/imagegen/" target="distclean" />
    953954        <delete dir="core/c/jbigi/bin" />
    954955        <delete dir="core/c/jbigi/lib" />
    955956        <delete dir="core/c/jcpuid/lib" />
    956957        <ant dir="installer/resources/locale" target="distclean" />
     958        <ant dir="installer/tools/java" target="distclean" />
    957959        <!--
    958960                NOTE! We need to turn off the default excludes for these
     
    10041006        <ant dir="apps/susidns/src/" target="distclean" />
    10051007        <ant dir="apps/i2psnark/java/" target="distclean" />
     1008        <ant dir="apps/imagegen/" target="distclean" />
    10061009    </target>
    10071010
     
    19831986        </exec>
    19841987        <delete includeemptydirs="true" quiet="false">
     1988            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
    19851989            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
    19861990            <fileset dir="../i2p-${Extended.Version}/Slackware" />
     
    19911995                <include name="**/**" />
    19921996                <exclude name="debian/**"/>
     1997                <exclude name="debian-alt/**"/>
    19931998                <exclude name="**/*.sh"/>
    19941999                <exclude name="installer/resources/geoip.txt"/>
     
    19962001            </tarfileset>
    19972002            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}" filemode="755">
     2003                <exclude name="debian/**" />
     2004                <include name="**/*.sh" />
     2005            </tarfileset>
     2006        </tar>
     2007    </target>
     2008
     2009    <!-- same as debian-tarball but with a release tar.bz2 file name and tar prefix -->
     2010    <target name="debian-release-tarball" depends="getExtendedVersion">
     2011        <!-- this will use the monotonerc file in the current workspace -->
     2012        <fail message="This target cannot be used without Monotone! Use &quot;fakeroot debian/rules get-orig-source&quot; instead.">
     2013            <condition>
     2014                <not>
     2015                    <isset property="mtn.available" />
     2016                </not>
     2017            </condition>
     2018        </fail>
     2019        <property name="debian.tarball.name" value="i2p_${release.number}.orig.tar.bz2" />
     2020        <echo message="Checking out fresh copy into ../i2p-${Extended.Version} for tarballing:" />
     2021        <delete dir="../i2p-${Extended.Version}" />
     2022        <exec executable="mtn" failonerror="true">
     2023            <arg value="co" />
     2024            <arg value="-b" />
     2025            <arg value="i2p.i2p" />
     2026            <!-- w: is the revision of the current workspace -->
     2027            <arg value="-r" />
     2028            <arg value="w:" />
     2029            <arg value="../i2p-${Extended.Version}" />
     2030        </exec>
     2031        <delete includeemptydirs="true" quiet="false">
     2032            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
     2033            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
     2034            <fileset dir="../i2p-${Extended.Version}/Slackware" />
     2035            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2036        </delete>
     2037        <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
     2038            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}">
     2039                <include name="**/**" />
     2040                <exclude name="debian/**"/>
     2041                <exclude name="debian-alt/**"/>
     2042                <exclude name="**/*.sh"/>
     2043            </tarfileset>
     2044            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}" filemode="755">
    19982045                <exclude name="debian/**" />
    19992046                <include name="**/*.sh" />
  • debian/repack.sh

    re69f39f6 ra493a28  
    2929bzcat "$tarball" | tar --wildcards --delete '*/installer/lib/*' \
    3030                        --delete '*/Slackware/*' \
     31                        --delete '*/debian-alt/*' \
    3132                        --delete '*/installer/resources/geoip.txt' \
    3233                        --delete '*/installer/resources/geoipv6.dat.gz' \
  • debian/rules

    re69f39f6 ra493a28  
    3737
    3838%:
    39         dh $@ --with systemd
     39        dh $@ --with systemd,quilt
    4040
    4141clean: createcopyright
  • installer/resources/launchpad.txt

    re69f39f6 ra493a28  
    4646  * name and email MUST EXACTLY match what's in your GPG keyring
    4747    or the signing will fail.
    48     (or add -k keyid argument to debuild)
     48    (or add -k keyid argument to debuild, which you must do
     49     if you want to sign with a subkey)
    4950    run gpg -K to list your private keys
    5051- edit debian/control to uncomment libservice-wrapper-java line
Note: See TracChangeset for help on using the changeset viewer.