Debian updates (ticket #2027, PR #15)

zzz · zzz · commit 2f53f2558065 · 2018-04-14T12:15:28.000Z
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -123,7 +123,7 @@ Installer:
         See licenses/LICENSE-Apache2.0.txt
         See licenses/NOTICE-Commons-Logging.txt
 
-        XStream (http://xstream.codehaus.org/)
+        XStream (http://xstream.github.io/)
         Copyright (c) 2003-2004, Joe Walnes
         See licenses/LICENSE-XStream.txt
 
diff --git a/debian-alt/precise/control b/debian-alt/precise/control
@@ -33,7 +33,7 @@ Depends: ${java:Depends}, ${shlibs:Depends},
  libjbigi-jni,
  lsb-base (>= 3.0-6),
  service-wrapper
-Description: Anonymous network (I2P)
+Description: Invisible Internet Project (I2P) - anonymous network
  I2P is an anonymizing network, offering a simple layer that identity-sensitive
  applications can use to securely communicate. All data is wrapped with several
  layers of encryption, and the network is both distributed and dynamic, with no
@@ -48,7 +48,7 @@ Section: java
 Priority: optional
 Depends: ${shlibs:Depends}, i2p-router
 Homepage: https://geti2p.net/
-Description: I2P libjbigi library
+Description: Invisible Internet Project (I2P) - libjbigi library
  This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid).
  .
  libjbigi is a math library that is part of the I2P installation.  Use of this
@@ -62,7 +62,7 @@ Section: doc
 Priority: extra
 Depends: ${misc:Depends}
 Suggests: i2p, default-jdk-doc
-Description: I2P developer documentation
+Description: Invisible Internet Project (I2P) - developer documentation
  I2P is an anonymizing network, offering a simple layer that identity-sensitive
  applications can use to securely communicate. All data is wrapped with several
  layers of encryption, and the network is both distributed and dynamic, with no
@@ -86,7 +86,7 @@ Recommends: libjbigi-jni, ttf-dejavu
 Suggests: apparmor
  ,privoxy
  ,syndie
-Description: Router for I2P
+Description: Invisible Internet Project (I2P) - Router
  I2P is an anonymizing network, offering a simple layer that identity-sensitive
  applications can use to securely communicate. All data is wrapped with several
  layers of encryption, and the network is both distributed and dynamic, with no
diff --git a/debian-alt/trusty/control b/debian-alt/trusty/control
@@ -34,7 +34,7 @@ Depends: ${java:Depends}, ${shlibs:Depends},
  libjbigi-jni,
  lsb-base (>= 3.0-6),
  service-wrapper
-Description: Anonymous network (I2P)
+Description: Invisible Internet Project (I2P) - anonymous network
  I2P is an anonymizing network, offering a simple layer that identity-sensitive
  applications can use to securely communicate. All data is wrapped with several
  layers of encryption, and the network is both distributed and dynamic, with no
@@ -49,7 +49,7 @@ Section: java
 Priority: optional
 Depends: ${shlibs:Depends}, i2p-router
 Homepage: https://geti2p.net/
-Description: I2P libjbigi library
+Description: Invisible Internet Project (I2P) - libjbigi library
  This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid).
  .
  libjbigi is a math library that is part of the I2P installation.  Use of this
@@ -63,7 +63,7 @@ Section: doc
 Priority: extra
 Depends: ${misc:Depends}
 Suggests: i2p, default-jdk-doc
-Description: I2P developer documentation
+Description: Invisible Internet Project (I2P) - developer documentation
  I2P is an anonymizing network, offering a simple layer that identity-sensitive
  applications can use to securely communicate. All data is wrapped with several
  layers of encryption, and the network is both distributed and dynamic, with no
@@ -87,7 +87,7 @@ Recommends: libjbigi-jni, ttf-dejavu
 Suggests: apparmor
  ,privoxy
  ,syndie
-Description: Router for I2P
+Description: Invisible Internet Project (I2P) - Router
  I2P is an anonymizing network, offering a simple layer that identity-sensitive
  applications can use to securely communicate. All data is wrapped with several
  layers of encryption, and the network is both distributed and dynamic, with no
diff --git a/debian-alt/xenial/control b/debian-alt/xenial/control
@@ -33,7 +33,7 @@ Depends: ${java:Depends}, ${shlibs:Depends},
  libjbigi-jni,
  lsb-base (>= 3.0-6),
  service-wrapper
-Description: Anonymous network (I2P)
+Description: Invisible Internet Project (I2P) - anonymous network
  I2P is an anonymizing network, offering a simple layer that identity-sensitive
  applications can use to securely communicate. All data is wrapped with several
  layers of encryption, and the network is both distributed and dynamic, with no
@@ -48,7 +48,7 @@ Section: java
 Priority: optional
 Depends: ${shlibs:Depends}, i2p-router
 Homepage: https://geti2p.net/
-Description: I2P libjbigi library
+Description: Invisible Internet Project (I2P) - libjbigi library
  This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid).
  .
  libjbigi is a math library that is part of the I2P installation.  Use of this
