From 87fbec3e391b8e93f9c5ee8d27798bb2bbd06d83 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Wed, 11 Jan 2023 09:53:37 -0500
Subject: [PATCH] Debian files for 2.1.0
Including bionic build fix
Don't know why focal worked without it
---
debian-alt/bionic/changelog | 12 ++++++++++++
.../bionic/patches/0004-getopt-build.patch | 19 +++++++++++++++++++
debian-alt/bionic/patches/series | 1 +
debian-alt/focal/changelog | 6 ++++++
debian/changelog | 6 ++++++
5 files changed, 44 insertions(+)
create mode 100644 debian-alt/bionic/patches/0004-getopt-build.patch
diff --git a/debian-alt/bionic/changelog b/debian-alt/bionic/changelog
index cefd1426af..f109b07629 100644
--- a/debian-alt/bionic/changelog
+++ b/debian-alt/bionic/changelog
@@ -1,3 +1,15 @@
+i2p (2.1.0-2~bionic+1) bionic; urgency=medium
+
+ * Fix build failure
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Wed, 11 Jan 2023 13:13:13 +0000
+
+i2p (2.1.0-1~bionic+1) bionic; urgency=medium
+
+ * New upstream version 2.1.0
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Wed, 11 Jan 2023 12:12:12 +0000
+
i2p (2.0.0-1~bionic+1) bionic; urgency=medium
* New upstream version 2.0.0
diff --git a/debian-alt/bionic/patches/0004-getopt-build.patch b/debian-alt/bionic/patches/0004-getopt-build.patch
new file mode 100644
index 0000000000..698dfe7177
--- /dev/null
+++ b/debian-alt/bionic/patches/0004-getopt-build.patch
@@ -0,0 +1,19 @@
+--- 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 5fabbd7e7c..357bbc52b8 100644
--- a/debian-alt/bionic/patches/series
+++ b/debian-alt/bionic/patches/series
@@ -1,2 +1,3 @@
0001-path-substitution.patch
0002-jetty-compatibility.patch
+0004-getopt-build.patch
diff --git a/debian-alt/focal/changelog b/debian-alt/focal/changelog
index 1931eae9e4..0d1198fc20 100644
--- a/debian-alt/focal/changelog
+++ b/debian-alt/focal/changelog
@@ -1,3 +1,9 @@
+i2p (2.1.0-1ubuntu1) focal; urgency=medium
+
+ * New upstream version 2.1.0
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Wed, 11 Jan 2023 12:12:12 +0000
+
i2p (2.0.0-2ubuntu1) focal; urgency=medium
* Fix stray char in links file causing symlinks in /
diff --git a/debian/changelog b/debian/changelog
index 7333860001..8dfd43fa77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+i2p (2.1.0-1ubuntu1) focal; urgency=medium
+
+ * New upstream version 2.1.0
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Wed, 11 Jan 2023 12:12:12 +0000
+
i2p (2.0.0-2ubuntu1) focal; urgency=medium
* Fix stray char in links file causing symlinks in /
--
GitLab