From ec6c24429aa07d280e4028c2e2b58b5a0b7ba4c3 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 3 Mar 2017 19:44:39 +0000
Subject: [PATCH] Debian build fixes

---
 apps/jetty/build.xml              |  2 +-
 apps/routerconsole/java/build.xml |  3 +++
 build.xml                         | 10 +++++-----
 debian-alt/xenial/rules           |  2 +-
 debian/i2p-router.install         |  6 +++---
 debian/rules                      |  2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index 11333eb52..b9bf0401b 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -238,7 +238,7 @@
      -->
     <target name="copyTomcatLib" depends="mkJettylibdir, copyTomcatLib1, copyTomcatLib2, copyTomcatLib3" />
 
-    <target name="copyTomcatLib1" unless="${with-libjetty9-java}" >
+    <target name="copyTomcatLib1" >
         <condition property="with-libtomcat-java" >
             <or>
                 <istrue value="${with-libtomcat6-java}" />
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 988ebefc3..fe6e9ed1b 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -76,6 +76,9 @@
                 <pathelement location="../../desktopgui/dist/desktopgui.jar" />
                 <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
                 <pathelement location="../../jrobin/java/build/jrobin.jar" />
+
+                <!-- following jars only present for debian builds -->
+                <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
             </classpath>
         </javac>
     </target>
diff --git a/build.xml b/build.xml
index 9b92b1b69..079b83a72 100644
--- a/build.xml
+++ b/build.xml
@@ -70,8 +70,8 @@
             <echo message="The following command will install the build dependencies for you:" />
             <echo message=" " />
             <echo message="sudo apt-get install debhelper ant debconf default-jdk gettext libgmp-dev po-debconf fakeroot \" />
-            <echo message="  build-essential quilt libcommons-logging-java dh-apparmor dh-systemd libservice-wrapper-java \"  />
-            <echo message="  devscripts libjetty9-java glassfish-javaee"  />
+            <echo message="  build-essential quilt dh-apparmor dh-systemd libservice-wrapper-java \"  />
+            <echo message="  devscripts libjetty9-java libtomcat8-java glassfish-javaee libgetopt-java"  />
             <echo message=" " />
             <echo message="The following command will install the additional runtime dependencies:" />
             <echo message="sudo apt-get install libecj-java geoip-database" />
@@ -2206,7 +2206,7 @@
             <arg value="w:" />
             <arg value="../i2p-${Extended.Version}" />
         </exec>
-        <delete includeemptydirs="true" quiet="false">
+        <delete includeemptydirs="true" quiet="false" failonerror="false">
             <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
             <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
             <fileset dir="../i2p-${Extended.Version}/Slackware" />
@@ -2279,7 +2279,7 @@
             <arg value="i2p.i2p" />
             <arg value="../i2p-${Extended.Version}" />
         </exec>
-        <delete includeemptydirs="true" quiet="false">
+        <delete includeemptydirs="true" quiet="false" failonerror="false">
             <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
             <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
             <fileset dir="../i2p-${Extended.Version}/Slackware" />
@@ -2353,7 +2353,7 @@
             <arg value="i2p.i2p" />
             <arg value="../i2p-${Extended.Version}" />
         </exec>
-        <delete includeemptydirs="true" quiet="false">
+        <delete includeemptydirs="true" quiet="false" failonerror="false">ilonerror="false">
             <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
             <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
             <fileset dir="../i2p-${Extended.Version}/Slackware" />
diff --git a/debian-alt/xenial/rules b/debian-alt/xenial/rules
index 214af9772..496c946d5 100755
--- a/debian-alt/xenial/rules
+++ b/debian-alt/xenial/rules
@@ -103,7 +103,7 @@ endif
 	ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
 	@# following two are from libservlet3.1-java which is a dependency of libjetty9-java
 	ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
-        @# this is roughly the same as tomcat8-jsp-api.jar, we use this one
+	@# this is roughly the same as tomcat8-jsp-api.jar, we use this one
 	ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
 
 	@# debian and ubuntu: wheezy-backports, jessie+, xenial+
diff --git a/debian/i2p-router.install b/debian/i2p-router.install
index 2b4f934df..2d514a85f 100644
--- a/debian/i2p-router.install
+++ b/debian/i2p-router.install
@@ -56,10 +56,10 @@ pkg-temp/lib/systray.jar usr/share/i2p/lib
 
 
 # uncomment if not building with libtomcat8-java
-pkg-temp/lib/commons-el.jar usr/share/i2p/lib
+#pkg-temp/lib/commons-el.jar usr/share/i2p/lib
 # legacy name, contains only tomcat-juli, not commons-logging
-pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
-pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
+#pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
+#pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
 
 
 # uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
diff --git a/debian/rules b/debian/rules
index 62eeccb9a..d6bf372d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,7 +103,7 @@ endif
 	ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
 	@# following two are from libservlet3.1-java which is a dependency of libjetty9-java
 	ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
-        @# this is roughly the same as tomcat8-jsp-api.jar, we use this one
+	@# this is roughly the same as tomcat8-jsp-api.jar, we use this one
 	ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
 
 	@# debian and ubuntu: wheezy-backports, jessie+, xenial+