@@ -62,7 +62,7 @@ Section: doc
 Priority: extra
 Depends: ${misc:Depends}
 Suggests: i2p, default-jdk-doc
-Description: I2P developer documentation
+Description: Invisible Internet Project (I2P) - developer documentation
  I2P is an anonymizing network, offering a simple layer that identity-sensitive
  applications can use to securely communicate. All data is wrapped with several
  layers of encryption, and the network is both distributed and dynamic, with no
@@ -88,7 +88,7 @@ Recommends: libjbigi-jni, ttf-dejavu
 Suggests: apparmor
  ,privoxy
  ,syndie
-Description: Router for I2P
+Description: Invisible Internet Project (I2P) - Router
  I2P is an anonymizing network, offering a simple layer that identity-sensitive
  applications can use to securely communicate. All data is wrapped with several
  layers of encryption, and the network is both distributed and dynamic, with no
diff --git a/debian/README.Debian b/debian/README.Debian
@@ -24,7 +24,7 @@ There are a few changes in this package from upstream.
   wrapper.log is in /tmp and the other logs are in ~/.i2p/logs.
 
 - If I2P is run with the initscript in /etc/init.d/i2p, all logs are written
-  to /var/logs/i2p with the timestamps in UTC
+  to /var/log/i2p with the timestamps in UTC
 
 - The config file for the wrapper can be found at /etc/i2p/wrapper.config
 
diff --git a/debian/control b/debian/control
@@ -1,7 +1,7 @@
 Source: i2p
 Maintainer: zzz <zzz@i2pmail.org>
 Section: net
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Priority: optional
 Bugs: mailto:zzz@i2pmail.org
 Homepage: https://geti2p.net/
@@ -31,7 +31,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  libjbigi-jni,
  lsb-base,
  service-wrapper
-Description: Anonymous network (I2P)
+Description: Invisible Internet Project (I2P) - anonymous network
  I2P is an anonymizing network, offering a simple layer that identity-sensitive
  applications can use to securely communicate. All data is wrapped with several
  layers of encryption, and the network is both distributed and dynamic, with no
@@ -46,7 +46,7 @@ Section: java
 Priority: optional
 Depends: ${misc:Depends}, ${shlibs:Depends}, i2p-router
 Homepage: https://geti2p.net/
-Description: I2P libjbigi library
+Description: Invisible Internet Project (I2P) - libjbigi library
  This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid).
  .
  libjbigi is a math library that is part of the I2P installation.  Use of this
@@ -60,7 +60,7 @@ Section: doc
 Priority: extra
 Depends: ${misc:Depends}
 Suggests: i2p, default-jdk-doc
-Description: I2P developer documentation
+Description: Invisible Internet Project (I2P) - developer documentation
  I2P is an anonymizing network, offering a simple layer that identity-sensitive
  applications can use to securely communicate. All data is wrapped with several
  layers of encryption, and the network is both distributed and dynamic, with no
@@ -86,7 +86,7 @@ Recommends: libjbigi-jni, ttf-dejavu
 Suggests: apparmor
  ,privoxy
  ,syndie
-Description: Router for I2P
+Description: Invisible Internet Project (I2P) - Router
  I2P is an anonymizing network, offering a simple layer that identity-sensitive
  applications can use to securely communicate. All data is wrapped with several
  layers of encryption, and the network is both distributed and dynamic, with no
diff --git a/debian/i2p-router.install b/debian/i2p-router.install
@@ -63,12 +63,12 @@ pkg-temp/lib/systray.jar usr/share/i2p/lib
 #pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
 
 
-# uncomment if not building with either glassfish-javaee, libjakarta-taglibs-standard-java or libtaglibs-standard
+# uncomment if not building with either glassfish-javaee, libjakarta-taglibs-standard-java or libtaglibs-standard-jstlel-java
 # ubuntu and debian: everywhere
 # glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
 #pkg-temp/lib/jstl.jar usr/share/i2p/lib
 
 
-# uncomment if not building with either glassfish-javaee, libjstl1.1-java or libtaglibs-standard
+# uncomment if not building with either glassfish-javaee, libjstl1.1-java or libtaglibs-standard-jstlel-java
 # ubuntu and debian: everywhere
 #pkg-temp/lib/standard.jar usr/share/i2p/lib
diff --git a/debian/watch b/debian/watch
@@ -1,3 +1,3 @@
-version=3
+version=4
 
-http://mirror.i2p2.de/i2psource_(.*)\.tar\.bz2 debian debian/repack.sh
+http://download.i2p2.no/releases/(^[0-9].+)$/i2psource_(.+)\.tar\.bz2 debian debian/repack.sh
diff --git a/licenses/LICENSE-ECLIPSE-1.0.html b/licenses/LICENSE-ECLIPSE-1.0.html
@@ -5,7 +5,6 @@
 <meta name="ProgId" content="Word.Document">
 <meta name="Generator" content="Microsoft Word 9">
 <meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/legal/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
 <title>Eclipse Public License - Version 1.0</title>
 <!--[if gte mso 9]><xml>
  <o:DocumentProperties>
@@ -317,4 +316,4 @@
 
 </div>
 
-</body></html>
+</body></html>
