diff --git a/debian-alt/bionic/changelog b/debian-alt/bionic/changelog index 1bb390ef145f449c52ad7530e65176129adb394d..cf0ea74c8c582d80b00ee71a9cc6b265644a8ebc 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 49344fde7da1ef73ef35cc74f26ddd645e0afffb..94895e96a50fdf383ef4297aba00514f709e2462 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 d764a659a39046cb7885725f72499f38c10d52e0..be905a3ebdbba646e08b5a32fc68fd4f21730f55 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 69b23b69d3b5cb14c52595a5c29ffc5156edb91b..7479d3b017b7b16951bc4862607013eb4c77564c 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 6cd9b292522ec4608d94722632f4ac765162edf9..6a330001d09cab35aa41fa4a66950c9c7bfaaadc 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 5667c20a75f398f7a4f3da50363aa396b9c21c69..d01d2537c8ba0e754f9707e0203deee4516bc28a 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 4f7ca95fe58aefea15d86ac91871f5206b9dc85a..725423821d8ae38ef5bcf0fd4c5a6e6abf90a169 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