Changeset 8e20e7a for debian


Ignore:
Timestamp:
Jan 10, 2012 4:06:23 AM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
1b85c22
Parents:
3024b3f (diff), 4ad6d69 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p' (head 96b4e09e85e0947d0b9df188f4861664073f07a6)

to branch 'i2p.i2p.zzz.jetty6' (head 4024ef4f6e6c5e4ca6a7803614dc769ca654ac5f)

Location:
debian/patches
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/0001-path-substitution.patch

    r3024b3f r8e20e7a  
    106106 # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
    107107 wrapper.java.additional.auto_bits=TRUE
    108 @@ -69,7 +61,7 @@
     108@@ -71,7 +63,7 @@
    109109 wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
    110110 wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
     
    115115 
    116116 # On some IPv6 enabled systems, I2P and other network-enabled java applications
    117 @@ -139,11 +131,7 @@
     117@@ -141,11 +133,7 @@
    118118 # tell the router where to find the wrapper log
    119119 # (change X to the next available number)
     
    128128 # Format of output for the log file.
    129129 # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
    130 @@ -205,10 +193,7 @@
     130@@ -211,10 +199,7 @@
    131131 # you should copy this file, change the location or file name,
    132132 # and edit the i2prouter script to change the WRAPPER_CONF setting
     
    140140 #
    141141 # From i2prouter:
    142 @@ -219,10 +204,7 @@
     142@@ -225,10 +210,7 @@
    143143 #
    144144 # This means i2prouter looks for './i2p.pid'.
     
    152152 #********************************************************************
    153153 # Wrapper General Properties
    154 @@ -239,30 +221,3 @@
     154@@ -245,30 +227,3 @@
    155155 wrapper.umask=0022
    156156 wrapper.java.umask=0022
  • debian/patches/0002-jbigi-soname.patch

    r3024b3f r8e20e7a  
    33Subject: jbigi soname
    44
    5 The purpose of this patch is to change the path that mbuild_jbigi.sh
     5The purpose of this patch is to change the path that build_jbigi.sh
    66expects to find the source files at. At the same time I'm specifying
    77a soname to shut lintian up.
    88
    99---
    10  core/c/jbigi/mbuild_jbigi.sh |    6 +++---
    11  1 files changed, 3 insertions(+), 3 deletions(-)
     10 core/c/jbigi/build_jbigi.sh |    4 +++---
     11 1 files changed, 2 insertions(+), 2 deletions(-)
    1212
    13 --- a/core/c/jbigi/mbuild_jbigi.sh
    14 +++ b/core/c/jbigi/mbuild_jbigi.sh
    15 @@ -47,7 +47,7 @@
    16                  fi
     13--- a/core/c/jbigi/build_jbigi.sh
     14+++ b/core/c/jbigi/build_jbigi.sh
     15@@ -37,7 +37,7 @@
     16             UNIXTYPE="solaris"
    1717         fi
    1818         COMPILEFLAGS="-fPIC -Wall"
     
    2222         LIBFILE="libjbigi.so";;
    2323 *)
    24 @@ -66,7 +66,7 @@
     24@@ -56,7 +56,7 @@
    2525 
    2626 echo "Compiling C code..."
     
    2828-$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c || exit 1
    2929+$CC -c $COMPILEFLAGS $INCLUDES ./jbigi/src/jbigi.c || exit 1
    30  $CC $LINKFLAGS $INCLUDES $INCLUDELIBS -o $LIBFILE jbigi.o $STATICLIBS || exit 1
     30 $CC $LINKFLAGS $INCLUDES -o $LIBFILE jbigi.o $INCLUDELIBS $STATICLIBS || exit 1
    3131 
    3232 exit 0
  • debian/patches/series

    r3024b3f r8e20e7a  
    220002-jbigi-soname.patch
    330003-renaming-jcpuid.patch
     40004-oom-listener.patch
    45#debian-version.patch
    560004-jetty6.patch
Note: See TracChangeset for help on using the changeset viewer.