Changeset f3c679e


Ignore:
Timestamp:
Mar 31, 2016 9:14:46 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
a493a28, a834cef
Parents:
b95f30b
Message:

Debian: Update debian-alt files based on 0.9.25 released packages.
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.

Location:
debian-alt
Files:
3 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • debian-alt/jessie/changelog

    rb95f30b rf3c679e  
    1 i2p (0.9.24-1~deb8u+1) stable; urgency=medium
     1i2p (0.9.25-1~deb8u+1) stable; urgency=medium
    22
    33  * Backport to Jessie
    44
    5  -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 30 Jan 2016 13:36:20 +0000
     5 -- zzz on i2p <zzz@i2pmail.org>  Tue, 29 Mar 2016 18:12:12 +0000
    66
    77i2p (0.9.24-1) unstable; urgency=medium
     
    5252
    5353 -- Kill Your TV <killyourtv@i2pmail.org>  Thu, 19 Nov 2015 12:41:36 +0000
    54 
    55 i2p (0.9.22-1~deb8u+1) stable; urgency=medium
    56 
    57   * Backport to Jessie
    58 
    59  -- Kill Your TV <killyourtv@i2pmail.org>  Sun, 13 Sep 2015 11:58:19 +0000
    6054
    6155i2p (0.9.22-1) unstable; urgency=medium
  • debian-alt/precise/changelog

    rb95f30b rf3c679e  
    1 i2p (0.9.23-2~precise+1) precise; urgency=medium
     1i2p (0.9.25-1~precise+1) precise; urgency=medium
    22
    33  * Backport to Precise
    44
    5  -- Kill Your TV <killyourtv@i2pmail.org>  Sun, 06 Dec 2015 17:26:47 +0000
     5 -- zzz on i2p <zzz@i2pmail.org>  Thu, 31 Mar 2016 18:12:12 +0000
     6
     7i2p (0.9.24-1) unstable; urgency=medium
     8
     9  * New upstream version 0.9.24
     10
     11 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 30 Jan 2016 12:08:27 +0000
    612
    713i2p (0.9.23-2) unstable; urgency=medium
  • debian-alt/precise/control

    rb95f30b rf3c679e  
    11Source: i2p
    2 Maintainer: Kill Your TV <killyourtv@i2pmail.org>
     2Maintainer: zzz <zzz@i2pmail.org>
    33Section: net
    44Standards-Version: 3.9.6
    55Priority: optional
    6 Bugs: mailto:killyourtv@i2pmail.org
     6Bugs: mailto:zzz@i2pmail.org
    77Homepage: https://geti2p.net
    88Build-Depends: debhelper (>= 7.0.50~)
     
    1010 ,ant-optional
    1111 ,debconf
    12  ,default-jdk | openjdk-7-jdk | openjdk-6-jdk
     12 ,openjdk-7-jdk
     13# Ant requires java 6 tools.jar:
     14# Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar
     15 ,openjdk-6-jdk
     16 ,dh-apparmor
    1317 ,gettext
    14  ,dh-apparmor
    1518 ,libgmp3-dev
    1619 ,libservice-wrapper-java
    17  ,libcommons-logging-java
     20 ,hardening-wrapper
    1821 ,po-debconf
    19 # ,dh-systemd
    2022
    2123Package: i2p
     
    7173Priority: optional
    7274Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    73  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
     75 openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless, libecj-java
    7476Replaces: i2p ( << 0.8.6-5)
    7577Breaks: i2p (<< 0.8.6-5)
  • debian-alt/precise/rules

    rb95f30b rf3c679e  
    2525        @echo 'The build target is disabled. Use the appropriate binary target.'
    2626
    27 JAVA_HOME=/usr/lib/jvm/default-java
     27export X_DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
     28JAVA_HOME=/usr/lib/jvm/java-7-openjdk-$(X_DEB_HOST_ARCH)
    2829I2P=$(CURDIR)/pkg-temp
    2930ROUTERVERSION=$(CURDIR)/router/java/src/net/i2p/router/RouterVersion.java
     
    3435export JAVA_HOME I2P
    3536export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{print $$2}' |sed 's/.*-\([.0-9A-Za-z~+]\{1,\}\)$$/\1/')
    36 #export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
    3737
    3838%:
     
    4848        rm -rf $(CURDIR)/core/c/jcpuid/lib/
    4949        rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
    50         rm -f $(CURDIR)/installer/lib/launch4j/lib/commons-logging.jar
    5150        rm -rf $(CURDIR)/debian/python-i2p
     51        rm -f $(CURDIR)/override.properties
    5252        debconf-updatepo
    5353
     
    7575        @echo "Already found deb in version, not doing anything"
    7676endif
     77        # build options
     78        @/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties
     79        @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
     80        @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
     81        @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
    7782        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
    7883        echo router.updateDisabled=true > $(I2P)/router.config
  • debian-alt/unstable/changelog

    rb95f30b rf3c679e  
     1i2p (0.9.25-1) unstable; urgency=medium
     2
     3  * New upstream version 0.9.25
     4
     5 -- zzz on i2p <zzz@i2pmail.org>  Tue, 29 Mar 2016 18:12:12 +0000
     6
    17i2p (0.9.24-1) unstable; urgency=medium
    28
Note: See TracChangeset for help on using the changeset viewer.