echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debian files and checklists update for 0.9.47

Browse Source
This commit is contained in:
zzz
2020-08-25 19:49:54 +00:00
parent ccd64b6f07
commit 2479645d22
11 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
debian-alt/bionic/changelog
View File

@ -1,3 +1,9 @@
i2p (0.9.47-1~bionic+1) bionic; urgency=medium
* New upstream version 0.9.47
-- zzz on i2p (key signing) <zzz@i2pmail.org> Tue, 25 Aug 2020 12:12:12 +0000
i2p (0.9.46-1~bionic+1) bionic; urgency=medium
* New upstream version 0.9.46

2
debian-alt/bionic/patches/series Normal file
View File

@ -0,0 +1,2 @@
0001-path-substitution.patch
0002-jetty-compatibility.patch

9
debian-alt/doc/debian-build.txt
View File

@ -88,10 +88,12 @@ done
# To copy precise to wheezy:
# Note that syntax is reprepro copysrc TO FROM package!
# No longer supported
reprepro -v copysrc wheezy precise i2p
# To copy trusty to jessie:
# Note that syntax is reprepro copysrc TO FROM package!
# No longer supported
reprepro -v copysrc jessie trusty i2p
# To copy trusty to stretch:
@ -99,12 +101,13 @@ reprepro -v copysrc jessie trusty i2p
# WARNING bionic (now with jetty 9.4) is no longer compatible with stretch (with jetty 9.2)
# WARNING xenial is not compatible with stretch,
# see https://www.reddit.com/r/i2p/comments/bnvcn4/i2p_router_console_inaccessible_to_firefox_on/
# No longer supported
reprepro -v copysrc stretch trusty i2p
# To copy disco to sid and buster:
# To copy focal to sid and buster:
# Note that syntax is reprepro copysrc TO FROM package!
reprepro -v copysrc sid disco i2p
reprepro -v copysrc buster disco i2p
reprepro -v copysrc sid focal i2p
reprepro -v copysrc buster focal i2p
# check status
reprepro ls i2p

21
debian-alt/doc/launchpad.txt
View File

@ -14,11 +14,13 @@ Versions are as follows:
Min version Max version Uses src pkg Copied to Debian
----------- ----------- ------------ ----------------
precise saucy precise wheezy
trusty wily precise jessie, stretch
xenial yakkety xenial --
bionic cosmic bionic --
disco groovy bionic buster, sid
focal groovy bionic buster, sid
Unsupported (Java 7):
precise saucy precise wheezy
trusty wily precise jessie, stretch
Prep (first time only)
@ -62,7 +64,7 @@ Generate files to upload
- 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
* series MUST be xenial or trusty or precise
* 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.
(or add -kkeyid argument to debuild, which you must do
@ -71,24 +73,19 @@ 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)
(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)
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/
- (if you build trusty after precise, cp debian/i2p.postinst ../i2p-0.9.XX-0-xxxxxxxx/debian/
since precise modifies it but trusty does not)
- cd ../i2p-0.9.XX-0-xxxxxxxx/
- Note: If building for precise/trusty and you are on yakkety or higher without Java 7,
make a symlink so debuild will work: cd /var/lib/jvm; sudo ln -s java-8-openjdk-amd64/ java-7-openjdk-amd64
- Build the *1ubuntu1* files:
If you have NOT done a successful dput for this release yet:
debuild -S -sa -kkeyid
otherwise, if just fixing up the control files, patches, etc:
debuild -S -sd -kkeyid
(note: no space allowed in -kkeyid)
If you get a dpkg-checkbuilddeps error for precise/trusty/xenial,
If you get a dpkg-checkbuilddeps error for xenial,
add a -d option, e.g. debuild -d -S -sa -kkeyid
- If patches fail, you must fix them up, either manually or with quilt
(quilt instructions go here)
@ -154,13 +151,11 @@ Release
-------
Then copy from your PPA to the i2p-maintainers PPA.
Then in the i2p-maintainers PPA, copy bionic to cosmic.
Then in the i2p-maintainers PPA, copy focal to groovy.
Did a new series open up since the last time you did this? Copy to the new one also.
(select "copy existing binaries")
Copy xenial first and wait for it to be published in i2p-maintainers or the others will fail.
For xenial, build and copy it separately. It is built from the "ant xenial-release-tarball" source.
For precise and trusty, build and copy it separately. Both precise and trusty are built
from the "ant precise-release-tarball" source.
Creating milestone, release, and uploading files

6
debian-alt/eoan/changelog → debian-alt/focal/changelog
View File

@ -1,3 +1,9 @@
i2p (0.9.47-1ubuntu1) focal; urgency=medium
* New upstream version 0.9.47
-- zzz on i2p (key signing) <zzz@i2pmail.org> Tue, 25 Aug 2020 12:12:12 +0000
i2p (0.9.46-1ubuntu1) eoan; urgency=medium
* New upstream version 0.9.46

2
debian-alt/focal/patches/series Normal file
View File

@ -0,0 +1,2 @@
0001-path-substitution.patch
0002-jetty-compatibility.patch

0
debian-alt/eoan/rules → debian-alt/focal/rules
View File

6
debian-alt/xenial/changelog
View File

@ -1,3 +1,9 @@
i2p (0.9.47x-2~xenial+1) xenial; urgency=medium
* Backport to Xenial
-- zzz on i2p (key signing) <zzz@i2pmail.org> Tue, 25 Aug 2020 12:12:12 +0000
i2p (0.9.46x-1~xenial+1) xenial; urgency=medium
* Backport to Xenial

2
debian-alt/xenial/i2p-router.links
View File

@ -80,7 +80,7 @@ usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
# comment out if not building with libjson-simple-java
# ubuntu: trusty+; debian: jessie+
usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar
#usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar
# comment out if not building with famfamfam-flag-png

6
debian-alt/xenial/rules
View File

@ -143,9 +143,9 @@ endif
ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
@# debian: jessie+; ubuntu: trusty+
@/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
@mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
@#/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
@#mkdir -p $(CURDIR)/core/java/build
@#ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
@# debian: everywhere; ubuntu: trusty+
@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties

6
installer/resources/checklist.md
View File

@ -89,8 +89,7 @@
mtn -d i2p.mtn co --branch=i2p.i2p /path/to/releasedir
```
- You must build with Java 7 or higher.
If you build with Java 8 or higher, you must also have the Java 7 JRE installed for the bootclasspath.
- You must build with Java 8 or higher.
4. Create override.properties with (adjust as necessary):
@ -100,7 +99,6 @@
release.signer.su3=xxx@mail.i2p
build.built-by=xxx
javac.compilerargs=-bootclasspath /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jce.jar
javac.compilerargs7=-bootclasspath /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jce.jar
```
5. Copy latest trust list _MTN/monotonerc from website or some other workspace
@ -147,7 +145,7 @@
- Run rh.bat to edit the resources
- Sign the windows installer:
Open Visual Studio developer prompt
signtool sign /debug i2pinstall_${release.number}_windows.exe
signtool sign /debug /fd SHA256 i2pinstall_${release.number}_windows.exe
- GPG sign the signed windows installer: gpg -u keyid -b i2pinstall_${release.number}_windows.exe
- sha256sum i2pinstall_${release.number}_windows.exe