Changeset d2d2b1e for debian


Ignore:
Timestamp:
Jun 16, 2011 5:19:10 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
3bbe3ba
Parents:
d56f9c7
Message:

Prepare debian/ in preparation for 0.8.7

Location:
debian
Files:
2 added
6 edited
3 moved

Legend:

Unmodified
Added
Removed
  • debian/README.Debian

    rd56f9c7 rd2d2b1e  
    1212
    1313- The config file for the wrapper can be found at /etc/i2p/wrapper.config
     14
     15
     16To use I2P with the wrapper (recommended), the package i2p must be installed.
  • debian/i2p.init

    rd56f9c7 rd2d2b1e  
    3737I2P_ARGS="/etc/i2p/wrapper.config \
    3838 wrapper.java.additional.1=-DloggerFilenameOverride=/var/log/i2p/log-router-@.txt \
    39  wrapper.java.additional.5=-Dwrapper.logfile=$WRAPPERLOG \
     39 wrapper.java.additional.7=-Dwrapper.logfile=$WRAPPERLOG \
    4040 wrapper.logfile=$WRAPPERLOG \
    4141 wrapper.pidfile=$PIDFILE \
  • debian/i2p.templates

    rd56f9c7 rd2d2b1e  
    1 Template: i2p/stop_running_router
    2 Type: boolean
    3 Default: false
    4 _Description: Automatically stop I2P when there are upgrades?
    5  To update this package the I2P router will need to be restarted.
    6  Any activity on the I2P network will be briefly interrupted
    7  during the upgrade.
     1##Template: i2p/stop_running_router
     2##Type: boolean
     3##Default: false
     4##_Description: Automatically stop I2P when there are upgrades?
     5## To update this package the I2P router will need to be restarted.
     6## Any activity on the I2P network will be briefly interrupted
     7## during the upgrade.
    88
    99Template: i2p/daemon
     
    1919_Description: I2P daemon user:
    2020 By default I2P is configured to run under the account i2psvc when running
    21  as a daemon. To use an existing I2P profile you may enter a different
     21 as a daemon. To use an **existing** I2P profile you may enter a different
    2222 account name here. For example, if your previous I2P installation is at
    23  /home/user/i2p, you may enter 'user' here.
     23 /home/user/i2p, you may enter 'user' here. 
    2424 .
    25  A script to ease the transition from the manual installation to this deb
    26  package is in development.
     25 Very important: The account specified here *MUST* already exist.
  • debian/patches/0001-path-substitution.patch

    rd56f9c7 rd2d2b1e  
    11From: Kill Your TV <killyourtv@i2pmail.org>
    22Date: Mon, 18 Apr 2011 16:43:40 +0000
    3 Subject: Update-paths
     3Subject: path substitution
    44
     5The purpose of this patch is the change the values handled by
     6the Izpack based installer.
     7
     8Non-applicable sections (e.g., portable & windows) are also removed for the
     9Debian wrapper.config to try to prevent confusion.
    510---
    611 installer/resources/eepget         |    2 +-
     
    5661--- a/installer/resources/wrapper.config
    5762+++ b/installer/resources/wrapper.config
    58 @@ -45,20 +45,19 @@
     63@@ -7,22 +7,16 @@
     64 # click "Shutdown", wait 11 minutes, then start i2p.
     65 #
     66 # WARNING - The wrapper is NOT run (and this file is not used)
     67-# if you start I2P with the 'no window' icon on Windows, or
     68-# with the runplain.sh script on Linux. Use the 'restartable'
     69-# icon on Windows or the i2prouter script on Linux to run the wrapper.
     70+# if you start I2P with the i2prouter-nowrapper script in Linux.
     71+# Use i2prouter or the initscript run the wrapper.
     72 #
     73 # NOTE - Directory organization:
     74 # The standard I2P Installation will set up a "split" directory structure
     75 # with code in the install directory, data and configuration files in the
     76 # user's home directory, and temporary files in the system temporary directory.
     77-# To set up a single-directory "portable" installation suitable for
     78-# a USB stick, make several changes specified below (search for PORTABLE).
     79 #
     80-# NOTE - The izpack installer performs variable subsitiution on this
     81-# file upon installation. If you did not use izpack, you must
     82-# find and replace all instances of (dollar)INSTALL_PATH and
     83-# (dollar)SYSTEM_java_io_tmpdir with appropriate values
     84-# (perhaps . and /var/tmp, respectively)
     85+# Unless changed by an admin, the daemon user "i2psvc" has its home directory
     86+# at /var/lib/i2p.
     87 #
     88 #********************************************************************
     89 # Java Application
     90@@ -45,20 +39,21 @@
    5991 # classes, or all the classes of i2p.jar, are in a different directory).
    6092 # Be sure there are no other duplicate classes.
     
    6294-wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
    6395+wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar
     96+wrapper.java.classpath.2=/usr/share/java/wrapper.jar
    6497 #  uncomment this to use the system classpath as well (e.g. to get tools.jar)
    6598-# wrapper.java.classpath.2=%CLASSPATH%
    66 -
    67 +wrapper.java.classpath.2=/usr/share/java/wrapper.jar
    68  # Java Library Path (location of Wrapper.DLL or libwrapper.so)
     99+# wrapper.java.classpath.3=%CLASSPATH%
     100 
     101-# Java Library Path (location of Wrapper.DLL or libwrapper.so)
    69102-wrapper.java.library.path.1=$INSTALL_PATH
    70103-wrapper.java.library.path.2=$INSTALL_PATH/lib
     104+# Java Library Path (location of libjbigi/libjcpuid)
    71105+wrapper.java.library.path.1=/usr/lib/jni
    72106+wrapper.java.library.path.2=/usr/share/java/lib
     
    82116 
    83117 # On some IPv6 enabled systems, I2P and other network-enabled java applications
    84 @@ -125,7 +124,7 @@
     118@@ -126,11 +121,7 @@
    85119 # tell the router where to find the wrapper log
    86120 # (change X to the next available number)
    87121 # wrapper.java.additional.X=-Dwrapper.logfile=/path/to/wrapper.log
    88122-wrapper.logfile=$SYSTEM_java_io_tmpdir/wrapper.log
     123-# PORTABLE installation:
     124-# Use the following instead. I2P will find the logfile here,
     125-# no need for a wrapper.java.additional line too.
     126-#wrapper.logfile=$INSTALL_PATH/wrapper.log
    89127+wrapper.logfile=/tmp/wrapper.log
    90  # PORTABLE installation:
    91  # Use the following instead. I2P will find the logfile here,
    92  # no need for a wrapper.java.additional line too.
    93 @@ -191,7 +190,7 @@
     128 
     129 # Format of output for the log file.
     130 # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
     131@@ -192,10 +183,7 @@
    94132 # you should copy this file, change the location or file name,
    95133 # and edit the i2prouter script to change the WRAPPER_CONF setting
    96134 # to point to the new wrapper.config location.
    97135-wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid
     136-# PORTABLE installation:
     137-# Use the following instead.
     138-#wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
    98139+wrapper.java.pidfile=/tmp/routerjvm.pid
    99  # PORTABLE installation:
    100  # Use the following instead.
    101  #wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
    102 @@ -205,7 +204,7 @@
     140 # pid file for the service monitoring the JVM
     141 #
     142 # From i2prouter:
     143@@ -206,34 +194,4 @@
    103144 #
    104145 # This means i2prouter looks for './i2p.pid'.
    105146 # See comments above for wrapper.java.pidfile
    106147-wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid
     148-# PORTABLE installation:
     149-# Use the following instead.
     150-#wrapper.pidfile=$INSTALL_PATH/i2p.pid
     151-
     152-#********************************************************************
     153-# Wrapper NT Service Properties
     154-#********************************************************************
     155-# WARNING - Do not modify any of these properties when an application
     156-#  using this configuration file has been installed as a service.
     157-#  Please uninstall the service before modifying this section.  The
     158-#  service can then be reinstalled.
     159-
     160-# Name of the service
     161-wrapper.ntservice.name=i2p
     162-
     163-# Display name of the service
     164-wrapper.ntservice.displayname=I2P Service
     165-
     166-# Description of the service
     167-wrapper.ntservice.description=The I2P router service
     168-
     169-# Service dependencies.  Add dependencies as needed starting from 1
     170-wrapper.ntservice.dependency.1=
     171-
     172-# Mode in which the service is installed.  AUTO_START or DEMAND_START
     173-wrapper.ntservice.starttype=AUTO_START
     174-
     175-# Allow the service to interact with the desktop.
     176-wrapper.ntservice.interactive=true
     177-
    107178+wrapper.pidfile=/tmp/i2p.pid
    108  # PORTABLE installation:
    109  # Use the following instead.
    110  #wrapper.pidfile=$INSTALL_PATH/i2p.pid
  • debian/patches/0002-jbigi-soname.patch

    rd56f9c7 rd2d2b1e  
    11From: Kill Your TV <killyourtv@i2pmail.org>
    22Date: Wed, 11 May 2011 00:12:04 +0000
    3 Subject: Update path of jbigi and add soname
     3Subject: jbigi soname
     4
     5The purpose of this patch is to change the path that mbuild_jbigi.sh
     6expects to find the source files at. At the same time I'm specifying
     7a soname to shut lintian up.
    48
    59---
  • debian/patches/0003-renaming-jcpuid.patch

    rd56f9c7 rd2d2b1e  
    11From: Kill Your TV <killyourtv@i2pmail.org>
    2 Date: Wed, 25 May 2011 00:26:10 +0300
     2Date: Tue, 24 May 2011 21:26:10 +0000
    33Subject: rename jcpuid
    44
  • debian/patches/series

    rd56f9c7 rd2d2b1e  
    1 0001-Update-paths.patch
    2 0004-Update-path-of-jbigi-and-add-soname.patch
    3 0007-rename-jcpuid.patch
     10001-path-substitution.patch
     20002-jbigi-soname.patch
     30003-renaming-jcpuid.patch
     40004-configure-updates.patch
     5debian-version.patch
  • debian/po/templates.pot

    rd56f9c7 rd2d2b1e  
    88msgstr ""
    99"Project-Id-Version: PACKAGE VERSION\n"
    10 "Report-Msgid-Bugs-To: i2p@packages.debian.org\n"
    11 "POT-Creation-Date: 2011-05-15 19:17+0300\n"
     10"Report-Msgid-Bugs-To: debian@mail.i2p\n"
     11"POT-Creation-Date: 2011-06-16 17:09+0000\n"
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
     
    1717"Content-Type: text/plain; charset=CHARSET\n"
    1818"Content-Transfer-Encoding: 8bit\n"
    19 
    20 #. Type: boolean
    21 #. Description
    22 #: ../i2p.templates:1001
    23 msgid "Automatically stop I2P when there are upgrades?"
    24 msgstr ""
    25 
    26 #. Type: boolean
    27 #. Description
    28 #: ../i2p.templates:1001
    29 msgid ""
    30 "To update this package the I2P router will need to be restarted.  Any "
    31 "activity on the I2P network will be briefly interrupted during the upgrade."
    32 msgstr ""
    3319
    3420#. Type: boolean
     
    5743msgid ""
    5844"By default I2P is configured to run under the account i2psvc when running as "
    59 "a daemon. To use an existing I2P profile you may enter a different account "
    60 "name here. For example, if your previous I2P installation is at /home/user/"
    61 "i2p, you may enter 'user' here."
     45"a daemon. To use an **existing** I2P profile you may enter a different "
     46"account name here. For example, if your previous I2P installation is at /"
     47"home/user/i2p, you may enter 'user' here."
    6248msgstr ""
    6349
     
    6551#. Description
    6652#: ../i2p.templates:3001
    67 msgid ""
    68 "A script to ease the transition from the manual installation to this deb "
    69 "package is in development."
     53msgid "Very important: The account specified here *MUST* already exist."
    7054msgstr ""
  • debian/rules

    rd56f9c7 rd2d2b1e  
    3838        dh_auto_clean
    3939        ant distclean
    40         # The next line is used by KYTV
    41         # when building from source packages
     40        # The next line is used by KYTV when building from source packages
    4241        #rm -f apps/jetty/jetty-5.1.15.tgz
    4342        rm -f core/c/jbigi/*.[s]o
Note: See TracChangeset for help on using the changeset viewer.