Changeset fa235d97

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:

• i2p.install (modified) (1 diff)
• patches/0001-path-substitution.patch (modified) (17 diffs)

debian/i2p.install

@@ -1 +1 @@
 pkg-temp/i2prouter usr/bin
 pkg-temp/wrapper.config etc/i2p
+pkg-temp/locale usr/share/i2p

debian/patches/0001-path-substitution.patch

@@ -15 +15 @@
  4 files changed, 24 insertions(+), 134 deletions(-)
 
-diff --git a/installer/resources/eepget b/installer/resources/eepget
-index 080bcc8..f2e84ba 100644
 --- a/installer/resources/eepget
 +++ b/installer/resources/eepget
@@ -24 +22 @@
 +I2P="/usr/share/i2p"
  java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
-diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
-index cdf3e71..266dc16 100644
 --- a/installer/resources/i2prouter
 +++ b/installer/resources/i2prouter
@@ -39 +35 @@
 @@ -24,16 +24,9 @@
  # These settings can be modified to fit the needs of your application
- # Optimized for use with version 3.5.16 of the Wrapper.
+ # Optimized for use with version 3.5.17 of the Wrapper.
  
 -# Paths
@@ -57 +53 @@
  # Application
  APP_NAME="i2p"
-@@ -61,8 +54,8 @@ fi
+@@ -61,8 +54,8 @@
  #RUN_AS_USER=
  
@@ -68 +64 @@
  # Priority at which to run the wrapper.  See "man nice" for valid priorities.
  #  nice is only used if a priority is specified.
-@@ -173,48 +166,6 @@ fi
+@@ -167,48 +160,6 @@
  # Workaround for Gentoo
  JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
@@ -97 +93 @@
 -
 -failed() {
--        echo "**Failed to load the wrapper**"
+-        echo "**`gettext 'Failed to load the wrapper'`**"
 -        case `uname -s` in
 -             FreeBSD)
@@ -117 +113 @@
  then
      COMMAND="$FIXED_COMMAND"
-@@ -918,9 +869,6 @@ console() {
+@@ -912,9 +863,6 @@
          # The string passed to eval must handles spaces in paths correctly.
-         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"
+         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"
          eval $COMMAND_LINE
 -        if [ "$?" -ne "0" ]; then
@@ -127 +123 @@
          eval echo `gettext '$APP_LONG_NAME is already running.'`
          exit 1
-@@ -1044,9 +992,6 @@ start() {
+@@ -1038,9 +986,6 @@
          # The string passed to eval must handles spaces in paths correctly.
-         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"
+         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"
          eval $COMMAND_LINE
 -        if [ "$?" -ne "0" ]; then
@@ -137 +133 @@
          eval echo `gettext '$APP_LONG_NAME is already running.'`
          exit 1
-@@ -1887,18 +1832,9 @@ docommand() {
+@@ -1850,18 +1795,9 @@
              status
              ;;
@@ -159 +155 @@
  
          'dump')
-diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
-index 949a7ab..48b82fb 100644
 --- a/installer/resources/runplain.sh
 +++ b/installer/resources/runplain.sh
@@ -174 +168 @@
  # Having IPv6 enabled can cause problems with certain configurations. Changing the
  # next value to true may help. 
-diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config
-index cfc5918..d4a5de9 100644
 --- a/installer/resources/wrapper.config
 +++ b/installer/resources/wrapper.config
@@ -203 +195 @@
  #********************************************************************
  # Java Application
-@@ -60,13 +51,14 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
+@@ -60,13 +51,14 @@
  # classes, or all the classes of i2p.jar, are in a different directory).
  # Be sure there are no other duplicate classes.
@@ -223 +215 @@
  # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
  wrapper.java.additional.auto_bits=TRUE
-@@ -76,7 +68,7 @@ wrapper.java.additional.auto_bits=TRUE
+@@ -76,7 +68,7 @@
  wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
  wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
@@ -232 +224 @@
  
  # On some IPv6 enabled systems, I2P and other network-enabled java applications
-@@ -144,11 +136,7 @@ wrapper.console.loglevel=INFO
+@@ -144,11 +136,7 @@
  # NOTE: On Linux/Mac this is overridden in the i2prouter script; changes here will have no effect.
  # Windows users may wish to change this to %APPDATA%\I2P\wrapper.log
@@ -245 +237 @@
  # Format of output for the log file.
  # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
-@@ -218,11 +206,7 @@ wrapper.use_system_time=false
+@@ -218,11 +206,7 @@
  # Linux/Mac users, do not set here, see settings in the i2prouter script.
  # Directory must exist or the wrapper will fail to start.
@@ -258 +250 @@
  # From i2prouter:
  #
-@@ -236,10 +220,7 @@ wrapper.use_system_time=false
+@@ -236,10 +220,7 @@
  # Linux/Mac users, do not set here, see settings in the i2prouter script.
  # Directory must exist or the wrapper will fail to start.
@@ -270 +262 @@
  #********************************************************************
  # Wrapper General Properties
-@@ -256,30 +237,3 @@ wrapper.console.title=I2P Service
+@@ -256,30 +237,3 @@
  wrapper.umask=0022
  wrapper.java.umask=0022