From d8d0414ec4dde6059a96c6c159193efa180888e3 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 17 Oct 2016 22:16:35 +0000
Subject: [PATCH] Updates for launchpad builds

---
 build.xml                                   | 8 ++++++++
 debian-alt/doc/launchpad.txt                | 8 ++++----
 debian-alt/trusty/changelog                 | 6 ++++++
 debian/patches/0001-path-substitution.patch | 6 +++---
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 6e5592dfd..181ec5c6d 100644
--- a/build.xml
+++ b/build.xml
@@ -2219,7 +2219,9 @@
                 <exclude name="installer/resources/geoip.txt"/>
                 <exclude name="installer/resources/geoipv6.dat.gz"/>
                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
+          <!--
                 <exclude name="apps/susidns/src/lib/jstl.jar" />
+           -->
                 <exclude name="apps/susidns/src/lib/standard.jar" />
           <!--
                 <exclude name="apps/jetty/apache-tomcat/**"/>
@@ -2306,7 +2308,9 @@
           <!--
                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
            -->
+          <!--
                 <exclude name="apps/susidns/src/lib/jstl.jar" />
+           -->
                 <exclude name="apps/susidns/src/lib/standard.jar" />
           <!--
                 <exclude name="apps/jetty/apache-tomcat/**"/>
@@ -2358,7 +2362,9 @@
             <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
+          <!--
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
+           -->
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
           <!--
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
@@ -2375,7 +2381,9 @@
                 <exclude name="installer/resources/geoip.txt"/>
                 <exclude name="installer/resources/geoipv6.dat.gz"/>
                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
+          <!--
                 <exclude name="apps/susidns/src/lib/jstl.jar" />
+           -->
                 <exclude name="apps/susidns/src/lib/standard.jar" />
           <!--
                 <exclude name="apps/jetty/apache-tomcat/**"/>
diff --git a/debian-alt/doc/launchpad.txt b/debian-alt/doc/launchpad.txt
index f252a677b..e6771ecc1 100644
--- a/debian-alt/doc/launchpad.txt
+++ b/debian-alt/doc/launchpad.txt
@@ -17,7 +17,7 @@ Prep
 - Make a PPA, lets call it 'test'
 - OPTIONAL: Go to i2p.packages PPA and copy over existing I2P to your PPA:
   (select "copy existing binaries")
-    trusty, vivid, wily, xenial
+    trusty, vivid, wily, xenial, yakkety, zesty
     not precise (only if building for precise which you probably aren't)
     not utopic (obsolete, disabled by launchpad)
 - Go to i2p.packages PPA and copy over service-wrapper-java to your PPA.
@@ -25,7 +25,7 @@ Prep
   (select "copy existing binaries")
     trusty
     not precise (only if building for precise which you probably aren't)
-    not vivid, wily, xenial (more recent versions 3.5.25-2 or 3.5.26-3 are in official launchpad)
+    not vivid, wily, xenial, yakkety, zesty (more recent versions 3.5.25-2 or 3.5.26-3 are in official launchpad)
     not utopic (obsolete, disabled by launchpad)
 
 - you need the following packages
@@ -101,7 +101,7 @@ So the build isn't done until both arch builds are complete.
 Don't
 
 
-If it works, copy trusty to vivid, wily, and xenial in your PPA
+If it works, copy trusty to vivid, wily, xenial, yakkety, zesty in your PPA
   (select "copy existing binaries")
   Wait a few minutes for that to happen
 
@@ -124,7 +124,7 @@ Add your PPA following the instructions at http://i2p-projekt.i2p/en/download/de
 Release
 -------
 
-Then copy trusty, vivid, wily, and xenial from your PPA to the i2p-maintainers PPA
+Then copy trusty, vivid, wily, xenial, yakkety, zesty, from your PPA to the i2p-maintainers PPA
   (select "copy existing binaries")
   Copy trusty first and wait for it to be published in i2p-maintainers or the others will fail.
 
diff --git a/debian-alt/trusty/changelog b/debian-alt/trusty/changelog
index 585343cd2..356e8f2d9 100644
--- a/debian-alt/trusty/changelog
+++ b/debian-alt/trusty/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.27-1-1ubuntu1) trusty; urgency=medium
+
+  * New upstream version 0.9.27
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org>  Mon, 17 Oct 2016 12:12:12 +0000
+
 i2p (0.9.26-1ubuntu1) trusty; urgency=medium
 
   * New upstream version 0.9.26
diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch
index 7f0d1f833..736a1ff83 100644
--- a/debian/patches/0001-path-substitution.patch
+++ b/debian/patches/0001-path-substitution.patch
@@ -372,16 +372,16 @@ Debian wrapper.config to try to prevent confusion.
 @@ -185,7 +185,7 @@
  msgstr ""
  
- #: ../i2prouter:1875
+ #: ../i2prouter:1874
 -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
  msgstr ""
  
- #: ../i2prouter:1880
+ #: ../i2prouter:1879
 @@ -193,5 +193,5 @@
  msgstr ""
  
- #: ../i2prouter:1883
+ #: ../i2prouter:1882
 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
  msgstr ""