From 9c29f8c8ffe158f41431cd97d89305fe05d08203 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Tue, 30 Nov 2021 08:53:49 -0500
Subject: [PATCH] Debian files for 1.6.1
fix a lintian warning about compare-versions
update launchpad doc for git
---
debian-alt/bionic/changelog | 6 ++++++
debian-alt/doc/launchpad.txt | 2 +-
debian-alt/focal/changelog | 6 ++++++
debian/changelog | 6 ++++++
debian/rules | 2 +-
5 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/debian-alt/bionic/changelog b/debian-alt/bionic/changelog
index fdf9b0ee84..5878917048 100644
--- a/debian-alt/bionic/changelog
+++ b/debian-alt/bionic/changelog
@@ -1,3 +1,9 @@
+i2p (1.6.1-1~bionic+1) bionic; urgency=medium
+
+ * New upstream version 1.6.1
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Tue, 30 Nov 2021 12:12:12 +0000
+
i2p (1.5.0-1~bionic+1) bionic; urgency=medium
* New upstream version 1.5.0
diff --git a/debian-alt/doc/launchpad.txt b/debian-alt/doc/launchpad.txt
index e62a29fefe..8e4f40c5b0 100644
--- a/debian-alt/doc/launchpad.txt
+++ b/debian-alt/doc/launchpad.txt
@@ -49,7 +49,7 @@ Generate files to upload
------------------------
- check out clean copy of release:
- mtn co -d i2p.mtn -b i2p.i2p i2p.i2p.foobar -r t:i2p-1.xx.0
+ git clone -l . /path/to/releasedir
- export TZ=UTC
- cd i2p.i2p.foobar
diff --git a/debian-alt/focal/changelog b/debian-alt/focal/changelog
index a2533bc002..bd8010da11 100644
--- a/debian-alt/focal/changelog
+++ b/debian-alt/focal/changelog
@@ -1,3 +1,9 @@
+i2p (1.6.1-1ubuntu1) focal; urgency=medium
+
+ * New upstream version 1.6.1
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Tue, 30 Nov 2021 12:12:12 +0000
+
i2p (1.5.0-2ubuntu1) focal; urgency=medium
* New upstream version 1.5.0
diff --git a/debian/changelog b/debian/changelog
index d02340716e..cb44ea1db7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+i2p (1.6.1-1ubuntu1) focal; urgency=medium
+
+ * New upstream version 1.6.1
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Tue, 30 Nov 2021 12:12:12 +0000
+
i2p (1.5.0-2ubuntu1) focal; urgency=medium
* New upstream version 1.5.0
diff --git a/debian/rules b/debian/rules
index 62a00b1ac0..5d71ccddca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,7 @@ export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
# debian: bullseye - transitioning
JSON_SIMPLE_VERSION = $(shell dpkg -l libjson-simple-java | grep '^ii' | awk '{print $$3}')
-JSON_SIMPLE_3 = $(shell dpkg --compare-versions '$(JSON_SIMPLE_VERSION)' '>' '3.1.1-1~' && echo yes || echo no)
+JSON_SIMPLE_3 = $(shell dpkg --compare-versions '$(JSON_SIMPLE_VERSION)' 'gt' '3.1.1-1~' && echo yes || echo no)
ifeq (yes,$(JSON_SIMPLE_3))
JSON_SIMPLE_PACKAGE = com.github.cliftonlabs.json_simple
JSON_EXCEPTION = JsonException
--
GitLab