From bfbd15970604ef52e698c8e726a6ce1e95fb7d35 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 7 Jun 2016 19:15:00 +0000
Subject: [PATCH] Release tarball build fixes Precise build tweaks Precise and
 Trusty changelogs

---
 build.xml                    | 13 ++++++++++---
 debian-alt/doc/launchpad.txt |  2 +-
 debian-alt/precise/changelog |  6 ++++++
 debian-alt/trusty/changelog  |  6 ++++++
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 3e14c6510e..5e3a03f86c 100644
--- a/build.xml
+++ b/build.xml
@@ -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">
diff --git a/debian-alt/doc/launchpad.txt b/debian-alt/doc/launchpad.txt
index 7d7a50ce88..f252a677b6 100644
--- a/debian-alt/doc/launchpad.txt
+++ b/debian-alt/doc/launchpad.txt
@@ -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/
diff --git a/debian-alt/precise/changelog b/debian-alt/precise/changelog
index 61ca84a734..2d9270228a 100644
--- a/debian-alt/precise/changelog
+++ b/debian-alt/precise/changelog
@@ -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
diff --git a/debian-alt/trusty/changelog b/debian-alt/trusty/changelog
index 18b5f90384..585343cd2c 100644
--- a/debian-alt/trusty/changelog
+++ b/debian-alt/trusty/changelog
@@ -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