Package changelogs

Fix extra chars in patch 1
Fix javadoc causing build error on Trusty
Deb build doc updates

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 &lt;a href="/path/to;&lt;script&gt;Window.alert("XSS"+'%20'+"here");&lt;/script&gt;"&gt;Link&lt;/a&gt;
      * 
-     * The above example would parse incorrectly on various browsers as the "<" or '"' characters
+     * The above example would parse incorrectly on various browsers as the "&lt;" or '"' characters
      * would end the href attribute value string prematurely.
      * 
      * @param raw the raw text to encode.

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

debian-alt/precise/changelog

+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

debian-alt/trusty/changelog

+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

debian-alt/xenial/changelog

+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

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"