Debian files for 0.9.39

This commit is contained in:
zzz
2019-03-22 15:28:48 +00:00
parent bb5a89219a
commit 05845481d1
10 changed files with 53 additions and 30 deletions

View File

@ -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 i2p (0.9.38-1ubuntu1) bionic; urgency=medium
* New upstream version 0.9.38 * New upstream version 0.9.38

View File

@ -28,11 +28,13 @@ Section: net
Priority: optional Priority: optional
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
adduser, adduser,
apparmor,
debconf, debconf,
i2p-router (>= 0.8.6-5), i2p-router (>= 0.8.6-5),
libjbigi-jni, libjbigi-jni,
lsb-base (>= 3.0-6), lsb-base (>= 3.0-6),
service-wrapper service-wrapper,
ucf (>= 0.28)
Description: Invisible Internet Project (I2P) - anonymous network Description: Invisible Internet Project (I2P) - anonymous network
I2P is an anonymizing network, offering a simple layer that identity-sensitive I2P is an anonymizing network, offering a simple layer that identity-sensitive
applications can use to securely communicate. All data is wrapped with several 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, libjetty9-java,
libtaglibs-standard-jstlel-java, libtaglibs-standard-jstlel-java,
libtomcat9-java, libtomcat9-java,
famfamfam-flag-png famfamfam-flag-png,
sensible-utils
Replaces: i2p ( << 0.8.6-5) Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5) Breaks: i2p (<< 0.8.6-5)
Recommends: libjbigi-jni, fonts-dejavu Recommends: libjbigi-jni, fonts-dejavu

View File

@ -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=-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 "javac.compilerargs7=" >> $(CURDIR)/override.properties
@/bin/echo -e "build.built-by=debian" >> $(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 @# debian and ubuntu: everywhere
@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties

View File

@ -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 i2p (0.9.38-1~disco+1) disco; urgency=medium
* New upstream version 0.9.38 * New upstream version 0.9.38

View File

@ -1,14 +1,16 @@
Source: i2p Source: i2p
Maintainer: zzz <zzz@i2pmail.org> Maintainer: zzz <zzz@i2pmail.org>
Section: net Section: net
Standards-Version: 3.9.8 Standards-Version: 4.3.0
Priority: optional Priority: optional
Bugs: mailto:zzz@i2pmail.org Bugs: mailto:zzz@i2pmail.org
Homepage: https://geti2p.net/ 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) Build-Depends: debhelper (>= 9.20160709)
,ant (>= 1.8) ,ant (>= 1.8)
,debconf ,debconf
,openjdk-8-jdk ,default-jdk
,libjetty9-java ,libjetty9-java
,libtaglibs-standard-jstlel-java ,libtaglibs-standard-jstlel-java
,libtomcat9-java ,libtomcat9-java
@ -27,11 +29,13 @@ Section: net
Priority: optional Priority: optional
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
adduser, adduser,
apparmor,
debconf, debconf,
i2p-router (>= 0.8.6-5), i2p-router (>= 0.8.6-5),
libjbigi-jni, libjbigi-jni,
lsb-base, lsb-base,
service-wrapper service-wrapper,
ucf (>= 0.28)
Description: Invisible Internet Project (I2P) - anonymous network Description: Invisible Internet Project (I2P) - anonymous network
I2P is an anonymizing network, offering a simple layer that identity-sensitive I2P is an anonymizing network, offering a simple layer that identity-sensitive
applications can use to securely communicate. All data is wrapped with several applications can use to securely communicate. All data is wrapped with several
@ -74,7 +78,7 @@ Architecture: all
Section: net Section: net
Priority: optional Priority: optional
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, 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, geoip-database,
gettext-base, gettext-base,
libgetopt-java, libgetopt-java,
@ -82,7 +86,8 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
libjetty9-java, libjetty9-java,
libtaglibs-standard-jstlel-java, libtaglibs-standard-jstlel-java,
libtomcat9-java, libtomcat9-java,
famfamfam-flag-png famfamfam-flag-png,
sensible-utils
Replaces: i2p ( << 0.8.6-5) Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5) Breaks: i2p (<< 0.8.6-5)
Recommends: libjbigi-jni, fonts-dejavu Recommends: libjbigi-jni, fonts-dejavu

View File

@ -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 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 # comment out if not building with libtomcat9-java
# ubuntu: only in xenial+ # ubuntu: only in xenial+
# debian: wheezy-backports, jessie+ # debian: wheezy-backports, jessie+

View File

@ -24,9 +24,10 @@
build: build:
@echo 'The build target is disabled. Use the appropriate binary target.' @echo 'The build target is disabled. Use the appropriate binary target.'
#JAVA_HOME=/usr/lib/jvm/default-java DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
export DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH) JAVA_HOME=/usr/lib/jvm/default-java
I2P=$(CURDIR)/pkg-temp I2P=$(CURDIR)/pkg-temp
ROUTERVERSION=$(CURDIR)/router/java/src/net/i2p/router/RouterVersion.java ROUTERVERSION=$(CURDIR)/router/java/src/net/i2p/router/RouterVersion.java
export DEB_BUILD_HARDENING=1 export DEB_BUILD_HARDENING=1
@ -80,9 +81,9 @@ else
@echo "Already found deb in version, not doing anything" @echo "Already found deb in version, not doing anything"
endif endif
@# build options @# build options
@/bin/echo -e "javac.version=1.8" > $(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.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.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.built-by=debian" >> $(CURDIR)/override.properties
@/bin/echo -e "build.reproducible=true" >> $(CURDIR)/override.properties @/bin/echo -e "build.reproducible=true" >> $(CURDIR)/override.properties

View File

@ -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 i2p (0.9.38p-2~precise+1) precise; urgency=medium
* Fix broken build * Fix broken build

View File

@ -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 i2p (0.9.38p-4~trusty+1) trusty; urgency=medium
* Fix broken build * Fix broken build

View File

@ -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 i2p (0.9.38x-1~xenial+1) xenial; urgency=medium
* Backport to Xenial * Backport to Xenial