Changeset fa235d97 for debian


Ignore:
Timestamp:
Dec 22, 2012 5:51:15 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
5d52372
Parents:
42f8c71d
Message:

enable i2prouter translations in the debian package & refresh patch

Location:
debian
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • debian/i2p.install

    r42f8c71d rfa235d97  
    11pkg-temp/i2prouter usr/bin
    22pkg-temp/wrapper.config etc/i2p
     3pkg-temp/locale usr/share/i2p
  • debian/patches/0001-path-substitution.patch

    r42f8c71d rfa235d97  
    1515 4 files changed, 24 insertions(+), 134 deletions(-)
    1616
    17 diff --git a/installer/resources/eepget b/installer/resources/eepget
    18 index 080bcc8..f2e84ba 100644
    1917--- a/installer/resources/eepget
    2018+++ b/installer/resources/eepget
     
    2422+I2P="/usr/share/i2p"
    2523 java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
    26 diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
    27 index cdf3e71..266dc16 100644
    2824--- a/installer/resources/i2prouter
    2925+++ b/installer/resources/i2prouter
     
    3935@@ -24,16 +24,9 @@
    4036 # These settings can be modified to fit the needs of your application
    41  # Optimized for use with version 3.5.16 of the Wrapper.
     37 # Optimized for use with version 3.5.17 of the Wrapper.
    4238 
    4339-# Paths
     
    5753 # Application
    5854 APP_NAME="i2p"
    59 @@ -61,8 +54,8 @@ fi
     55@@ -61,8 +54,8 @@
    6056 #RUN_AS_USER=
    6157 
     
    6864 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
    6965 #  nice is only used if a priority is specified.
    70 @@ -173,48 +166,6 @@ fi
     66@@ -167,48 +160,6 @@
    7167 # Workaround for Gentoo
    7268 JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
     
    9793-
    9894-failed() {
    99 -        echo "**Failed to load the wrapper**"
     95-        echo "**`gettext 'Failed to load the wrapper'`**"
    10096-        case `uname -s` in
    10197-             FreeBSD)
     
    117113 then
    118114     COMMAND="$FIXED_COMMAND"
    119 @@ -918,9 +869,6 @@ console() {
     115@@ -912,9 +863,6 @@
    120116         # The string passed to eval must handles spaces in paths correctly.
    121          COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP $ADDITIONAL_PARA"
     117         COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
    122118         eval $COMMAND_LINE
    123119-        if [ "$?" -ne "0" ]; then
     
    127123         eval echo `gettext '$APP_LONG_NAME is already running.'`
    128124         exit 1
    129 @@ -1044,9 +992,6 @@ start() {
     125@@ -1038,9 +986,6 @@
    130126         # The string passed to eval must handles spaces in paths correctly.
    131          COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP $ADDITIONAL_PARA"
     127         COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
    132128         eval $COMMAND_LINE
    133129-        if [ "$?" -ne "0" ]; then
     
    137133         eval echo `gettext '$APP_LONG_NAME is already running.'`
    138134         exit 1
    139 @@ -1887,18 +1832,9 @@ docommand() {
     135@@ -1850,18 +1795,9 @@
    140136             status
    141137             ;;
     
    159155 
    160156         'dump')
    161 diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
    162 index 949a7ab..48b82fb 100644
    163157--- a/installer/resources/runplain.sh
    164158+++ b/installer/resources/runplain.sh
     
    174168 # Having IPv6 enabled can cause problems with certain configurations. Changing the
    175169 # next value to true may help.
    176 diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config
    177 index cfc5918..d4a5de9 100644
    178170--- a/installer/resources/wrapper.config
    179171+++ b/installer/resources/wrapper.config
     
    203195 #********************************************************************
    204196 # Java Application
    205 @@ -60,13 +51,14 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
     197@@ -60,13 +51,14 @@
    206198 # classes, or all the classes of i2p.jar, are in a different directory).
    207199 # Be sure there are no other duplicate classes.
     
    223215 # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
    224216 wrapper.java.additional.auto_bits=TRUE
    225 @@ -76,7 +68,7 @@ wrapper.java.additional.auto_bits=TRUE
     217@@ -76,7 +68,7 @@
    226218 wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
    227219 wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
     
    232224 
    233225 # On some IPv6 enabled systems, I2P and other network-enabled java applications
    234 @@ -144,11 +136,7 @@ wrapper.console.loglevel=INFO
     226@@ -144,11 +136,7 @@
    235227 # NOTE: On Linux/Mac this is overridden in the i2prouter script; changes here will have no effect.
    236228 # Windows users may wish to change this to %APPDATA%\I2P\wrapper.log
     
    245237 # Format of output for the log file.
    246238 # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
    247 @@ -218,11 +206,7 @@ wrapper.use_system_time=false
     239@@ -218,11 +206,7 @@
    248240 # Linux/Mac users, do not set here, see settings in the i2prouter script.
    249241 # Directory must exist or the wrapper will fail to start.
     
    258250 # From i2prouter:
    259251 #
    260 @@ -236,10 +220,7 @@ wrapper.use_system_time=false
     252@@ -236,10 +220,7 @@
    261253 # Linux/Mac users, do not set here, see settings in the i2prouter script.
    262254 # Directory must exist or the wrapper will fail to start.
     
    270262 #********************************************************************
    271263 # Wrapper General Properties
    272 @@ -256,30 +237,3 @@ wrapper.console.title=I2P Service
     264@@ -256,30 +237,3 @@
    273265 wrapper.umask=0022
    274266 wrapper.java.umask=0022
Note: See TracChangeset for help on using the changeset viewer.