From 45f3695f9d00467379482d77605aa98d057604be Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 10 May 2017 13:46:04 +0000 Subject: [PATCH] Debian: Restore systemd for trusty Fix date in changelogs doc update --- debian-alt/doc/launchpad.txt | 19 ++++++++++--------- debian-alt/precise/changelog | 2 +- debian-alt/trusty/changelog | 12 ++++++++++++ debian-alt/trusty/control | 4 +++- debian-alt/xenial/changelog | 2 +- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/debian-alt/doc/launchpad.txt b/debian-alt/doc/launchpad.txt index 1f54f72c7..581d424bf 100644 --- a/debian-alt/doc/launchpad.txt +++ b/debian-alt/doc/launchpad.txt @@ -29,7 +29,7 @@ Prep not utopic (obsolete, disabled by launchpad) - you need the following packages - sudo apt-get install devscripts dput dh_systemd + sudo apt-get install devscripts dput dh_systemd bash-completion - check out clean copy of release: mtn co -d i2p.mtn -b i2p.i2p i2p.i2p.foobar -r t:i2p-0.9.xx @@ -43,19 +43,19 @@ 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 trusty (or precise) + * series MUST be xenial or trusty or precise * 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) run gpg -K to list your private keys -- ant debian-release-tarball (ant precise-release-tarball for precise) +- ant debian-release-tarball (ant precise-release-tarball for precise/trusty) 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/ -- Note: If building for precise and you are on yakkety or higher without Java 7, +- 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: @@ -103,7 +103,7 @@ So the build isn't done until both arch builds are complete. Don't -If it works, copy trusty the series you are running (e.g. yakkety) in your PPA +If it works, copy the series you are running (e.g. yakkety) in your PPA so that you can test. (select "copy existing binaries") Wait a few minutes for that to happen @@ -127,12 +127,13 @@ Add your PPA following the instructions at http://i2p-projekt.i2p/en/download/de Release ------- -Then copy trusty from your PPA to the i2p-maintainers PPA. -Then in the i2p-maintainers PPA, copy trusty to vivid, xenial, yakkety, zesty +Then copy from your PPA to the i2p-maintainers PPA. +Then in the i2p-maintainers PPA, copy trusty to vivid. Copy xenial to yakkety, zesty. Did a new series open up since the last time you did this? Copy to the new one also. (select "copy existing binaries") - Copy trusty first and wait for it to be published in i2p-maintainers or the others will fail. -For precise, build and copy it separately. + Copy xenial first and wait for it to be published in i2p-maintainers or the others will fail. +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 diff --git a/debian-alt/precise/changelog b/debian-alt/precise/changelog index 67419424c..590957b56 100644 --- a/debian-alt/precise/changelog +++ b/debian-alt/precise/changelog @@ -2,7 +2,7 @@ i2p (0.9.30p-1~precise+1) precise; urgency=medium * Backport to Precise - -- zzz on i2p (key signing) Mon, 03 May 2017 12:12:12 +0000 + -- zzz on i2p (key signing) Wed, 03 May 2017 12:12:12 +0000 i2p (0.9.29p-1~precise+1) precise; urgency=medium diff --git a/debian-alt/trusty/changelog b/debian-alt/trusty/changelog index dc3e1c8ab..4deb2882a 100644 --- a/debian-alt/trusty/changelog +++ b/debian-alt/trusty/changelog @@ -1,3 +1,15 @@ +i2p (0.9.30p-2~trusty+1) trusty; urgency=medium + + * Restore systemd usage + + -- zzz on i2p (key signing) Wed, 10 May 2017 12:12:12 +0000 + +i2p (0.9.30p-1~precise+1) precise; urgency=medium + + * Backport to Precise + + -- zzz on i2p (key signing) Wed, 03 May 2017 12:12:12 +0000 + i2p (0.9.29-1ubuntu1) trusty; urgency=medium * New upstream version 0.9.29 diff --git a/debian-alt/trusty/control b/debian-alt/trusty/control index 75a2dbd89..a09c2f4d6 100644 --- a/debian-alt/trusty/control +++ b/debian-alt/trusty/control @@ -14,6 +14,8 @@ Build-Depends: debhelper (>= 7.0.50~) ,openjdk-6-jdk ,glassfish-javaee ,dh-apparmor + ,dh-systemd + ,bash-completion ,gettext ,libgetopt-java ,libgmp-dev (>= 2:5.0.2) @@ -75,10 +77,10 @@ Section: net Priority: optional Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless, - glassfish-javaee, geoip-database, gettext-base, libgetopt-java, + glassfish-javaee Replaces: i2p ( << 0.8.6-5) Breaks: i2p (<< 0.8.6-5) Recommends: libjbigi-jni, ttf-dejavu diff --git a/debian-alt/xenial/changelog b/debian-alt/xenial/changelog index 7f7be87c4..3c78095d4 100644 --- a/debian-alt/xenial/changelog +++ b/debian-alt/xenial/changelog @@ -2,7 +2,7 @@ i2p (0.9.30-3ubuntu1) xenial; urgency=medium * New upstream version 0.9.30 - -- zzz on i2p (key signing) Mon, 03 May 2017 12:12:12 +0000 + -- zzz on i2p (key signing) Wed, 03 May 2017 12:12:12 +0000 i2p (0.9.29-1ubuntu1) trusty; urgency=medium