diff --git a/debian/README.Debian b/debian/README.Debian index 77b9f8fdd6..d6f90203aa 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -11,3 +11,6 @@ There are a few changes in this package from upstream. to /var/logs/i2p with the timestamps in UTC - The config file for the wrapper can be found at /etc/i2p/wrapper.config + + +To use I2P with the wrapper (recommended), the package i2p must be installed. diff --git a/debian/i2p.init b/debian/i2p.init index 64c8af82f0..89ac25d13e 100755 --- a/debian/i2p.init +++ b/debian/i2p.init @@ -36,7 +36,7 @@ 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.7=-Dwrapper.logfile=$WRAPPERLOG \ wrapper.logfile=$WRAPPERLOG \ wrapper.pidfile=$PIDFILE \ wrapper.anchorfile=$ANCHORFILE \ diff --git a/debian/i2p.templates b/debian/i2p.templates index faab389190..7adf437b6b 100644 --- a/debian/i2p.templates +++ b/debian/i2p.templates @@ -1,10 +1,10 @@ -Template: i2p/stop_running_router -Type: boolean -Default: false -_Description: Automatically stop I2P when there are upgrades? - To update this package the I2P router will need to be restarted. - Any activity on the I2P network will be briefly interrupted - during the upgrade. +##Template: i2p/stop_running_router +##Type: boolean +##Default: false +##_Description: Automatically stop I2P when there are upgrades? +## To update this package the I2P router will need to be restarted. +## Any activity on the I2P network will be briefly interrupted +## during the upgrade. Template: i2p/daemon Type: boolean @@ -18,9 +18,8 @@ Type: string Default: i2psvc _Description: I2P daemon user: 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 + 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. + /home/user/i2p, you may enter 'user' here. . - A script to ease the transition from the manual installation to this deb - package is in development. + Very important: The account specified here *MUST* already exist. diff --git a/debian/patches/0001-Update-paths.patch b/debian/patches/0001-path-substitution.patch similarity index 52% rename from debian/patches/0001-Update-paths.patch rename to debian/patches/0001-path-substitution.patch index 8191b3d78a..9e99e338dc 100644 --- a/debian/patches/0001-Update-paths.patch +++ b/debian/patches/0001-path-substitution.patch @@ -1,7 +1,12 @@ From: Kill Your TV Date: Mon, 18 Apr 2011 16:43:40 +0000 -Subject: Update-paths +Subject: path substitution +The purpose of this patch is the change the values handled by +the Izpack based installer. + +Non-applicable sections (e.g., portable & windows) are also removed for the +Debian wrapper.config to try to prevent confusion. --- installer/resources/eepget | 2 +- installer/resources/i2prouter | 8 ++++---- @@ -55,19 +60,48 @@ Subject: Update-paths # next value to true may help. --- a/installer/resources/wrapper.config +++ b/installer/resources/wrapper.config -@@ -45,20 +45,19 @@ +@@ -7,22 +7,16 @@ + # click "Shutdown", wait 11 minutes, then start i2p. + # + # WARNING - The wrapper is NOT run (and this file is not used) +-# if you start I2P with the 'no window' icon on Windows, or +-# with the runplain.sh script on Linux. Use the 'restartable' +-# icon on Windows or the i2prouter script on Linux to run the wrapper. ++# if you start I2P with the i2prouter-nowrapper script in Linux. ++# Use i2prouter or the initscript run the wrapper. + # + # NOTE - Directory organization: + # The standard I2P Installation will set up a "split" directory structure + # with code in the install directory, data and configuration files in the + # user's home directory, and temporary files in the system temporary directory. +-# To set up a single-directory "portable" installation suitable for +-# a USB stick, make several changes specified below (search for PORTABLE). + # +-# NOTE - The izpack installer performs variable subsitiution on this +-# file upon installation. If you did not use izpack, you must +-# find and replace all instances of (dollar)INSTALL_PATH and +-# (dollar)SYSTEM_java_io_tmpdir with appropriate values +-# (perhaps . and /var/tmp, respectively) ++# Unless changed by an admin, the daemon user "i2psvc" has its home directory ++# at /var/lib/i2p. + # + #******************************************************************** + # Java Application +@@ -45,20 +39,21 @@ # classes, or all the classes of i2p.jar, are in a different directory). # Be sure there are no other duplicate classes. # -wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar +wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar ++wrapper.java.classpath.2=/usr/share/java/wrapper.jar # uncomment this to use the system classpath as well (e.g. to get tools.jar) -# wrapper.java.classpath.2=%CLASSPATH% -- -+wrapper.java.classpath.2=/usr/share/java/wrapper.jar - # Java Library Path (location of Wrapper.DLL or libwrapper.so) ++# wrapper.java.classpath.3=%CLASSPATH% + +-# Java Library Path (location of Wrapper.DLL or libwrapper.so) -wrapper.java.library.path.1=$INSTALL_PATH -wrapper.java.library.path.2=$INSTALL_PATH/lib ++# Java Library Path (location of libjbigi/libjcpuid) +wrapper.java.library.path.1=/usr/lib/jni +wrapper.java.library.path.2=/usr/share/java/lib @@ -81,30 +115,64 @@ Subject: Update-paths wrapper.java.additional.4.stripquotes=TRUE # On some IPv6 enabled systems, I2P and other network-enabled java applications -@@ -125,7 +124,7 @@ +@@ -126,11 +121,7 @@ # tell the router where to find the wrapper log # (change X to the next available number) # wrapper.java.additional.X=-Dwrapper.logfile=/path/to/wrapper.log -wrapper.logfile=$SYSTEM_java_io_tmpdir/wrapper.log +-# PORTABLE installation: +-# Use the following instead. I2P will find the logfile here, +-# no need for a wrapper.java.additional line too. +-#wrapper.logfile=$INSTALL_PATH/wrapper.log +wrapper.logfile=/tmp/wrapper.log - # PORTABLE installation: - # Use the following instead. I2P will find the logfile here, - # no need for a wrapper.java.additional line too. -@@ -191,7 +190,7 @@ + + # Format of output for the log file. + # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread, +@@ -192,10 +183,7 @@ # you should copy this file, change the location or file name, # and edit the i2prouter script to change the WRAPPER_CONF setting # to point to the new wrapper.config location. -wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid +-# PORTABLE installation: +-# Use the following instead. +-#wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid +wrapper.java.pidfile=/tmp/routerjvm.pid - # PORTABLE installation: - # Use the following instead. - #wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid -@@ -205,7 +204,7 @@ + # pid file for the service monitoring the JVM + # + # From i2prouter: +@@ -206,34 +194,4 @@ # # This means i2prouter looks for './i2p.pid'. # See comments above for wrapper.java.pidfile -wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid +-# PORTABLE installation: +-# Use the following instead. +-#wrapper.pidfile=$INSTALL_PATH/i2p.pid +- +-#******************************************************************** +-# Wrapper NT Service Properties +-#******************************************************************** +-# WARNING - Do not modify any of these properties when an application +-# using this configuration file has been installed as a service. +-# Please uninstall the service before modifying this section. The +-# service can then be reinstalled. +- +-# Name of the service +-wrapper.ntservice.name=i2p +- +-# Display name of the service +-wrapper.ntservice.displayname=I2P Service +- +-# Description of the service +-wrapper.ntservice.description=The I2P router service +- +-# Service dependencies. Add dependencies as needed starting from 1 +-wrapper.ntservice.dependency.1= +- +-# Mode in which the service is installed. AUTO_START or DEMAND_START +-wrapper.ntservice.starttype=AUTO_START +- +-# Allow the service to interact with the desktop. +-wrapper.ntservice.interactive=true +- +wrapper.pidfile=/tmp/i2p.pid - # PORTABLE installation: - # Use the following instead. - #wrapper.pidfile=$INSTALL_PATH/i2p.pid diff --git a/debian/patches/0004-Update-path-of-jbigi-and-add-soname.patch b/debian/patches/0002-jbigi-soname.patch similarity index 87% rename from debian/patches/0004-Update-path-of-jbigi-and-add-soname.patch rename to debian/patches/0002-jbigi-soname.patch index bb6075968d..5d40aa5f0c 100644 --- a/debian/patches/0004-Update-path-of-jbigi-and-add-soname.patch +++ b/debian/patches/0002-jbigi-soname.patch @@ -1,6 +1,10 @@ From: Kill Your TV Date: Wed, 11 May 2011 00:12:04 +0000 -Subject: Update path of jbigi and add soname +Subject: jbigi soname + +The purpose of this patch is to change the path that mbuild_jbigi.sh +expects to find the source files at. At the same time I'm specifying +a soname to shut lintian up. --- core/c/jbigi/mbuild_jbigi.sh | 6 +++--- diff --git a/debian/patches/0007-rename-jcpuid.patch b/debian/patches/0003-renaming-jcpuid.patch similarity index 96% rename from debian/patches/0007-rename-jcpuid.patch rename to debian/patches/0003-renaming-jcpuid.patch index e781168da1..5ddb2f4cc1 100644 --- a/debian/patches/0007-rename-jcpuid.patch +++ b/debian/patches/0003-renaming-jcpuid.patch @@ -1,5 +1,5 @@ From: Kill Your TV -Date: Wed, 25 May 2011 00:26:10 +0300 +Date: Tue, 24 May 2011 21:26:10 +0000 Subject: rename jcpuid --- diff --git a/debian/patches/0004-configure-updates.patch b/debian/patches/0004-configure-updates.patch new file mode 100644 index 0000000000..7762e65973 --- /dev/null +++ b/debian/patches/0004-configure-updates.patch @@ -0,0 +1,54 @@ +From: Kill Your TV +Date: Sun, 29 May 2011 18:52:08 +0000 +Subject: configure updates + +My rationale here is to alter the wording of a few things that aren't applicable +in the .deb packaging. For instance, updates must take place via the package manager, +so I alter the text at the bottom of /configupdate to reflect that. + +--- + apps/routerconsole/jsp/configupdate.jsp | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +--- a/apps/routerconsole/jsp/configupdate.jsp ++++ b/apps/routerconsole/jsp/configupdate.jsp +@@ -8,7 +8,7 @@ + + + <%@include file="summary.jsi" %> +-

