From 24414845d0415ec720bfe0c162f2a7e46e6237d9 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 9 Aug 2017 19:53:41 +0000
Subject: [PATCH] Package changelogs Fix extra chars in patch 1 Fix javadoc
causing build error on Trusty Deb build doc updates
---
.../net/i2p/servlet/I2PDefaultServlet.java | 4 +--
debian-alt/doc/debian-build.txt | 25 +++++++++++--------
debian-alt/precise/changelog | 6 +++++
debian-alt/trusty/changelog | 6 +++++
debian-alt/xenial/changelog | 6 +++++
debian/patches/0001-path-substitution.patch | 2 +-
6 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/apps/jetty/java/src/net/i2p/servlet/I2PDefaultServlet.java b/apps/jetty/java/src/net/i2p/servlet/I2PDefaultServlet.java
index c4e8bdd28d..eb2dd62c89 100644
--- a/apps/jetty/java/src/net/i2p/servlet/I2PDefaultServlet.java
+++ b/apps/jetty/java/src/net/i2p/servlet/I2PDefaultServlet.java
@@ -248,9 +248,9 @@ public class I2PDefaultServlet extends DefaultServlet
* Copied unchanged from Resource.java
*
* Encode any characters that could break the URI string in an HREF.
- * Such as <a href="/path/to;<script>Window.alert("XSS"+'%20'+"here");</script>">Link</a>
+ * Such as <a href="/path/to;<script>Window.alert("XSS"+'%20'+"here");</script>">Link</a>
*
- * The above example would parse incorrectly on various browsers as the "<" or '"' characters
+ * The above example would parse incorrectly on various browsers as the "<" or '"' characters
* would end the href attribute value string prematurely.
*
* @param raw the raw text to encode.
diff --git a/debian-alt/doc/debian-build.txt b/debian-alt/doc/debian-build.txt
index 38f7805d4e..3182f84e8c 100644
--- a/debian-alt/doc/debian-build.txt
+++ b/debian-alt/doc/debian-build.txt
@@ -75,8 +75,8 @@ reprepro -v update precise
reprepro -v update trusty
reprepro -v update vivid
reprepro -v update xenial
-reprepro -v update yakkety
reprepro -v update zesty
+reprepro -v update artful
# todo when set up
# To add or remove distributions, edit /var/www/debian/conf/distributions
# and /var/www/debian/conf/updates
@@ -89,22 +89,25 @@ reprepro -v update zesty
# Note that syntax is reprepro copysrc TO FROM package!
reprepro -v copysrc wheezy precise i2p
-# To copy libjbigi-jni i386 (only) from trusty to jessie:
+# To copy trusty to jessie:
# Note that syntax is reprepro copysrc TO FROM package!
-reprepro -v -A i386 copy jessie trusty libjbigi-jni
+reprepro -v copysrc jessie trusty i2p
-# To copy jessie to sid:
+# To copy xenial to stretch:
# Note that syntax is reprepro copysrc TO FROM package!
-reprepro -v copysrc sid jessie i2p
+reprepro -v copysrc stretch xenial i2p
# install in the architectures not copied from ubuntu
# 'flood' should do this but forgot how, can't make it work any more
-reprepro -v -A 'armel|armhf|powerpc' includedeb wheezy i2p_0.9.xxp-1ubuntu1_all.deb
-reprepro -v -A 'armel|armhf|powerpc' includedeb wheezy i2p-doc_0.9.xxp-1ubuntu1_all.deb
-reprepro -v -A 'armel|armhf|powerpc' includedeb wheezy i2p-router_0.9.xxp-1ubuntu1_all.deb
-reprepro -v -A 'armel|armhf|powerpc' includedeb jessie i2p_0.9.xx-1ubuntu1_all.deb
-reprepro -v -A 'armel|armhf|powerpc' includedeb jessie i2p-doc_0.9.xx-1ubuntu1_all.deb
-reprepro -v -A 'armel|armhf|powerpc' includedeb jessie i2p-router_0.9.xx-1ubuntu1_all.deb
+reprepro -v -A 'armel|armhf|powerpc' includedeb wheezy i2p_0.9.xxp-1precise1_all.deb
+reprepro -v -A 'armel|armhf|powerpc' includedeb wheezy i2p-doc_0.9.xxp-1precise1_all.deb
+reprepro -v -A 'armel|armhf|powerpc' includedeb wheezy i2p-router_0.9.xxp-1precise1_all.deb
+reprepro -v -A 'armel|armhf|powerpc' includedeb jessie i2p_0.9.xxp-1trusty1_all.deb
+reprepro -v -A 'armel|armhf|powerpc' includedeb jessie i2p-doc_0.9.xxp-1trusty1_all.deb
+reprepro -v -A 'armel|armhf|powerpc' includedeb jessie i2p-router_0.9.xxp-1trusty1_all.deb
+reprepro -v -A 'armel|armhf' includedeb stretch i2p_0.9.xx-1ubuntu1_all.deb
+reprepro -v -A 'armel|armhf' includedeb stretch i2p-doc_0.9.xx-1ubuntu1_all.deb
+reprepro -v -A 'armel|armhf' includedeb stretch i2p-router_0.9.xx-1ubuntu1_all.deb
reprepro -v -A 'armel|armhf' includedeb sid i2p_0.9.xx-1ubuntu1_all.deb
reprepro -v -A 'armel|armhf' includedeb sid i2p-doc_0.9.xx-1ubuntu1_all.deb
reprepro -v -A 'armel|armhf' includedeb sid i2p-router_0.9.xx-1ubuntu1_all.deb
diff --git a/debian-alt/precise/changelog b/debian-alt/precise/changelog
index 590957b562..b1558b2de6 100644
--- a/debian-alt/precise/changelog
+++ b/debian-alt/precise/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.31p-1~precise+1) precise; urgency=medium
+
+ * Backport to Precise
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Wed, 09 Aug 2017 12:12:12 +0000
+
i2p (0.9.30p-1~precise+1) precise; urgency=medium
* Backport to Precise
diff --git a/debian-alt/trusty/changelog b/debian-alt/trusty/changelog
index 4deb2882a7..6ca1fcbcff 100644
--- a/debian-alt/trusty/changelog
+++ b/debian-alt/trusty/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.31p-2~trusty+1) trusty; urgency=medium
+
+ * Backport to Trusty
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Wed, 09 Aug 2017 12:12:12 +0000
+
i2p (0.9.30p-2~trusty+1) trusty; urgency=medium
* Restore systemd usage
diff --git a/debian-alt/xenial/changelog b/debian-alt/xenial/changelog
index 3c78095d49..ee4debe5e8 100644
--- a/debian-alt/xenial/changelog
+++ b/debian-alt/xenial/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.31-1ubuntu1) xenial; urgency=medium
+
+ * New upstream version 0.9.31
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Wed, 09 Aug 2017 12:12:12 +0000
+
i2p (0.9.30-3ubuntu1) xenial; urgency=medium
* New upstream version 0.9.30
diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch
index 275948aa65..d96b0ca465 100644
--- a/debian/patches/0001-path-substitution.patch
+++ b/debian/patches/0001-path-substitution.patch
@@ -554,7 +554,7 @@ Index: b/installer/resources/locale/po/messages_sv.po
--- a/installer/resources/locale/po/messages_sv.po
+++ b/installer/resources/locale/po/messages_sv.po
@@ -187,13 +187,13 @@ msgid "Request a Java thread dump if run
- -@msgstr "Fråga efter en Java thread dump vid drift."
+ msgstr "Fråga efter en Java thread dump vid drift."
#: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
--
GitLab