From a6e8d53b37e4823028a60e1d7a9f8534baf59963 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Wed, 11 Jan 2023 10:15:12 -0500
Subject: [PATCH] Console: Incorporate bionic build patch from previous checkin
Remove patch from debian files
---
apps/routerconsole/java/build.xml | 3 +++
.../bionic/patches/0004-getopt-build.patch | 19 -------------------
debian-alt/bionic/patches/series | 1 -
3 files changed, 3 insertions(+), 20 deletions(-)
delete mode 100644 debian-alt/bionic/patches/0004-getopt-build.patch
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 48f92457c2..65cddc0728 100644
--- 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" />
diff --git a/debian-alt/bionic/patches/0004-getopt-build.patch b/debian-alt/bionic/patches/0004-getopt-build.patch
deleted file mode 100644
index 698dfe7177..0000000000
--- a/debian-alt/bionic/patches/0004-getopt-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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" />
diff --git a/debian-alt/bionic/patches/series b/debian-alt/bionic/patches/series
index 357bbc52b8..5fabbd7e7c 100644
--- a/debian-alt/bionic/patches/series
+++ b/debian-alt/bionic/patches/series
@@ -1,3 +1,2 @@
0001-path-substitution.patch
0002-jetty-compatibility.patch
-0004-getopt-build.patch
--
GitLab