From 5405792fad106d7cd56dc1e545557332c00aaebf Mon Sep 17 00:00:00 2001 From: zzz <zzz@mail.i2p> Date: Sat, 26 Mar 2016 13:56:57 +0000 Subject: [PATCH] Debian: Add missing patch with update for .25 Add missing line to require wrapper Add launchpad help document Add .24 and .25 releases to changelog --- debian/changelog | 12 ++ debian/control | 3 +- debian/patches/0004-remove-launch4j.patch | 31 ++++++ installer/resources/launchpad.txt | 127 ++++++++++++++++++++++ 4 files changed, 171 insertions(+), 2 deletions(-) create mode 100644 debian/patches/0004-remove-launch4j.patch create mode 100644 installer/resources/launchpad.txt diff --git a/debian/changelog b/debian/changelog index 4f7cc85be3..18b5f90384 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +i2p (0.9.25-1ubuntu1) trusty; urgency=medium + + * New upstream version 0.9.25 + + -- zzz on i2p (key signing) <zzz@i2pmail.org> Sat, 26 Mar 2016 12:12:12 +0000 + +i2p (0.9.24-1ubuntu1) trusty; urgency=medium + + * Upload to PPA + + -- Kill Your TV <killyourtv@i2pmail.org> Sat, 30 Jan 2016 14:12:27 +0000 + i2p (0.9.24-1) unstable; urgency=medium * New upstream version 0.9.24 diff --git a/debian/control b/debian/control index 6bf4bf5538..6c98c29cc6 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,7 @@ Build-Depends: debhelper (>= 7.0.50~) ,dh-apparmor ,gettext ,libgmp-dev (>= 2:5.0.5) -# uncomment the next line for official builds -# ,libservice-wrapper-java + ,libservice-wrapper-java ,libcommons-logging-java ,hardening-wrapper ,po-debconf diff --git a/debian/patches/0004-remove-launch4j.patch b/debian/patches/0004-remove-launch4j.patch new file mode 100644 index 0000000000..34e4a59f01 --- /dev/null +++ b/debian/patches/0004-remove-launch4j.patch @@ -0,0 +1,31 @@ +From: Kill Your TV <killyourtv@i2pmail.org> +Date: Mon, 30 Jul 2012 17:56:40 +0000 +Subject: remove launch4j + +--- + build.xml | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/build.xml b/build.xml +index 9544491..ce106bf 100644 +--- a/build.xml ++++ b/build.xml +@@ -1206,18 +1206,7 @@ + <copy todir="pkg-temp/licenses/" > + <fileset dir="licenses/" /> + </copy> +- <!-- +- The license in launch4j/ is a BSD license for launch4j +- The license in launch4j/head is a MIT license for the code that is actually wrapped around the jars +- So we include the MIT one in our binary package +- --> +- <copy file="installer/lib/launch4j/head/LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Launch4j.txt" /> + <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" /> +- <!-- Not sure if these are used or should be included --> +- <copy file="installer/lib/launch4j/lib/foxtrot.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Foxtrot.txt" /> +- <copy file="installer/lib/launch4j/lib/JGoodies.Forms.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Forms.txt" /> +- <copy file="installer/lib/launch4j/lib/JGoodies.Looks.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Looks.txt" /> +- <copy file="installer/lib/launch4j/lib/XStream.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-XStream.txt" /> + <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" /> + </target> + diff --git a/installer/resources/launchpad.txt b/installer/resources/launchpad.txt new file mode 100644 index 0000000000..fc92ee5a0d --- /dev/null +++ b/installer/resources/launchpad.txt @@ -0,0 +1,127 @@ +Instructions to upload to launchpad PPA + +You must have a GPG key already uploaded to the +usual public key servers, where launchpad can find it. + +Prep +---- + +- Make a launchpad account +- Log into launchpad +- Get your GPG fingerprint (gpg -K --fingerprint) +- Add your GPG fingerprint at the form on + https://launchpad.net/~/+editpgpkeys +- Wait for the encrypted email response +- Decrypt and click the confirmation link in the email +- Click confirm on the page +- Make a PPA, lets call it 'test' +- OPTIONAL: Go to i2p.packages PPA and copy over existing I2P to your PPA: + (select "copy existing binaries") + trusty, vivid, wily, xenial + not precise (only if building for precise which you probably aren't) + not utopic (obsolete, disabled by launchpad) +- Go to i2p.packages PPA and copy over service-wrapper-java to your PPA. + This is required for the build. + (select "copy existing binaries") + trusty + not precise (only if building for precise which you probably aren't) + not vivid, wily, xenial (more recent versions 3.5.25-2 or 3.5.26-3 are in official launchpad) + not utopic (obsolete, disabled by launchpad) + +- you need the following packages + sudo apt-get install devscripts dput dh_systemd + +- check out clean copy of release: + mtn co -d i2p.mtn -b i2p.i2p i2p.i2p.foobar + +Generate files to upload +------------------------ + +- export TZ=UTC +- cd i2p.i2p.foobar +- 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 trusty + * name and email MUST EXACTLY match what's in your GPG keyring + or the signing will fail. + (or add -k keyid argument to debuild) + run gpg -K to list your private keys +- edit debian/control to uncomment libservice-wrapper-java line +- ant debian-tarball + this will make a directory ../i2p-0.9.XX-0-xxxxxxxx/ + and a tarball ../i2p_0.9.XX-0-xxxxxxxx.orig.tar.bz2 +- mv ../i2p_0.9.XX-0-xxxxxxxx.orig.tar.bz2 ../i2p_0.9.XX.orig.tar.bz2 +- cp debian/changelog ../i2p-0.9.XX-0-xxxxxxxx/debian/ +- cd ../i2p-0.9.XX-0-xxxxxxxx/ +- Build the *1ubuntu1* files: + If you have NOT done a successful dput for this release yet: + debuild -S -sa + otherwise, if just fixing up the control files, patches, etc: + debuild -S -sd +- If patches fail, you must fix them up, either manually or with quilt + (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 +- And from the copy above: + i2p_0.9.XX.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 + +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) + +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, +but you will get no email back, and it will never build or show up on +the pending-build page. + +Wait for it to build and be published. +Could be minutes to hours. + +The amd64 build produces one deb: + libjbigi-jni (amd64) +The i386 build produces three debs: + i2p-doc (arch-independent), i2p-router (arch-independent), and libjbigi-jni (i386) +So the build isn't done until both arch builds are complete. +Don't + + +If it works, copy trusty to vivid, wily, and xenial in your PPA + (select "copy existing binaries") + Wait a few minutes for that to happen + +Test +---- + +Add your PPA following the instructions at http://i2p-projekt.i2p/en/download/debian: + sudo apt-add-repository ppa:your-lp-id/your-ppa-name + sudo apt-get update + sudo apt-get install i2p + mv ~/.i2p ~/.i2p-save + i2prouter start + (test...) + stop router + sudo dpkg-reconfigure i2p + (reconfigure as a service) + (i2p should start as a service. test...) + + +Release +------- + +Then copy trusty, vivid, wily, and xenial from your PPA to the i2p-maintainers PPA + (select "copy existing binaries") + Copy trusty first and wait for it to be published in i2p-maintainers or the others will fail. -- GitLab