forked from I2P_Developers/i2p.i2p
propagate from branch 'i2p.i2p' (head b7ee04ecc7a594239e977b25a52ebdabadce558e)
to branch 'i2p.i2p.zzz.jetty6' (head 2cd4a4dae8b87b9ed2128d83aff1b39e3a818556)
This commit is contained in:
48
debian/changelog
vendored
48
debian/changelog
vendored
@@ -1,3 +1,51 @@
|
||||
i2p (0.8.12-2) stable; urgency=low
|
||||
|
||||
* postinst: Don't fail if the i2psvc group doesn't exist
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Fri, 06 Jan 2012 18:43:09 +0000
|
||||
|
||||
i2p (0.8.12-1) stable; urgency=low
|
||||
|
||||
* New upstream I2P release
|
||||
* Debconf:
|
||||
- add wrapper.java.maxmemory from wrapper.config
|
||||
- The warning about the daemon user needing to exist was confusing to some
|
||||
that assumed this meant that i2psvc had to exit. This warning has been
|
||||
clarified.
|
||||
- Spanish, Swedish, Ukrainian translation updates
|
||||
* Initscript changes/fixes:
|
||||
- increase shutdown wait-time in initscript
|
||||
- renumber "wrapper.additional" lines (since gaps are allowed with newer
|
||||
wrapper versions)
|
||||
- move I2PTEMP to /tmp/i2p-daemon
|
||||
- move router.ping to /var/run/i2p
|
||||
- various other clean-ups
|
||||
- explicity redirect errors to stderr
|
||||
* maintainer scripts:
|
||||
- postinst: rewrite the handling of an existing i2psvc account
|
||||
- postrm: remove /etc/default/i2p if the package is purged
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Fri, 06 Jan 2012 02:49:03 +0000
|
||||
|
||||
i2p (0.8.11-2) stable; urgency=medium
|
||||
|
||||
* Fix STUPID bug running I2P with i2prouter. Thanks soundwave.
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 08 Nov 2011 20:02:05 +0000
|
||||
|
||||
i2p (0.8.11-1) stable; urgency=low
|
||||
|
||||
* New Upstream Version
|
||||
* sv and uk debconf translation updates
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 07 Nov 2011 19:20:15 +0000
|
||||
|
||||
i2p (0.8.10-1) stable; urgency=medium
|
||||
|
||||
* New upstream version
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Thu, 20 Oct 2011 05:25:04 +0000
|
||||
|
||||
i2p (0.8.9-1) stable; urgency=medium
|
||||
|
||||
* New upstream version
|
||||
|
100
debian/i2p.init
vendored
100
debian/i2p.init
vendored
@@ -1,18 +1,18 @@
|
||||
#!/bin/sh
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: i2p i2p-router
|
||||
# Required-Start: $remote_fs $syslog $named $network $time
|
||||
# Required-Stop: $remote_fs $syslog $named $network
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: start and stop the i2p router
|
||||
# Description: i2p is a load-balanced unspoofable packet switching network
|
||||
# Provides: i2p i2p-router
|
||||
# Required-Start: $remote_fs $syslog $named $network $time
|
||||
# Required-Stop: $remote_fs $syslog $named $network
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: start and stop the i2p router
|
||||
# Description: i2p is a load-balanced unspoofable packet switching network
|
||||
### END INIT INFO
|
||||
|
||||
# Check permissions
|
||||
if [ "`id -ur`" != '0' ]; then
|
||||
echo 'Error: you must be root.'
|
||||
echo 'ERROR: You must be root to start this service.' >&2
|
||||
echo
|
||||
exit 1
|
||||
fi
|
||||
@@ -25,17 +25,19 @@ DAEMON="/usr/sbin/wrapper"
|
||||
PIDFILE="$RUN/$NAME.pid"
|
||||
JVMPIDFILE="$RUN/routerjvm.pid"
|
||||
I2P="/usr/share/i2p"
|
||||
I2PTEMP="/tmp/"
|
||||
I2PTEMP="/tmp/${NAME}-daemon"
|
||||
WRAPPERLOG="/var/log/i2p/wrapper.log"
|
||||
|
||||
# Don't touch these, edit /etc/default/i2p
|
||||
RUN_DAEMON="False"
|
||||
NICE=
|
||||
NICE=0
|
||||
I2PUSER="i2psvc"
|
||||
|
||||
I2P_ARGS="/etc/i2p/wrapper.config \
|
||||
wrapper.java.additional.1=-DloggerFilenameOverride=/var/log/i2p/log-router-@.txt \
|
||||
wrapper.java.additional.5=-Dwrapper.logfile=$WRAPPERLOG \
|
||||
wrapper.java.additional.10=-Dwrapper.logfile=$WRAPPERLOG \
|
||||
wrapper.java.additional.11=-Di2p.dir.pid=$RUN \
|
||||
wrapper.java.additional.12=-Di2p.dir.temp=$I2PTEMP \
|
||||
wrapper.logfile=$WRAPPERLOG \
|
||||
wrapper.pidfile=$PIDFILE \
|
||||
wrapper.java.pidfile=$JVMPIDFILE \
|
||||
@@ -65,8 +67,8 @@ done
|
||||
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
|
||||
|
||||
if [ -z "$RUN_DAEMON" ]; then
|
||||
echo "/etc/default/$NAME is not set. Aborting."
|
||||
exit 1
|
||||
echo "/etc/default/$NAME is not properly configured. Aborting." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "$RUN_DAEMON" in
|
||||
@@ -76,50 +78,52 @@ case "$RUN_DAEMON" in
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
# is the wrapper from the service-wrapper package even installed?
|
||||
# if not, bail NOW
|
||||
|
||||
# We need the wrapper. If it's not found, abort.
|
||||
[ -x $DAEMON ] || exit 0
|
||||
|
||||
# Ditto for i2prouter. Even though this script doesn't call it,
|
||||
# if it's not found the package probably hasn't been installed.
|
||||
|
||||
[ -r /usr/bin/i2prouter ] || exit 0
|
||||
# Even though this script doesn't call it, check for i2prouter. If it's not
|
||||
# found, it probably means that the package isn't installed anymore.
|
||||
[ -x /usr/bin/i2prouter ] || exit 0
|
||||
|
||||
do_start()
|
||||
{
|
||||
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null\
|
||||
|| return 1
|
||||
[ -d $RUN ] || mkdir $RUN
|
||||
[ -r $PIDFILE ] || touch $PIDFILE
|
||||
[ -r $JVMPIDFILE ] || touch $JVMPIDFILE
|
||||
[ -d $I2PTEMP ] || mkdir $I2PTEMP
|
||||
chown -Rf $I2PUSER:$I2PUSER $I2PTEMP/*i2p* $I2PTEMP/router.ping $RUN > /dev/null 2>&1
|
||||
chown -f -R $I2PUSER:adm /var/log/$NAME
|
||||
TZ=UTC start-stop-daemon --start --quiet -c $I2PUSER --pidfile $PIDFILE --exec $DAEMON $NICE -- \
|
||||
$I2P_ARGS || return 2
|
||||
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null 2>&1 \
|
||||
|| return 1
|
||||
[ -d $RUN ] || mkdir $RUN > /dev/null 2>&1
|
||||
[ -d $I2PTEMP ] || mkdir $I2PTEMP > /dev/null 2>&1
|
||||
if [ -r $PIDFILE ]; then
|
||||
PID="$(cat ${PIDFILE})"
|
||||
if ! kill -0 $PID > /dev/null 2>&1; then
|
||||
rm "$PIDFILE" "$JVMPIDFILE"
|
||||
else
|
||||
# we shouldn't get here, but...
|
||||
echo "ERROR: Another instance of $DESC is already running." >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
chown -Rf $I2PUSER:$I2PUSER $I2PTEMP $RUN > /dev/null 2>&1
|
||||
chown -f -R $I2PUSER:i2psvc /var/log/$NAME > /dev/null 2>&1
|
||||
TZ=UTC start-stop-daemon --start --quiet -c $I2PUSER --pidfile $PIDFILE --exec $DAEMON -n $NICE -- \
|
||||
$I2P_ARGS || return 2
|
||||
}
|
||||
|
||||
do_stop()
|
||||
{
|
||||
start-stop-daemon --stop --quiet --retry=TERM/15/KILL/5 --pidfile $PIDFILE -u $I2PUSER
|
||||
RETVAL="$?"
|
||||
[ "$RETVAL" = 2 ] && return 2
|
||||
start-stop-daemon --stop --quiet --retry=TERM/60/KILL/20 --pidfile $PIDFILE -u $I2PUSER
|
||||
RETVAL="$?"
|
||||
[ "$RETVAL" = 2 ] && return 2
|
||||
|
||||
# start-stop-daemon --stop --quiet --oknodo --retry=TERM/15/KILL/5 -u $I2PUSER
|
||||
start-stop-daemon --stop --quiet --oknodo --retry=0/60/KILL/20 --exec $DAEMON
|
||||
|
||||
start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
|
||||
|
||||
rm -f "$PIDFILE" "$JVMPIDFILE"
|
||||
[ -d $RUN ] && rmdir $RUN
|
||||
rm -rf "$I2PTEMP" > /dev/null 2>&1
|
||||
[ -d "$RUN" ] && rmdir "$RUN" 2>&1
|
||||
}
|
||||
|
||||
do_dump()
|
||||
{
|
||||
start-stop-daemon --stop --quiet -s 3 --pidfile $PIDFILE -u $I2PUSER
|
||||
RETVAL="$?"
|
||||
[ "$RETVAL" = 2 ] && return 2
|
||||
start-stop-daemon --stop --quiet -s 3 --pidfile $PIDFILE -u $I2PUSER
|
||||
RETVAL="$?"
|
||||
[ "$RETVAL" = 2 ] && return 2
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
@@ -140,7 +144,7 @@ case "$1" in
|
||||
esac
|
||||
;;
|
||||
stop)
|
||||
log_daemon_msg "Stopping $DESC" "$NAME"
|
||||
log_daemon_msg "Stopping $DESC" "$NAME"
|
||||
do_stop
|
||||
case "$?" in
|
||||
0|1) log_end_msg 0 ;;
|
||||
@@ -149,7 +153,7 @@ case "$1" in
|
||||
;;
|
||||
status)
|
||||
status_of_proc -p $PIDFILE "$DAEMON" "$NAME" && exit 0 || exit $?
|
||||
;;
|
||||
;;
|
||||
restart|force-reload)
|
||||
log_daemon_msg "Restarting $DESC" "$NAME"
|
||||
do_stop
|
||||
@@ -169,10 +173,10 @@ case "$1" in
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
N=/etc/init.d/$NAME
|
||||
echo "Usage: $N {start|stop|dump|status|restart|force-reload}" >&2
|
||||
exit 3
|
||||
;;
|
||||
N=/etc/init.d/$NAME
|
||||
echo "Usage: $N {start|stop|dump|status|restart|force-reload}" >&2
|
||||
exit 3
|
||||
;;
|
||||
|
||||
|
||||
esac
|
||||
|
20
debian/i2p.postinst
vendored
20
debian/i2p.postinst
vendored
@@ -61,19 +61,17 @@ case "$1" in
|
||||
< /etc/i2p/wrapper.config > /etc/i2p/wrapper.config.tmp
|
||||
mv -f /etc/i2p/wrapper.config.tmp /etc/i2p/wrapper.config
|
||||
|
||||
migrate_existing_user(){
|
||||
# Adjust the user/group in /etc/passwd, mainly for upgrades from old packages that didn't
|
||||
# create $I2PSYSUSER as a system group/user
|
||||
usermod -c "I2P Router Daemon" -m -d $I2PHOME -g $I2PSYSUSER -s "/bin/false" \
|
||||
-l $I2PSYSUSER -e 1 > /dev/null 2>&1
|
||||
echo "Existing user migrated, home directory moved to $I2PHOME"
|
||||
}
|
||||
|
||||
# Create user and group as a system user.
|
||||
adduser --system --quiet --group --home $I2PHOME $I2PSYSUSER || migrate_existing_user
|
||||
if getent passwd i2psvc > /dev/null 2>&1 ; then
|
||||
groupadd -f $I2PSYSUSER || true
|
||||
usermod -c "I2P Router Daemon" -d $I2PHOME -g $I2PSYSUSER -s "/bin/false" \
|
||||
$I2PSYSUSER -e 1 > /dev/null 2>&1 || true
|
||||
else
|
||||
adduser --system --quiet --group --home $I2PHOME $I2PSYSUSER
|
||||
fi
|
||||
|
||||
[ -d /var/log/i2p ] || mkdir -m0750 /var/log/i2p
|
||||
chown -f -R $I2PSYSUSER:adm /var/log/i2p
|
||||
chown -f -R $I2PSYSUSER:i2psvc /var/log/i2p
|
||||
|
||||
# Has someone set the permissions with dpkg-statoverride? If so, obey them.
|
||||
if ! dpkg-statoverride --list $I2PHOME > /dev/null 2>&1
|
||||
@@ -93,7 +91,7 @@ abort-upgrade|abort-remove|abort-deconfigure)
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
|
3
debian/i2p.templates
vendored
3
debian/i2p.templates
vendored
@@ -22,7 +22,8 @@ _Description: I2P daemon user:
|
||||
account name here. For example, if your previous I2P installation is at
|
||||
/home/user/i2p, you may enter 'user' here.
|
||||
.
|
||||
Very important: The account specified here *MUST* already exist.
|
||||
Very important: If a user other than the default of 'i2psvc' is entered
|
||||
here, the chosen username *MUST* already exist.
|
||||
|
||||
Template: i2p/memory
|
||||
Type: string
|
||||
|
2
debian/patches/0002-jbigi-soname.patch
vendored
2
debian/patches/0002-jbigi-soname.patch
vendored
@@ -13,7 +13,7 @@ a soname to shut lintian up.
|
||||
--- a/core/c/jbigi/mbuild_jbigi.sh
|
||||
+++ b/core/c/jbigi/mbuild_jbigi.sh
|
||||
@@ -47,7 +47,7 @@
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
COMPILEFLAGS="-fPIC -Wall"
|
||||
- INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
|
||||
|
13
debian/patches/debian-version.patch
vendored
13
debian/patches/debian-version.patch
vendored
@@ -1,13 +0,0 @@
|
||||
Add debian package vesion to the EXTRA version field
|
||||
|
||||
--- a/router/java/src/net/i2p/router/RouterVersion.java
|
||||
+++ b/router/java/src/net/i2p/router/RouterVersion.java
|
||||
@@ -21,7 +21,7 @@
|
||||
public final static long BUILD = 0;
|
||||
|
||||
/** for example "-test" */
|
||||
- public final static String EXTRA = "";
|
||||
+ public final static String EXTRA = "deb1";
|
||||
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
|
||||
public static void main(String args[]) {
|
||||
System.out.println("I2P Router version: " + FULL_VERSION);
|
10
debian/po/de.po
vendored
10
debian/po/de.po
vendored
@@ -6,8 +6,8 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: i2p 0.8.9-1\n"
|
||||
"Report-Msgid-Bugs-To: i2p@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2011-12-10 04:00+0000\n"
|
||||
"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
|
||||
"POT-Creation-Date: 2011-12-27 22:25+0000\n"
|
||||
"PO-Revision-Date: 2011-07-20 04:30+0100\n"
|
||||
"Last-Translator: mixxy <m1xxy@mail.i2p>\n"
|
||||
"Language-Team: de\n"
|
||||
@@ -55,7 +55,11 @@ msgstr ""
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid "Very important: The account specified here *MUST* already exist."
|
||||
#, fuzzy
|
||||
#| msgid "Very important: The account specified here *MUST* already exist."
|
||||
msgid ""
|
||||
"Very important: If a user other than the default of 'i2psvc' is entered "
|
||||
"here, the chosen username *MUST* already exist."
|
||||
msgstr "WICHTIG; Der hier angegebene Benutzer *MUSS* bereits existieren!"
|
||||
|
||||
#. Type: string
|
||||
|
34
debian/po/es.po
vendored
34
debian/po/es.po
vendored
@@ -1,20 +1,24 @@
|
||||
# Spanish debconf translation
|
||||
# Copyright (C) 2011 The I2P Project
|
||||
# This file is distributed under the same license as the i2p package.
|
||||
# mixxy <m1xxy@mail.i2p>, 2011
|
||||
#
|
||||
|
||||
# Translators:
|
||||
# mixxy <m1xxy@mail.i2p>, 2011.
|
||||
# <punkibastardo@gmail.com>, 2011.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: i2p 0.8.9-1\n"
|
||||
"Report-Msgid-Bugs-To: i2p@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2011-12-10 04:00+0000\n"
|
||||
"PO-Revision-Date: 2011-07-20 04:33+0100\n"
|
||||
"Last-Translator: mixxy <m1xxy@mail.i2p>\n"
|
||||
"Language-Team: es\n"
|
||||
"Project-Id-Version: I2P\n"
|
||||
"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
|
||||
"POT-Creation-Date: 2011-12-27 22:25+0000\n"
|
||||
"PO-Revision-Date: 2011-12-21 21:22+0000\n"
|
||||
"Last-Translator: punkibastardo <punkibastardo@gmail.com>\n"
|
||||
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/I2P/"
|
||||
"team/es/)\n"
|
||||
"Language: es\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
@@ -56,20 +60,24 @@ msgstr ""
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid "Very important: The account specified here *MUST* already exist."
|
||||
msgstr "Muy importante: El usuario especificado aquí *YA TIENE QUE* existir."
|
||||
msgid ""
|
||||
"Very important: If a user other than the default of 'i2psvc' is entered "
|
||||
"here, the chosen username *MUST* already exist."
|
||||
msgstr ""
|
||||
"Muy importante: Si se introduce un nombre de usuario en este campo distinto "
|
||||
"a 'i2psvc', el nombre elegido *DEBE* existir de antemano."
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:4001
|
||||
msgid "Memory that can be allocated to I2P:"
|
||||
msgstr ""
|
||||
msgstr "La memoria que puede ser asignada a I2P:"
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:4001
|
||||
msgid "By default, I2P will only be allowed to use up to 128MB of RAM."
|
||||
msgstr ""
|
||||
msgstr "Por defecto, a I2P sólo se le permitirá utilizar 128MB de RAM"
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
@@ -78,3 +86,5 @@ msgid ""
|
||||
"High bandwidth routers, as well as routers with a lot of active torrents / "
|
||||
"plugins, may need to have this value increased."
|
||||
msgstr ""
|
||||
"Los routers con un alto ancho de banda, así como los routers con muchos "
|
||||
"torrents activos / plugins, podrían necesitar un aumento este valor."
|
||||
|
10
debian/po/pl.po
vendored
10
debian/po/pl.po
vendored
@@ -7,8 +7,8 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: I2P\n"
|
||||
"Report-Msgid-Bugs-To: i2p@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2011-12-10 04:00+0000\n"
|
||||
"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
|
||||
"POT-Creation-Date: 2011-12-27 22:25+0000\n"
|
||||
"PO-Revision-Date: 2011-10-08 12:41+0000\n"
|
||||
"Last-Translator: PolishAnon <b790979@klzlk.com>\n"
|
||||
"Language-Team: Polish (http://www.transifex.net/projects/p/I2P/team/pl/)\n"
|
||||
@@ -58,7 +58,11 @@ msgstr ""
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid "Very important: The account specified here *MUST* already exist."
|
||||
#, fuzzy
|
||||
#| msgid "Very important: The account specified here *MUST* already exist."
|
||||
msgid ""
|
||||
"Very important: If a user other than the default of 'i2psvc' is entered "
|
||||
"here, the chosen username *MUST* already exist."
|
||||
msgstr "Bardzo ważne: Podane tutaj konto *MUSI* istnieć."
|
||||
|
||||
#. Type: string
|
||||
|
10
debian/po/ru.po
vendored
10
debian/po/ru.po
vendored
@@ -6,8 +6,8 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: i2p 0.8.9-1\n"
|
||||
"Report-Msgid-Bugs-To: i2p@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2011-12-10 04:00+0000\n"
|
||||
"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
|
||||
"POT-Creation-Date: 2011-12-27 22:25+0000\n"
|
||||
"PO-Revision-Date: 2011-06-21 20:59+0500\n"
|
||||
"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n"
|
||||
"Language-Team: ru\n"
|
||||
@@ -55,7 +55,11 @@ msgstr ""
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid "Very important: The account specified here *MUST* already exist."
|
||||
#, fuzzy
|
||||
#| msgid "Very important: The account specified here *MUST* already exist."
|
||||
msgid ""
|
||||
"Very important: If a user other than the default of 'i2psvc' is entered "
|
||||
"here, the chosen username *MUST* already exist."
|
||||
msgstr ""
|
||||
"Очень важно: аккаунт, указанный здесь, обязательно должен существовать."
|
||||
|
||||
|
39
debian/po/sv.po
vendored
39
debian/po/sv.po
vendored
@@ -1,21 +1,22 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
#
|
||||
# Swedish debconf translation
|
||||
# Copyright (C) 2011 The I2P Project
|
||||
# This file is distributed under the same license as the i2p package.
|
||||
#
|
||||
# Translators:
|
||||
# Martin Svensson <digitalmannen@gmail.com>, 2011.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: I2P\n"
|
||||
"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
|
||||
"POT-Creation-Date: 2011-12-10 04:00+0000\n"
|
||||
"PO-Revision-Date: 2011-12-13 14:12+0000\n"
|
||||
"POT-Creation-Date: 2011-12-27 22:25+0000\n"
|
||||
"PO-Revision-Date: 2011-12-26 09:48+0000\n"
|
||||
"Last-Translator: Martin Svensson <digitalmannen@gmail.com>\n"
|
||||
"Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/I2P/team/sv_SE/)\n"
|
||||
"Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/I2P/"
|
||||
"team/sv_SE/)\n"
|
||||
"Language: sv_SE\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: sv_SE\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
|
||||
|
||||
#. Type: boolean
|
||||
@@ -44,21 +45,25 @@ msgstr "Konto för I2P tjänsten:"
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid ""
|
||||
"By default I2P is configured to run under the account i2psvc when running as"
|
||||
" a daemon. To use an **existing** I2P profile you may enter a different "
|
||||
"account name here. For example, if your previous I2P installation is at "
|
||||
"/home/user/i2p, you may enter 'user' here."
|
||||
"By default I2P is configured to run under the account i2psvc when running as "
|
||||
"a daemon. To use an **existing** I2P profile you may enter a different "
|
||||
"account name here. For example, if your previous I2P installation is at /"
|
||||
"home/user/i2p, you may enter 'user' here."
|
||||
msgstr ""
|
||||
"Som standard är I2P inställt för att köras under kontot i2psvc mär den körs "
|
||||
"som tjänst. För att använda ett **existerande** I2P profil, ange ett annat "
|
||||
"konto här. Exempelvis, om din tidigare I2P installation är /home/user/i2p så"
|
||||
" ange 'user' här."
|
||||
"konto här. Exempelvis, om din tidigare I2P installation är /home/user/i2p så "
|
||||
"ange 'user' här."
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid "Very important: The account specified here *MUST* already exist."
|
||||
msgstr "*OBS!* Kontot som anges *måste* existera."
|
||||
msgid ""
|
||||
"Very important: If a user other than the default of 'i2psvc' is entered "
|
||||
"here, the chosen username *MUST* already exist."
|
||||
msgstr ""
|
||||
"OBS! Viktigt: Om en annan användare än standard 'i2psvc' skrivs in här. "
|
||||
"\"MÅSTE\" det användarnamnet redan existera."
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
@@ -81,5 +86,3 @@ msgid ""
|
||||
msgstr ""
|
||||
"För routrar med hög bandbredd eller routrar med hög aktivitet kan detta "
|
||||
"behöva ökas"
|
||||
|
||||
|
||||
|
8
debian/po/templates.pot
vendored
8
debian/po/templates.pot
vendored
@@ -7,8 +7,8 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: i2p@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2011-12-10 04:00+0000\n"
|
||||
"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
|
||||
"POT-Creation-Date: 2011-12-27 22:25+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@@ -50,7 +50,9 @@ msgstr ""
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid "Very important: The account specified here *MUST* already exist."
|
||||
msgid ""
|
||||
"Very important: If a user other than the default of 'i2psvc' is entered "
|
||||
"here, the chosen username *MUST* already exist."
|
||||
msgstr ""
|
||||
|
||||
#. Type: string
|
||||
|
44
debian/po/uk.po
vendored
44
debian/po/uk.po
vendored
@@ -1,22 +1,24 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
#
|
||||
# Ukrainian debconf translation
|
||||
# Copyright (C) 2011 The I2P Project
|
||||
# This file is distributed under the same license as the i2p package.
|
||||
#
|
||||
# Translators:
|
||||
# Denis <gribua@gmail.com>, 2011.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: I2P\n"
|
||||
"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
|
||||
"POT-Creation-Date: 2011-12-10 04:00+0000\n"
|
||||
"POT-Creation-Date: 2011-12-27 22:25+0000\n"
|
||||
"PO-Revision-Date: 2011-12-16 22:13+0000\n"
|
||||
"Last-Translator: Denis <gribua@gmail.com>\n"
|
||||
"Language-Team: Ukrainian (Ukraine) (http://www.transifex.net/projects/p/I2P/team/uk_UA/)\n"
|
||||
"Language-Team: Ukrainian (Ukraine) (http://www.transifex.net/projects/p/I2P/"
|
||||
"team/uk_UA/)\n"
|
||||
"Language: uk_UA\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: uk_UA\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
|
||||
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
@@ -31,8 +33,8 @@ msgid ""
|
||||
"The I2P router can be run as a daemon that starts automatically when your "
|
||||
"computer boots up. This is the recommended configuration."
|
||||
msgstr ""
|
||||
"I2P роутер може працювати в якості демона, який запускається автоматично під"
|
||||
" час запуску комп'ютера. Це рекомендована настройка."
|
||||
"I2P роутер може працювати в якості демона, який запускається автоматично під "
|
||||
"час запуску комп'ютера. Це рекомендована настройка."
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
@@ -44,20 +46,24 @@ msgstr "Псевдокористувач для I2P-демона:"
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid ""
|
||||
"By default I2P is configured to run under the account i2psvc when running as"
|
||||
" a daemon. To use an **existing** I2P profile you may enter a different "
|
||||
"account name here. For example, if your previous I2P installation is at "
|
||||
"/home/user/i2p, you may enter 'user' here."
|
||||
"By default I2P is configured to run under the account i2psvc when running as "
|
||||
"a daemon. To use an **existing** I2P profile you may enter a different "
|
||||
"account name here. For example, if your previous I2P installation is at /"
|
||||
"home/user/i2p, you may enter 'user' here."
|
||||
msgstr ""
|
||||
"При роботі в якості демона, I2P за замовчуванням використовує аккаунт i2psvc"
|
||||
" для роботи. Для використовування **існуючого** профіля I2P ви можете ввести"
|
||||
" тут ім'я іншого користувача. Для прикладу, якщо ваша попередня інсталяція "
|
||||
"При роботі в якості демона, I2P за замовчуванням використовує аккаунт i2psvc "
|
||||
"для роботи. Для використовування **існуючого** профіля I2P ви можете ввести "
|
||||
"тут ім'я іншого користувача. Для прикладу, якщо ваша попередня інсталяція "
|
||||
"I2p знаходиться в /home/user/i2p, ви можете ввести тут 'user'."
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid "Very important: The account specified here *MUST* already exist."
|
||||
#, fuzzy
|
||||
#| msgid "Very important: The account specified here *MUST* already exist."
|
||||
msgid ""
|
||||
"Very important: If a user other than the default of 'i2psvc' is entered "
|
||||
"here, the chosen username *MUST* already exist."
|
||||
msgstr "Дуже важливо: Аккаунт, вказаний тут * ПОВИНЕН * вже існувати."
|
||||
|
||||
#. Type: string
|
||||
@@ -83,5 +89,3 @@ msgstr ""
|
||||
"Роутери з високою швидкістю передачі інформації, так само як роутери з "
|
||||
"великою кількістю активних торрентів / плагінів, можуть потребувати "
|
||||
"збільшення цього значення."
|
||||
|
||||
|
||||
|
14
debian/rules
vendored
14
debian/rules
vendored
@@ -26,7 +26,12 @@ build:
|
||||
|
||||
JAVA_HOME=/usr/lib/jvm/default-java
|
||||
I2P=$(CURDIR)/pkg-temp
|
||||
ROUTERVERSION=$(CURDIR)/router/java/src/net/i2p/router/RouterVersion.java
|
||||
|
||||
# I2P's version will be displayed in the router console as "$I2PVERSION-$EXTRAPREFIX$DEBIANVERSION", eg. 0.8.12-0-deb1
|
||||
export EXTRAPREFIX := deb
|
||||
export JAVA_HOME I2P
|
||||
export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/Version/{print $$2}' |sed 's/.*-\([[:digit:]]\{1,\}\).*$$/\1/')
|
||||
#export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
|
||||
|
||||
%:
|
||||
@@ -35,6 +40,7 @@ export JAVA_HOME I2P
|
||||
clean: createcopyright
|
||||
|
||||
override_dh_auto_clean:
|
||||
-[ -r $(CURDIR)/debian/routerversion.java.bak ] && mv -f $(CURDIR)/debian/routerversion.java.bak $(ROUTERVERSION)
|
||||
dh_auto_clean
|
||||
ant distclean
|
||||
rm -f core/c/jbigi/*.[s]o
|
||||
@@ -47,8 +53,11 @@ override_dh_auto_build:
|
||||
binary-indep: build-indep
|
||||
build-indep:
|
||||
dh_prep
|
||||
#mkdir -p $(CURDIR)/installer/lib/wrapper/all
|
||||
#ln -sf /usr/share/java/wrapper.jar $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
|
||||
cp -f $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak
|
||||
sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
|
||||
mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
|
||||
# The next line is used by KYTV when building from source packages
|
||||
#[ -r jetty/jetty-5.1.15.tgz ] && ln -sf $(CURDIR)/jetty/jetty-5.1.15.tgz $(CURDIR)/apps/jetty/jetty-5.1.15.tgz
|
||||
ant preppkg-unix javadoc
|
||||
echo router.updateDisabled=true > $(I2P)/router.config
|
||||
mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
|
||||
@@ -74,7 +83,6 @@ createcopyright:
|
||||
@/bin/echo -e "at http://www.i2p2.de/newdevelopers#getting-the-i2p-code\n\n\n" >> $(CURDIR)/debian/copyright
|
||||
@/bin/cat $(CURDIR)/LICENSE.txt >> $(CURDIR)/debian/copyright
|
||||
|
||||
|
||||
override_dh_compress:
|
||||
dh_compress -X.xsl -X.xml
|
||||
|
||||
|
Reference in New Issue
Block a user