Release tarball build fixes

Precise build tweaks
Precise and Trusty changelogs
This commit is contained in:
zzz
2016-06-07 19:15:00 +00:00
parent aa8fd85d65
commit bfbd159706
4 changed files with 23 additions and 4 deletions

View File

@@ -2094,8 +2094,11 @@
</tar>
</target>
<!-- same as debian-tarball but with bundled jetty -->
<target name="precise-tarball" depends="getExtendedVersion">
<!-- same as debian-release-tarball but with bundled jetty
- We add a 'p' to the release name and tarball since the source package is different;
- Launchpad does not allow different source packages with the same name.
-->
<target name="precise-release-tarball" depends="getExtendedVersion">
<!-- this will use the monotonerc file in the current workspace -->
<fail message="This target cannot be used without Monotone! Use &quot;fakeroot debian/rules get-orig-source&quot; instead.">
<condition>
@@ -2104,7 +2107,7 @@
</not>
</condition>
</fail>
<property name="debian.tarball.name" value="i2p_${Extended.Version}.orig.tar.bz2" />
<property name="debian.tarball.name" value="i2p_${release.number}p.orig.tar.bz2" />
<echo message="Checking out fresh copy into ../i2p-${Extended.Version} for tarballing:" />
<delete dir="../i2p-${Extended.Version}" />
<exec executable="mtn" failonerror="true">
@@ -2112,6 +2115,8 @@
<!-- w: is the revision of the current workspace -->
<arg value="-r" />
<arg value="w:" />
<arg value="-b" />
<arg value="i2p.i2p" />
<arg value="../i2p-${Extended.Version}" />
</exec>
<delete includeemptydirs="true" quiet="false">
@@ -2192,6 +2197,8 @@
<!-- w: is the revision of the current workspace -->
<arg value="-r" />
<arg value="w:" />
<arg value="-b" />
<arg value="i2p.i2p" />
<arg value="../i2p-${Extended.Version}" />
</exec>
<delete includeemptydirs="true" quiet="false">

View File

@@ -49,7 +49,7 @@ Generate files to upload
(or add -kkeyid argument to debuild, which you must do
if you want to sign with a subkey)
run gpg -K to list your private keys
- ant debian-release-tarball
- ant debian-release-tarball (ant precise-release-tarball for precise)
this will make a directory ../i2p-0.9.XX-0-xxxxxxxx/
and a tarball ../i2p_0.9.XX.orig.tar.bz2
- cp debian/changelog ../i2p-0.9.XX-0-xxxxxxxx/debian/

View File

@@ -1,3 +1,9 @@
i2p (0.9.26p-1~precise+1) precise; urgency=medium
* Backport to Precise
-- zzz on i2p <zzz@i2pmail.org> Tue, 07 Jun 2016 12:12:12 +0000
i2p (0.9.25-1~precise+1) precise; urgency=medium
* Backport to Precise

View File

@@ -1,3 +1,9 @@
i2p (0.9.26-1ubuntu1) trusty; urgency=medium
* New upstream version 0.9.26
-- zzz on i2p (key signing) <zzz@i2pmail.org> Tue, 07 Jun 2016 12:12:12 +0000
i2p (0.9.25-1ubuntu1) trusty; urgency=medium
* New upstream version 0.9.25