echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debian: Update debian-alt files based on 0.9.25 released packages.

Browse Source 
Delete files in debian-alt if the current package version
is now the same as what's in debian/
debian-alt/precise/ contains fixes for precise builds.
This commit is contained in:
zzz
2016-03-31 21:14:46 +00:00
parent b95f30b7d6
commit f3c679e615
8 changed files with 33 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
debian-alt/precise/changelog
View File

@ -1,8 +1,14 @@
i2p (0.9.23-2~precise+1) precise; urgency=medium
i2p (0.9.25-1~precise+1) precise; urgency=medium
* Backport to Precise
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 06 Dec 2015 17:26:47 +0000
-- zzz on i2p <zzz@i2pmail.org> Thu, 31 Mar 2016 18:12:12 +0000
i2p (0.9.24-1) unstable; urgency=medium
* New upstream version 0.9.24
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 30 Jan 2016 12:08:27 +0000
i2p (0.9.23-2) unstable; urgency=medium

16
debian-alt/precise/control
View File

@ -1,22 +1,24 @@
Source: i2p
Maintainer: Kill Your TV <killyourtv@i2pmail.org>
Maintainer: zzz <zzz@i2pmail.org>
Section: net
Standards-Version: 3.9.6
Priority: optional
Bugs: mailto:killyourtv@i2pmail.org
Bugs: mailto:zzz@i2pmail.org
Homepage: https://geti2p.net
Build-Depends: debhelper (>= 7.0.50~)
,ant (>= 1.8)
,ant-optional
,debconf
,default-jdk | openjdk-7-jdk | openjdk-6-jdk
,gettext
,openjdk-7-jdk
# Ant requires java 6 tools.jar:
# Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar
,openjdk-6-jdk
,dh-apparmor
,gettext
,libgmp3-dev
,libservice-wrapper-java
,libcommons-logging-java
,hardening-wrapper
,po-debconf
# ,dh-systemd
Package: i2p
Architecture: all
@ -70,7 +72,7 @@ Architecture: all
Section: net
Priority: optional
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
openjdk-8-jre-headless | openjdk-7-jre-headless | openjdk-6-jre-headless | default-jre-headless | java8-runtime-headless | java7-runtime-headless | java6-runtime-headless, libecj-java
openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless, libecj-java
Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5)
Recommends: libjbigi-jni, ttf-dejavu

11
debian-alt/precise/rules
View File

@ -24,7 +24,8 @@
build:
@echo 'The build target is disabled. Use the appropriate binary target.'
JAVA_HOME=/usr/lib/jvm/default-java
export X_DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
JAVA_HOME=/usr/lib/jvm/java-7-openjdk-$(X_DEB_HOST_ARCH)
I2P=$(CURDIR)/pkg-temp
ROUTERVERSION=$(CURDIR)/router/java/src/net/i2p/router/RouterVersion.java
export DEB_BUILD_HARDENING=1
@ -33,7 +34,6 @@ export DEB_BUILD_HARDENING=1
#export EXTRAPREFIX := deb
export JAVA_HOME I2P
export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{print $$2}' |sed 's/.*-\([.0-9A-Za-z~+]\{1,\}\)$$/\1/')
#export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
%:
dh $@
@ -47,8 +47,8 @@ override_dh_auto_clean:
find $(CURDIR)/core \( -name '*\.so' -o -name '*\.o' \) -exec rm -f {} \;
rm -rf $(CURDIR)/core/c/jcpuid/lib/
rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
rm -f $(CURDIR)/installer/lib/launch4j/lib/commons-logging.jar
rm -rf $(CURDIR)/debian/python-i2p
rm -f $(CURDIR)/override.properties
debconf-updatepo
override_dh_auto_build:
@ -74,6 +74,11 @@ ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
else
@echo "Already found deb in version, not doing anything"
endif
# build options
@/bin/echo -e "javac.version=1.7" > $(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
TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
echo router.updateDisabled=true > $(I2P)/router.config
mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper