From 57e21e906fcee817406059538fcd31fceb5456ac Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 11 Apr 2018 16:10:08 +0000 Subject: [PATCH] Debian updates for 0.9.34 --- debian-alt/artful/changelog | 6 +++++ debian-alt/doc/launchpad.txt | 2 +- debian-alt/precise/changelog | 6 +++++ debian-alt/trusty/changelog | 6 +++++ debian-alt/xenial/changelog | 6 +++++ .../xenial/patches/0002-jetty-old-api.patch | 26 +++++++++++++++++++ debian-alt/xenial/patches/series | 2 ++ debian/rules | 2 +- 8 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 debian-alt/xenial/patches/0002-jetty-old-api.patch create mode 100644 debian-alt/xenial/patches/series diff --git a/debian-alt/artful/changelog b/debian-alt/artful/changelog index 1fbeb67a39..9283157b93 100644 --- a/debian-alt/artful/changelog +++ b/debian-alt/artful/changelog @@ -1,3 +1,9 @@ +i2p (0.9.34-2ubuntu1) artful; urgency=medium + + * New upstream version 0.9.34 + + -- zzz on i2p (key signing) Wed, 11 Apr 2018 12:12:12 +0000 + i2p (0.9.33-1ubuntu1) artful; urgency=medium * New upstream version 0.9.33 diff --git a/debian-alt/doc/launchpad.txt b/debian-alt/doc/launchpad.txt index e389118344..bfe184d51a 100644 --- a/debian-alt/doc/launchpad.txt +++ b/debian-alt/doc/launchpad.txt @@ -82,7 +82,7 @@ Generate files to upload 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, + If you get a dpkg-checkbuilddeps error for precise/trusty/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) diff --git a/debian-alt/precise/changelog b/debian-alt/precise/changelog index cca94de2af..37f8451008 100644 --- a/debian-alt/precise/changelog +++ b/debian-alt/precise/changelog @@ -1,3 +1,9 @@ +i2p (0.9.34p-1~precise+1) precise; urgency=medium + + * Backport to Precise + + -- zzz on i2p (key signing) Wed, 11 Apr 2018 12:12:12 +0000 + i2p (0.9.33p-1~precise+1) precise; urgency=medium * Backport to Precise diff --git a/debian-alt/trusty/changelog b/debian-alt/trusty/changelog index 6ff0daeea6..50796426e6 100644 --- a/debian-alt/trusty/changelog +++ b/debian-alt/trusty/changelog @@ -1,3 +1,9 @@ +i2p (0.9.34p-2~trusty+1) trusty; urgency=medium + + * Backport to Trusty + + -- zzz on i2p (key signing) Wed, 11 Apr 2018 12:12:12 +0000 + i2p (0.9.33p-2~trusty+1) trusty; urgency=medium * Backport to Trusty diff --git a/debian-alt/xenial/changelog b/debian-alt/xenial/changelog index 28818fb8e0..479ceda4b0 100644 --- a/debian-alt/xenial/changelog +++ b/debian-alt/xenial/changelog @@ -1,3 +1,9 @@ +i2p (0.9.34x-2~xenial+1) xenial; urgency=medium + + * Backport to Xenial + + -- zzz on i2p (key signing) Wed, 11 Apr 2018 12:12:12 +0000 + i2p (0.9.33x-1~xenial+1) xenial; urgency=medium * Backport to Xenial diff --git a/debian-alt/xenial/patches/0002-jetty-old-api.patch b/debian-alt/xenial/patches/0002-jetty-old-api.patch new file mode 100644 index 0000000000..569b38662f --- /dev/null +++ b/debian-alt/xenial/patches/0002-jetty-old-api.patch @@ -0,0 +1,26 @@ +Index: b/apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java +=================================================================== +--- a/apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java ++++ b/apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java +@@ -44,19 +44,12 @@ public class HostCheckHandler extends Gz + _listenHosts = new HashSet(8); + setMinGzipSize(64*1024); + if (_context.getBooleanPropertyDefaultTrue(PROP_GZIP)) { +- addIncludedMimeTypes( +- // our js is very small +- //"application/javascript", "application/x-javascript", +- "application/xhtml+xml", "application/xml", +- // ditto svg +- //"image/svg+xml", +- "text/css", "text/html", "text/plain" +- ); ++ setMimeTypes("application/xhtml+xml,application/xml,text/css,text/html,text/plain"); + } else { + // poorly documented, but we must put something in, + // if empty all are matched, + // see IncludeExcludeSet +- addIncludedMimeTypes("xyzzy"); ++ setMimeTypes("xyzzy"); + } + } + diff --git a/debian-alt/xenial/patches/series b/debian-alt/xenial/patches/series new file mode 100644 index 0000000000..20f495f5fc --- /dev/null +++ b/debian-alt/xenial/patches/series @@ -0,0 +1,2 @@ +0001-path-substitution.patch +0002-jetty-old-api.patch diff --git a/debian/rules b/debian/rules index 6919b41b0f..85a8a8a611 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) #export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) %: - dh $@ --with systemd,quilt,bash-completion + dh $@ --with systemd,bash-completion clean: createcopyright