Console: Incorporate bionic build patch from previous checkin

Remove patch from debian files

apps/routerconsole/java/build.xml

@@ -22,6 +22,7 @@
             <!-- Depend on classes instead of jars where available -->
             <classpath>
                 <pathelement location="../../../core/java/build/obj" />
+                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
                 <pathelement location="../../../router/java/build/obj" />
                 <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
                 <pathelement location="../../jetty/jettylib/jetty-util.jar" />
@@ -65,6 +66,8 @@
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
                 <pathelement location="../../../core/java/build/i2p.jar" />
+                <!-- gnu-getopt.jar only present for debian builds -->
+                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
                 <pathelement location="../../../router/java/build/router.jar" />
                 <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
                 <pathelement location="../../jetty/jettylib/jetty-http.jar" />

debian-alt/bionic/patches/0004-getopt-build.patch

---- a/apps/routerconsole/java/build.xml
-+++ b/apps/routerconsole/java/build.xml
-@@ -22,6 +22,7 @@
-             <!-- Depend on classes instead of jars where available -->
-             <classpath>
-                 <pathelement location="../../../core/java/build/obj" />
-+                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
-                 <pathelement location="../../../router/java/build/obj" />
-                 <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
-                 <pathelement location="../../jetty/jettylib/jetty-util.jar" />
-@@ -65,6 +66,8 @@
-             <compilerarg line="${javac.compilerargs}" />
-             <classpath>
-                 <pathelement location="../../../core/java/build/i2p.jar" />
-+                <!-- gnu-getopt.jar only present for debian builds -->
-+                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
-                 <pathelement location="../../../router/java/build/router.jar" />
-                 <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
-                 <pathelement location="../../jetty/jettylib/jetty-http.jar" />

debian-alt/bionic/patches/series

 0001-path-substitution.patch
 0002-jetty-compatibility.patch
-0004-getopt-build.patch