Changeset c84dd52 for debian


Ignore:
Timestamp:
Mar 21, 2016 6:25:17 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
c1b6e1b
Parents:
b0aaf64
Message:

Debian: Updates from the 0.9.24 release, including patch refresh, not checked in at the time.
Cherry-picked out of
​https://launchpad.net/~i2p.packages/+archive/ubuntu/i2p/+files/i2p_0.9.24-1ubuntu1.debian.tar.xz
The files in ​http://deb.i2p2.no/pool/main/i/i2p/i2p_0.9.24-1~deb8u+1.debian.tar.xz
are somewhat different.
Note that some files out of that tarball are apparently older than what is in our debian/
directory and were not copied over.
Some of the changes may be for Ubuntu and will not work for Debian.
Kytv may have had a local debian/ directory for Ubuntu builds that was not checked in anywhere.
Untested. Another patch refresh for 0.9.25 may be required.
To be fixed up after the 0.9.25 release.

Location:
debian
Files:
1 deleted
9 edited
1 moved

Legend:

Unmodified
Added
Removed

  • debian/NEWS

    rb0aaf64 rc84dd52  
    55  be in wrapper.service have been moved to the initscript. If you have changed
    66  the amount of memory set aside for I2P, you'll need to make that change to
    7   /etc/i2p/wrapper.config.
    8 
     7  /etc/i2p/wrapper.config. 
     8 
    99  The I2P router is now split into four different packages: i2p, i2p-doc,
    1010  i2p-router, and libjbigi.

  • debian/changelog

    rb0aaf64 rc84dd52  
     1i2p (0.9.24-1) unstable; urgency=medium
     2
     3  * New upstream version 0.9.24
     4
     5 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 30 Jan 2016 12:08:27 +0000
     6
    17i2p (0.9.23-2) unstable; urgency=medium
    28

  • debian/control

    rb0aaf64 rc84dd52  
    1919 ,hardening-wrapper
    2020 ,po-debconf
    21 # Uncomment the next line for Debian unstable or Ubuntu Saucy (and newer)
    22 # ,dh-systemd
     21 ,dh-systemd
    2322
    2423Package: i2p
    … …  
    2827Depends: ${java:Depends}, ${shlibs:Depends},
    2928 adduser,
     29 debconf,
    3030 i2p-router (>= 0.8.6-5),
    3131 libjbigi-jni,
    … …  
    7878Recommends: libjbigi-jni, ttf-dejavu
    7979Suggests: tor
     80 ,apparmor
    8081 ,i2p-messenger
    8182 ,i2phex

  • debian/i2p-doc.preinst

    rb0aaf64 rc84dd52  
    1010                test -d /usr/share/doc/i2p-doc/api \
    1111                        && rm -rf /usr/share/doc/i2p-doc/api
    12         fi
     12        fi 
    1313fi
    1414

  • debian/i2p.templates

    rb0aaf64 rc84dd52  
    3838Type: boolean
    3939Default: true
    40 _Description: Run I2P daemon confined with AppArmor
     40_Description: Should the I2P daemon be confined with AppArmor?
    4141 With this option enabled I2P will be sandboxed with AppArmor, restricting which files and
    4242 directories may be accessed by I2P.

  • debian/patches/0002-jbigi-soname.patch

    rb0aaf64 rc84dd52  
    77a soname to shut lintian up.
    88---
    9  core/c/jbigi/build_jbigi.sh |    4 ++--
     9 core/c/jbigi/build_jbigi.sh | 4 ++--
    1010 1 file changed, 2 insertions(+), 2 deletions(-)
    1111
     12diff --git a/core/c/jbigi/build_jbigi.sh b/core/c/jbigi/build_jbigi.sh
     13index 1521392..6a89c92 100755
    1214--- a/core/c/jbigi/build_jbigi.sh
    1315+++ b/core/c/jbigi/build_jbigi.sh
    14 @@ -39,7 +39,7 @@
     16@@ -39,7 +39,7 @@ SunOS*|OpenBSD*|NetBSD*|*FreeBSD*|Linux*)
    1517             UNIXTYPE="linux"
    1618         fi
    … …  
    2123         LIBFILE="libjbigi.so";;
    2224 *)
    23 @@ -58,7 +58,7 @@
     25@@ -58,7 +58,7 @@ fi
    2426 
    2527 echo "Compiling C code..."

  • debian/patches/0003-rename-jcpuid.patch

    rb0aaf64 rc84dd52  
    44
    55---
    6  core/c/jcpuid/build.sh |    8 ++------
     6 core/c/jcpuid/build.sh | 8 ++------
    77 1 file changed, 2 insertions(+), 6 deletions(-)
    88
     9diff --git a/core/c/jcpuid/build.sh b/core/c/jcpuid/build.sh
     10index 5b63c6c..f39148d 100755
    911--- a/core/c/jcpuid/build.sh
    1012+++ b/core/c/jcpuid/build.sh
    11 @@ -75,12 +75,8 @@
     13@@ -75,12 +75,8 @@ case `uname -s` in
    1214                 exit 0;;
    1315         esac

  • debian/patches/series

    rb0aaf64 rc84dd52  
    110001-path-substitution.patch
    220002-jbigi-soname.patch
    3 0003-renaming-jcpuid.patch
    4 #0004-jetty6.patch
     30003-rename-jcpuid.patch
     40004-remove-launch4j.patch

  • debian/rules

    rb0aaf64 rc84dd52  
    2828I2P=$(CURDIR)/pkg-temp
    2929ROUTERVERSION=$(CURDIR)/router/java/src/net/i2p/router/RouterVersion.java
     30export DEB_BUILD_HARDENING=1
    3031
    3132# I2P's version will be displayed in the router console as "$I2PVERSION-$EXTRAPREFIX$DEBIANVERSION", eg. 0.8.12-0-deb1
    32 export EXTRAPREFIX := deb
     33#export EXTRAPREFIX := deb
    3334export JAVA_HOME I2P
    34 export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{print $$2}' |sed 's/.*-\([0-9A-Za-z~]\{1,\}\)$$/\1/')
     35export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{print $$2}' |sed 's/.*-\([.0-9A-Za-z~+]\{1,\}\)$$/\1/')
    3536#export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
    3637
    3738%:
    38         dh $@ --with quilt
    39         # with systemd needs dh-systemd which isn't available in Wheezy (except from backports),
    40         # and is only Ubuntu as of "Saucy". The official packages will enable this for Debian unstable and
    41         # Ubuntu Saucy (and newer)
    42         #dh $@ --with systemd,quilt
     39        dh $@ --with systemd
    4340
    4441clean: createcopyright
    … …  
    4845        dh_auto_clean
    4946        ant distclean
    50         find $(CURDIR)/core -name '*\.[s]o' -exec rm -f {} \;
     47        find $(CURDIR)/core \( -name '*\.so' -o -name '*\.o' \) -exec rm -f {} \;
    5148        rm -rf $(CURDIR)/core/c/jcpuid/lib/
    52         #rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
     49        rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
     50        rm -f $(CURDIR)/installer/lib/launch4j/lib/commons-logging.jar
     51        rm -rf $(CURDIR)/debian/python-i2p
    5352        debconf-updatepo
    5453
    5554override_dh_auto_build:
    5655
    57 # Uncomment the next override line for systems that support dh-systemd
    58 # (currently Debian unstable and Ubuntu Saucy (and newer))
    59 #override_dh_systemd_enable:
     56override_dh_systemd_enable:
    6057        # We purposely do not set I2P to start at boot.
    6158        # This matches the behavior of the initscript
    … …  
    6562build-indep:
    6663        dh_prep
     64        mkdir -p $(CURDIR)/installer/lib/wrapper/all
     65        mkdir -p $(CURDIR)/installer/lib/launch4j/lib/
     66        ln -sf /usr/share/java/commons-logging.jar $(CURDIR)/installer/lib/launch4j/lib/commons-logging.jar
     67        ln -sf /usr/share/java/wrapper.jar $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
    6768        if [ ! -e $(CURDIR)/debian/routerversion.java.bak ]; then \
    6869                cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \
    … …  
    7475        @echo "Already found deb in version, not doing anything"
    7576endif
    76         sh -n installer/resources/i2prouter || exit 1
    77         sh -n installer/resources/runplain.sh || exit 1
    78         TZ=UTC ant preppkg-unix javadoc
     77        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
    7978        echo router.updateDisabled=true > $(I2P)/router.config
    8079        mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
    81        
    8280
    8381binary-arch: build-arch
    … …  
    9593        @/bin/echo -e "This package was Debianized by kytv <killyourtv@i2pmail.org>" >> $(CURDIR)/debian/copyright
    9694        @/bin/echo -e "Sun, 23 Jan 2011 20:26:51 +0000" >> $(CURDIR)/debian/copyright
    97         @/bin/echo -e "\nIt was downloaded from http://www.i2p2.de" >> $(CURDIR)/debian/copyright
     95        @/bin/echo -e "\nIt was downloaded from https://geti2p.net" >> $(CURDIR)/debian/copyright
    9896        @/bin/echo -e "\nI2P is tracked upstream using the Monotone VCS" >> $(CURDIR)/debian/copyright
    9997        @/bin/echo -e "Complete information on fetching the source with monotone can be found" >> $(CURDIR)/debian/copyright
    100         @/bin/echo -e "at http://www.i2p2.de/newdevelopers#getting-the-i2p-code\n\n\n" >> $(CURDIR)/debian/copyright
     98        @/bin/echo -e "at https://geti2p.net/newdevelopers#getting-the-i2p-code\n\n\n" >> $(CURDIR)/debian/copyright
    10199        @/bin/cat $(CURDIR)/LICENSE.txt >> $(CURDIR)/debian/copyright
     100        @/bin/echo -e "\n\n The debian packaging has been released into the public domain." >> $(CURDIR)/debian/copyright
    102101
    103102override_dh_compress:

  • debian/source/options

    rb0aaf64 rc84dd52  
    1 compression="bzip2"
     1compression="xz"
    22compression-level=9
Note: See TracChangeset for help on using the changeset viewer.