From 89b70895d74d97cba06a84c7a5cd1e946b589865 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 29 Aug 2019 11:56:55 +0000
Subject: [PATCH] Debian files for 0.9.42 checklist updates
---
debian-alt/bionic/changelog | 6 ++++++
debian-alt/disco/changelog | 6 ++++++
debian-alt/doc/launchpad.txt | 6 ++++--
debian-alt/precise/changelog | 6 ++++++
debian-alt/trusty/changelog | 6 ++++++
debian-alt/xenial/changelog | 6 ++++++
installer/resources/checklist.md | 29 +++++++++++++++--------------
7 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/debian-alt/bionic/changelog b/debian-alt/bionic/changelog
index 1bb390ef14..cf0ea74c8c 100644
--- a/debian-alt/bionic/changelog
+++ b/debian-alt/bionic/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.42-1ubuntu1) bionic; urgency=medium
+
+ * New upstream version 0.9.42
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Wed, 28 Aug 2019 12:12:12 +0000
+
i2p (0.9.41-1ubuntu1) bionic; urgency=medium
* New upstream version 0.9.41
diff --git a/debian-alt/disco/changelog b/debian-alt/disco/changelog
index 49344fde7d..94895e96a5 100644
--- a/debian-alt/disco/changelog
+++ b/debian-alt/disco/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.42-1~disco+1) disco; urgency=medium
+
+ * New upstream version 0.9.42
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Wed, 28 Aug 2019 12:12:12 +0000
+
i2p (0.9.41-1~disco+1) disco; urgency=medium
* New upstream version 0.9.41
diff --git a/debian-alt/doc/launchpad.txt b/debian-alt/doc/launchpad.txt
index d764a659a3..be905a3ebd 100644
--- a/debian-alt/doc/launchpad.txt
+++ b/debian-alt/doc/launchpad.txt
@@ -58,7 +58,7 @@ Generate files to upload
- export TZ=UTC
- cd i2p.i2p.foobar
-- copy debian-alt/(series)/changelog to debian/
+- copy debian-alt/(series)/* to debian/
- edit debian/changelog to add the release at the top
* version MUST be 0.9.XX-1ubuntu1
next version for fixes would be 0.9.XX-2ubunutu1
@@ -66,8 +66,10 @@ Generate files to upload
* name and email MUST EXACTLY match what's in your GPG keyring
or the signing will fail.
(or add -kkeyid argument to debuild, which you must do
- if you want to sign with a subkey)
+ if you want to sign with a subkey. As of recent versions,
+ the keyid argument must be a 16-char fingerprint, not a short key.)
run gpg -K to list your private keys
+- Remove patch files in debian/patches that are not listed in debian/patches/series
- ant debian-release-tarball (this is currently for bionic and higher)
(ant precise-release-tarball for precise thru wily... only do this once for both the precise and trusty build)
(ant xenial-release-tarball for xenial)
diff --git a/debian-alt/precise/changelog b/debian-alt/precise/changelog
index 69b23b69d3..7479d3b017 100644
--- a/debian-alt/precise/changelog
+++ b/debian-alt/precise/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.42p-1~precise+1) precise; urgency=medium
+
+ * Backport to Precise
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Wed, 28 Aug 2019 12:12:12 +0000
+
i2p (0.9.41p-1~precise+1) precise; urgency=medium
* Backport to Precise
diff --git a/debian-alt/trusty/changelog b/debian-alt/trusty/changelog
index 6cd9b29252..6a330001d0 100644
--- a/debian-alt/trusty/changelog
+++ b/debian-alt/trusty/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.42p-1~trusty+1) trusty; urgency=medium
+
+ * Backport to Trusty
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Wed, 28 Aug 2019 12:12:12 +0000
+
i2p (0.9.41p-1~trusty+1) trusty; urgency=medium
* Backport to Trusty
diff --git a/debian-alt/xenial/changelog b/debian-alt/xenial/changelog
index 5667c20a75..d01d2537c8 100644
--- a/debian-alt/xenial/changelog
+++ b/debian-alt/xenial/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.42x-1~xenial+1) xenial; urgency=medium
+
+ * Backport to Xenial
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Wed, 28 Aug 2019 12:12:12 +0000
+
i2p (0.9.41x-1~xenial+1) xenial; urgency=medium
* Backport to Xenial
diff --git a/installer/resources/checklist.md b/installer/resources/checklist.md
index 4f7ca95fe5..725423821d 100644
--- a/installer/resources/checklist.md
+++ b/installer/resources/checklist.md
@@ -31,7 +31,7 @@
- Trial Debian build: Build and test a preliminary Debian build
with 'ant debian' and fix any issues
-- Javadoc test: 'ant javadoc' with an Oracle JDK, fix any issues
+- Javadoc test: 'ant javadoc' and 'ant mavenCentral' with an Oracle JDK, fix any issues
Oracle JDK will error on things that OpenJDK does not!
@@ -104,28 +104,29 @@
5. Copy latest trust list _MTN/monotonerc from website or some other workspace
-6. Change revision in:
- - `history.txt`
- - `installer/install.xml`
- - `installer/install5.xml`
- - `core/java/src/net/i2p/CoreVersion.java`
- - `router/java/src/net/i2p/router/RouterVersion.java`
- - (change to BUILD = 0 and EXTRA = "")
+6. Verify that no untrusted revisions were inadvertently blessed by a trusted party:
-7. `mtn ci`
+ ```
+ ant revisions
+ ```
-8. Review the complete diff from the last release:
+7. Review the complete diff from the last release:
```
mtn diff -r t:i2p-0.9.(xx-1) > out.diff
vi out.diff
```
-9. Verify that no untrusted revisions were inadvertently blessed by a trusted party:
+8. Change revision in:
+ - `history.txt`
+ - `installer/install.xml`
+ - `installer/install5.xml`
+ - `core/java/src/net/i2p/CoreVersion.java`
+ - `router/java/src/net/i2p/router/RouterVersion.java`
+ - (change to BUILD = 0 and EXTRA = "")
+
+9. `mtn ci`
- ```
- ant revisions
- ```
### Build and test
--
GitLab