From 05845481d12a7a2456236a43660c3b1ab9df7960 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 22 Mar 2019 15:28:48 +0000
Subject: [PATCH] Debian files for 0.9.39
---
debian-alt/bionic/changelog | 6 ++++++
debian-alt/buster/control | 7 +++++--
debian-alt/buster/rules | 1 +
debian-alt/disco/changelog | 6 ++++++
debian-alt/disco/control | 15 ++++++++++-----
debian-alt/disco/i2p-router.links | 17 -----------------
debian-alt/disco/rules | 13 +++++++------
debian-alt/precise/changelog | 6 ++++++
debian-alt/trusty/changelog | 6 ++++++
debian-alt/xenial/changelog | 6 ++++++
10 files changed, 53 insertions(+), 30 deletions(-)
diff --git a/debian-alt/bionic/changelog b/debian-alt/bionic/changelog
index 8dcc4c8525..cf1767b224 100644
--- a/debian-alt/bionic/changelog
+++ b/debian-alt/bionic/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.39-1ubuntu1) bionic; urgency=medium
+
+ * New upstream version 0.9.39
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Fri, 22 Mar 2019 12:12:12 +0000
+
i2p (0.9.38-1ubuntu1) bionic; urgency=medium
* New upstream version 0.9.38
diff --git a/debian-alt/buster/control b/debian-alt/buster/control
index 9f54313493..2fb468a690 100644
--- a/debian-alt/buster/control
+++ b/debian-alt/buster/control
@@ -28,11 +28,13 @@ Section: net
Priority: optional
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
adduser,
+ apparmor,
debconf,
i2p-router (>= 0.8.6-5),
libjbigi-jni,
lsb-base (>= 3.0-6),
- service-wrapper
+ service-wrapper,
+ ucf (>= 0.28)
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
@@ -83,7 +85,8 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
libjetty9-java,
libtaglibs-standard-jstlel-java,
libtomcat9-java,
- famfamfam-flag-png
+ famfamfam-flag-png,
+ sensible-utils
Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5)
Recommends: libjbigi-jni, fonts-dejavu
diff --git a/debian-alt/buster/rules b/debian-alt/buster/rules
index 9f9789a009..6a8934542f 100755
--- a/debian-alt/buster/rules
+++ b/debian-alt/buster/rules
@@ -85,6 +85,7 @@ endif
# @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
@/bin/echo -e "javac.compilerargs7=" >> $(CURDIR)/override.properties
@/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
+ @/bin/echo -e "build.reproducible=true" >> $(CURDIR)/override.properties
@# debian and ubuntu: everywhere
@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
diff --git a/debian-alt/disco/changelog b/debian-alt/disco/changelog
index f3f958e69b..5ec7d81d08 100644
--- a/debian-alt/disco/changelog
+++ b/debian-alt/disco/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.39-1~disco+1) disco; urgency=medium
+
+ * New upstream version 0.9.39
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Fri, 22 Mar 2019 12:12:12 +0000
+
i2p (0.9.38-1~disco+1) disco; urgency=medium
* New upstream version 0.9.38
diff --git a/debian-alt/disco/control b/debian-alt/disco/control
index c9d242b3d2..5fe5be5829 100644
--- a/debian-alt/disco/control
+++ b/debian-alt/disco/control
@@ -1,14 +1,16 @@
Source: i2p
Maintainer: zzz <zzz@i2pmail.org>
Section: net
-Standards-Version: 3.9.8
+Standards-Version: 4.3.0
Priority: optional
Bugs: mailto:zzz@i2pmail.org
Homepage: https://geti2p.net/
+Vcs-Browser: https://salsa.debian.org/debian/i2p
+Vcs-Git: https://salsa.debian.org/debian/i2p.git
Build-Depends: debhelper (>= 9.20160709)
,ant (>= 1.8)
,debconf
- ,openjdk-8-jdk
+ ,default-jdk
,libjetty9-java
,libtaglibs-standard-jstlel-java
,libtomcat9-java
@@ -27,11 +29,13 @@ Section: net
Priority: optional
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
adduser,
+ apparmor,
debconf,
i2p-router (>= 0.8.6-5),
libjbigi-jni,
lsb-base,
- service-wrapper
+ service-wrapper,
+ ucf (>= 0.28)
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
@@ -74,7 +78,7 @@ Architecture: all
Section: net
Priority: optional
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
- openjdk-9-jre-headless | openjdk-8-jre-headless | default-jre-headless | java9-runtime-headless | java8-runtime-headless,
+ openjdk-11-jre-headless | java11-runtime-headless,
geoip-database,
gettext-base,
libgetopt-java,
@@ -82,7 +86,8 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
libjetty9-java,
libtaglibs-standard-jstlel-java,
libtomcat9-java,
- famfamfam-flag-png
+ famfamfam-flag-png,
+ sensible-utils
Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5)
Recommends: libjbigi-jni, fonts-dejavu
diff --git a/debian-alt/disco/i2p-router.links b/debian-alt/disco/i2p-router.links
index 1890f6112e..134d77543d 100644
--- a/debian-alt/disco/i2p-router.links
+++ b/debian-alt/disco/i2p-router.links
@@ -33,23 +33,6 @@ usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar
usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
-# comment out if not building with libtomcat8-java
-# ubuntu: only in xenial+
-# debian: wheezy-backports, jessie+
-# legacy name, contains only tomcat-juli, not commons-logging
-#usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
-#usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
-# combined into jasper-runtime.jar in non-package builds
-#usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
-#usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
-#usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
-#usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
-# combined into commons-el.jar in non-package builds
-#usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
-# legacy name in lib/
-#usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
-
-
# comment out if not building with libtomcat9-java
# ubuntu: only in xenial+
# debian: wheezy-backports, jessie+
diff --git a/debian-alt/disco/rules b/debian-alt/disco/rules
index 1b7cceb912..c7bf6f18be 100755
--- a/debian-alt/disco/rules
+++ b/debian-alt/disco/rules
@@ -24,9 +24,10 @@
build:
@echo 'The build target is disabled. Use the appropriate binary target.'
-#JAVA_HOME=/usr/lib/jvm/default-java
-export DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+JAVA_HOME=/usr/lib/jvm/default-java
+
I2P=$(CURDIR)/pkg-temp
ROUTERVERSION=$(CURDIR)/router/java/src/net/i2p/router/RouterVersion.java
export DEB_BUILD_HARDENING=1
@@ -80,9 +81,9 @@ else
@echo "Already found deb in version, not doing anything"
endif
@# build options
- @/bin/echo -e "javac.version=1.8" > $(CURDIR)/override.properties
- @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
- @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
+# @/bin/echo -e "javac.version=1.8" > $(CURDIR)/override.properties
+# @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
+# @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
@/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
@/bin/echo -e "build.reproducible=true" >> $(CURDIR)/override.properties
diff --git a/debian-alt/precise/changelog b/debian-alt/precise/changelog
index d9f22ea057..d90bb6ea30 100644
--- a/debian-alt/precise/changelog
+++ b/debian-alt/precise/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.39p-1~precise+1) precise; urgency=medium
+
+ * Backport to Precise
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Fri, 22 Mar 2019 12:12:12 +0000
+
i2p (0.9.38p-2~precise+1) precise; urgency=medium
* Fix broken build
diff --git a/debian-alt/trusty/changelog b/debian-alt/trusty/changelog
index 65ece3797b..5fccf7237e 100644
--- a/debian-alt/trusty/changelog
+++ b/debian-alt/trusty/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.39p-1~trusty+1) trusty; urgency=medium
+
+ * Backport to Trusty
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Fri, 22 Mar 2019 12:12:12 +0000
+
i2p (0.9.38p-4~trusty+1) trusty; urgency=medium
* Fix broken build
diff --git a/debian-alt/xenial/changelog b/debian-alt/xenial/changelog
index ea7227c660..e7b1494162 100644
--- a/debian-alt/xenial/changelog
+++ b/debian-alt/xenial/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.39x-1~xenial+1) xenial; urgency=medium
+
+ * Backport to Xenial
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org> Fri, 22 Mar 2019 12:12:12 +0000
+
i2p (0.9.38x-1~xenial+1) xenial; urgency=medium
* Backport to Xenial
--
GitLab