diff --git a/debian-alt/doc/debian-build.txt b/debian-alt/doc/debian-build.txt
index 86d0611818f8d790a583a2b03d648a9ab6c85da0..a28ad9623a959cafbc94479405e9ce12631f52c2 100644
--- a/debian-alt/doc/debian-build.txt
+++ b/debian-alt/doc/debian-build.txt
@@ -4,7 +4,7 @@ Make sure workspace revision matches what you want to release.
# Make the source tarball
# only if you didn't already do it for launchpad!
-# Otherwise make sure the i2p-0.9.xx.orig.tar.bz2 file is
+# Otherwise make sure the i2p-1.xx.0.orig.tar.bz2 file is
# in the dir above the source directory, and skip to next step
ant debian-release-tarball
@@ -13,12 +13,12 @@ ant debian-release-tarball
# Go to the source directory created by ant debian-release-tarball
# Fix up the changelog
-cd i2p_0.9.xx-x-xxxxxxxx/
+cd i2p_1.xx.0-x-xxxxxxxx/
ant debchange
vi debian/changelog
- change i2p_0.9.xx-x-xxxxxxxx-1 to i2p_0.9.xx-1
+ change i2p_1.xx.0-x-xxxxxxxx-1 to i2p_1.xx.0-1
change UNRELEASED to stable
- change comment to "New upstream version 0.9.xx"
+ change comment to "New upstream version 1.xx.0"
fix your name and email
# fix up the control and rules files as necessary
# fix up the patches/ files as necessary
@@ -26,11 +26,11 @@ vi debian/changelog
# build the binary packages:
ant debian-binary
This will make the following files in .:
- i2p-doc_0.9.xx-1_all.deb
- i2p-router_0.9.xx-1_all.deb
- i2p_0.9.xx-1_all.deb
- libjbigi-jni_0.9.xx-1_amd64.deb
-Note that you won't have a libjbigi-jni_0.9.xx-1_i386.deb file,
+ i2p-doc_1.xx.0-1_all.deb
+ i2p-router_1.xx.0-1_all.deb
+ i2p_1.xx.0-1_all.deb
+ libjbigi-jni_1.xx.0-1_amd64.deb
+Note that you won't have a libjbigi-jni_1.xx.0-1_i386.deb file,
or one for any other architecture. Oh well.
# copy up so they don't get deleted
@@ -43,32 +43,32 @@ rm apps/susidns/src/lib/standard.jar
debuild -S -sa -kYOURSUBKEYID
(note: no space allowed in -kkeyid)
This will make the following files in ..:
- i2p_0.9.XX-1.dsc (the GPG signature)
- i2p_0.9.XX-1.debian.tar.xz (basically the debian/ directory tarball)
- i2p_0.9.XX-1_source.changes (the changelog text file)
+ i2p_1.xx.0-1.dsc (the GPG signature)
+ i2p_1.xx.0-1.debian.tar.xz (basically the debian/ directory tarball)
+ i2p_1.xx.0-1_source.changes (the changelog text file)
# now do the same for jessie and wheezy and precise (NO, don't, we will copy below)
# scp the following files to the reprepro server:
- i2p_0.9.XX-1.dsc (the GPG signature)
- i2p_0.9.XX-1.tar.xz (basically the debian/ directory tarball)
- i2p_0.9.XX-1_source.changes (the changelog text file)
- i2p_0.9.XX.orig.tar.bz2 (the source tarball)
- i2p-doc_0.9.xx-1_all.deb (docs)
- i2p-router_0.9.xx-1_all.deb (binary)
- i2p_0.9.xx-1_all.deb (top-level package)
- libjbigi-jni_0.9.xx-1_amd64.deb (binary)
+ i2p_1.xx.0-1.dsc (the GPG signature)
+ i2p_1.xx.0-1.tar.xz (basically the debian/ directory tarball)
+ i2p_1.xx.0-1_source.changes (the changelog text file)
+ i2p_1.xx.0.orig.tar.bz2 (the source tarball)
+ i2p-doc_1.xx.0-1_all.deb (docs)
+ i2p-router_1.xx.0-1_all.deb (binary)
+ i2p_1.xx.0-1_all.deb (top-level package)
+ libjbigi-jni_1.xx.0-1_amd64.deb (binary)
ssh to reprepro server
sudo su kytv (he owns the reprepro directories)
-reprepro includedeb stable i2p-doc_0.9.xx-1_all.deb
-reprepro includedeb stable i2p-router_0.9.xx-1_all.deb
-reprepro includedeb stable libjbigi-jni_0.9.xx-1_amd64.deb
-reprepro includedeb stable i2p_0.9.xx-1_all.deb
+reprepro includedeb stable i2p-doc_1.xx.0-1_all.deb
+reprepro includedeb stable i2p-router_1.xx.0-1_all.deb
+reprepro includedeb stable libjbigi-jni_1.xx.0-1_amd64.deb
+reprepro includedeb stable i2p_1.xx.0-1_all.deb
# if you already got the source from launchpad
# with reprepro update, skip this.
-reprepro includedsc stable i2p_0.9.XX-1.dsc
+reprepro includedsc stable i2p_1.xx.0-1.dsc
# copy built packages from launchpad
for i in precise trusty xenial bionic disco eoan focal
diff --git a/debian-alt/doc/launchpad.txt b/debian-alt/doc/launchpad.txt
index ef67e9961bbddfd639c8cb8e7b8e83a9722a9301..2cdaeb2d91d754b2b7426069d9a9bb014a5ce75f 100644
--- a/debian-alt/doc/launchpad.txt
+++ b/debian-alt/doc/launchpad.txt
@@ -49,14 +49,14 @@ Generate files to upload
------------------------
- check out clean copy of release:
- mtn co -d i2p.mtn -b i2p.i2p i2p.i2p.foobar -r t:i2p-0.9.xx
+ mtn co -d i2p.mtn -b i2p.i2p i2p.i2p.foobar -r t:i2p-1.xx.0
- export TZ=UTC
- cd i2p.i2p.foobar
- 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
+ * version MUST be 1.xx.0-1ubuntu1
+ next version for fixes would be 1.xx.0-2ubunutu1
* series MUST be xenial or bionic or focal
* name and email MUST EXACTLY match what's in your GPG keyring
or the signing will fail.
@@ -66,11 +66,11 @@ Generate files to upload
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)
- this will make a directory ../i2p-0.9.XX-0-xxxxxxxx/
- and a tarball ../i2p_0.9.XX.orig.tar.bz2
-- cp debian/changelog ../i2p-0.9.XX-0-xxxxxxxx/debian/
-- cp debian-alt/(series)/(other files besides changelog) to ../i2p-0.9.XX-0-xxxxxxxx/debian/
-- cd ../i2p-0.9.XX-0-xxxxxxxx/
+ this will make a directory ../i2p-1.xx.0-0-xxxxxxxx/
+ and a tarball ../i2p_1.xx.0.orig.tar.bz2
+- cp debian/changelog ../i2p-1.xx.0-0-xxxxxxxx/debian/
+- cp debian-alt/(series)/(other files besides changelog) to ../i2p-1.xx.0-0-xxxxxxxx/debian/
+- cd ../i2p-1.xx.0-0-xxxxxxxx/
- Build the *1ubuntu1* files:
If you have NOT done a successful dput for this release yet:
debuild -S -sa -kkeyid
@@ -83,25 +83,25 @@ Generate files to upload
(quilt instructions go here)
- You will now have the following files in ..:
- i2p_0.9.XX-1ubuntu1.debian.tar.xz
- i2p_0.9.XX-1ubuntu1.dsc
- i2p_0.9.XX-1ubuntu1_source.changes
- i2p_0.9.XX-1ubuntu1_source.build
+ i2p_1.xx.0-1ubuntu1.debian.tar.xz
+ i2p_1.xx.0-1ubuntu1.dsc
+ i2p_1.xx.0-1ubuntu1_source.changes
+ i2p_1.xx.0-1ubuntu1_source.build
- And from the copy above:
- i2p_0.9.XX.orig.tar.bz2
+ i2p_1.xx.0.orig.tar.bz2
Upload to launchpad
-------------------
- cd ..
- Upload to launchpad:
- dput ppa:your-lp-id/your-ppa-name i2p_0.9.XX-1ubuntu1_source.changes
+ dput ppa:your-lp-id/your-ppa-name i2p_1.xx.0-1ubuntu1_source.changes
This will upload the following files:
- i2p_0.9.XX-1ubuntu1.dsc (the GPG signature)
- i2p_0.9.XX-1ubuntu1.debian.tar.xz (basically the debian/ directory tarball)
- i2p_0.9.XX-1ubuntu1_source.changes (the changelog text file)
- i2p_0.9.XX.orig.tar.bz2 (the source tarball)
+ i2p_1.xx.0-1ubuntu1.dsc (the GPG signature)
+ i2p_1.xx.0-1ubuntu1.debian.tar.xz (basically the debian/ directory tarball)
+ i2p_1.xx.0-1ubuntu1_source.changes (the changelog text file)
+ i2p_1.xx.0.orig.tar.bz2 (the source tarball)
Note: If you didn't add your GPG fingerprint to your launchpad account
way up there above in step 2 or so, the upload will work,
@@ -162,7 +162,7 @@ and attach it to the milestone.
Go to https://launchpad.net/i2p/trunk
Down at bottom, click 'create milestone'
- Name: 0.9.xx (NOT i2p 0.9.xx)
+ Name: 1.xx.0 (NOT i2p 1.xx.0)
Code name: empty
Date targeted: Actual release date
Tags: empty
@@ -177,19 +177,19 @@ Click 'create release'
Now you are on the page for that milestone
Click 'add download file'
For each of the four files
- i2psource_0.9.xx.tar.bz2
- Description: I2P 0.9.xx Source Code
- Sig: i2psource_0.9.xx.tar.bz2.sig
+ i2psource_1.xx.0.tar.bz2
+ Description: I2P 1.xx.0 Source Code
+ Sig: i2psource_1.xx.0.tar.bz2.sig
File Content Type: Code Release Tarball
- i2pinstall_0.9.xx_windows.exe
- Description: I2P 0.9.xx Installer for Windows
- Sig: i2pinstall_0.9.xx_windows.exe.sig
+ i2pinstall_1.xx.0_windows.exe
+ Description: I2P 1.xx.0 Installer for Windows
+ Sig: i2pinstall_1.xx.0_windows.exe.sig
File Content Type: Installer File
- i2pinstall_0.9.xx.jar
- Description: I2P 0.9.xx Installer (Linux / OSX / FreeBSD / Solaris)
- Sig: i2pinstall_0.9.xx.jar.sig
+ i2pinstall_1.xx.0.jar
+ Description: I2P 1.xx.0 Installer (Linux / OSX / FreeBSD / Solaris)
+ Sig: i2pinstall_1.xx.0.jar.sig
File Content Type: Installer File
- i2pupdate_0.9.xx.zip
- Description: I2P 0.9.xx Update
- Sig: i2pupdate_0.9.xx.zip.sig
+ i2pupdate_1.xx.0.zip
+ Description: I2P 1.xx.0 Update
+ Sig: i2pupdate_1.xx.0.zip.sig
File Content Type: Installer File
diff --git a/installer/lib/izpack/VersionInfo_template.rc b/installer/lib/izpack/VersionInfo_template.rc
index 0ac904ad1a3e9eed76a6686f6bc0015665b3f3a2..a88bbd640ffa500a8de70f215bbbda4ebecd8d97 100644
Binary files a/installer/lib/izpack/VersionInfo_template.rc and b/installer/lib/izpack/VersionInfo_template.rc differ
diff --git a/installer/lib/izpack/rh.bat b/installer/lib/izpack/rh.bat
index 63c0e43f3c317f3753891460d7bc5e17a59a8ec7..ce457f43acd6728f66fa774982f9bb75156b1c09 100755
--- a/installer/lib/izpack/rh.bat
+++ b/installer/lib/izpack/rh.bat
@@ -8,8 +8,8 @@
:: the output will be the same as the original file name
:: on success, sign it.
::
-set VER=39
-set FULLVER=0.9.%VER%
+set VER=5
+set FULLVER=1.%VER%.0
set INFILE=i2pinstall_%FULLVER%_windows.exe
set UNSIGNED=i2pinstall_%FULLVER%_windows_unsigned.exe
set TEMPFILE=i2pinstall_%FULLVER%_windows_temp.exe
diff --git a/installer/resources/checklist.md b/installer/resources/checklist.md
index 2a14ec5a2a5bbe7354c46d2ed66a8675f13d8927..1c44767cf1ed0bfbe3653cd8d3f2273c9df41873 100644
--- a/installer/resources/checklist.md
+++ b/installer/resources/checklist.md
@@ -110,7 +110,7 @@
6. Review the complete diff from the last release:
```
- git diff i2p-0.9.(xx-1)..HEAD > out.diff
+ git diff i2p-1.(xx-1).0..HEAD > out.diff
vi out.diff
```
@@ -190,7 +190,7 @@
- In the i2p.newsxml branch, edit magnet links, release dates and release
number in data/releases.json, check in and push
-2. Add i2pupdate-0.9.xx.su3 torrent to tracker2.postman.i2p and start seeding
+2. Add i2pupdate-1.xx.0.su3 torrent to tracker2.postman.i2p and start seeding
3. Notify the following people:
- All in-network update hosts