<%=intl._("I2P Update Configuration")%>

++

<%=intl._("I2P News Update Configuration")%>

+
+ <%@include file="confignav.jsi" %> + +@@ -26,10 +26,10 @@ + " > + <% /* set hidden default */ %> + +-

<%=intl._("Check for I2P and news updates")%>

++

<%=intl._("Check for news updates")%>

+
+ +- ++ + + +@@ -41,7 +41,7 @@ + + + <% } // if canInstall %> +- ++ + + + +@@ -57,7 +57,7 @@ + + + <% } else { %> +- ++ + <% } // if canInstall %> +
<%=intl._("News & I2P Updates")%>:
<%=intl._("News Updates")%>: <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <%=intl._("Update In Progress")%>
<% } else { %> " /> + <% } %>

<%=formhandler._("Update policy")%>:
<%=intl._("Update through the eepProxy?")%>
<%=intl._("Fetch news through the eepProxy?")%>
<%=intl._("eepProxy host")%>:" />
<%=intl._("Unsigned Build URL")%>:">
<%=intl._("I2P updates are disabled because you do not have write permission for the install directory.")%>
<%=intl._("I2P updates will be dispatched via your package manager.")%>
+
diff --git a/debian/patches/debian-version.patch b/debian/patches/debian-version.patch new file mode 100644 index 0000000000..5aa0a862af --- /dev/null +++ b/debian/patches/debian-version.patch @@ -0,0 +1,13 @@ +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); diff --git a/debian/patches/series b/debian/patches/series index c3fc0635ab..60dd232ce4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,5 @@ -0001-Update-paths.patch -0004-Update-path-of-jbigi-and-add-soname.patch -0007-rename-jcpuid.patch +0001-path-substitution.patch +0002-jbigi-soname.patch +0003-renaming-jcpuid.patch +0004-configure-updates.patch +debian-version.patch diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 4b181288ed..d9f6b8e189 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -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-05-15 19:17+0300\n" +"Report-Msgid-Bugs-To: debian@mail.i2p\n" +"POT-Creation-Date: 2011-06-16 17:09+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,20 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean -#. Description -#: ../i2p.templates:1001 -msgid "Automatically stop I2P when there are upgrades?" -msgstr "" - -#. Type: boolean -#. Description -#: ../i2p.templates:1001 -msgid "" -"To update this package the I2P router will need to be restarted. Any " -"activity on the I2P network will be briefly interrupted during the upgrade." -msgstr "" - #. Type: boolean #. Description #: ../i2p.templates:2001 @@ -56,15 +42,13 @@ msgstr "" #: ../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." +"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 "" #. Type: string #. Description #: ../i2p.templates:3001 -msgid "" -"A script to ease the transition from the manual installation to this deb " -"package is in development." +msgid "Very important: The account specified here *MUST* already exist." msgstr "" diff --git a/debian/rules b/debian/rules index d690bd998f..5e67b037e2 100755 --- a/debian/rules +++ b/debian/rules @@ -37,8 +37,7 @@ clean: createcopyright override_dh_auto_clean: dh_auto_clean ant distclean - # The next line is used by KYTV - # when building from source packages + # The next line is used by KYTV when building from source packages #rm -f apps/jetty/jetty-5.1.15.tgz rm -f core/c/jbigi/*.[s]o rm -rf core/c/jcpuid/lib/