diff --git a/debian/changelog b/debian/changelog index c24270429..5b776bdee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ i2p (0.8.6-5) UNRELEASED; urgency=low * Remove /etc/i2p/wrapper.service and add the changed configs to the initscript. * Create debian/copyright at build time. + * Don't ship the standalone jetty-i2psnark. -- Kill Your TV Wed, 25 May 2011 21:11:40 +0000 diff --git a/debian/i2p.examples b/debian/i2p.examples index 042c4dec8..3e4fcd7f8 100644 --- a/debian/i2p.examples +++ b/debian/i2p.examples @@ -1,2 +1 @@ pkg-temp/runplain.sh -apps/i2psnark/launch-i2psnark diff --git a/debian/i2p.links b/debian/i2p.links index d3ac5ed0a..9af5ae0cf 100644 --- a/debian/i2p.links +++ b/debian/i2p.links @@ -3,5 +3,4 @@ var/lib/i2p/i2p-config/clients.config etc/i2p/clients.config var/lib/i2p/i2p-config/hosts.txt etc/i2p/hosts.txt var/lib/i2p/i2p-config/i2psnark.config etc/i2p/i2psnark.config var/lib/i2p/i2p-config/i2ptunnel.config etc/i2p/i2ptunnel.config -var/lib/i2p/i2p-config/jetty-i2psnark.xml etc/i2p/jetty-i2psnark.xml var/lib/i2p/i2p-config/systray.config etc/i2p/systray.config diff --git a/debian/patches/0005-update-launch-i2psnark-paths.patch b/debian/patches/0005-update-launch-i2psnark-paths.patch deleted file mode 100644 index 94ccb4651..000000000 --- a/debian/patches/0005-update-launch-i2psnark-paths.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Kill Your TV -Date: Wed, 18 May 2011 11:32:14 +0000 -Subject: update launch-i2psnark paths - ---- - apps/i2psnark/jetty-i2psnark.xml | 4 ++-- - apps/i2psnark/launch-i2psnark | 3 ++- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/apps/i2psnark/jetty-i2psnark.xml b/apps/i2psnark/jetty-i2psnark.xml -index b5d6d1e..b9b375e 100644 ---- a/apps/i2psnark/jetty-i2psnark.xml -+++ b/apps/i2psnark/jetty-i2psnark.xml -@@ -55,7 +55,7 @@ - i2psnark - - / -- webapps/i2psnark.war -+ /usr/share/i2p/webapps/i2psnark.war - - - -@@ -63,7 +63,7 @@ - - - /themes -- ./docs/themes -+ /usr/share/i2p/docs/themes - - - -diff --git a/apps/i2psnark/launch-i2psnark b/apps/i2psnark/launch-i2psnark -index 023b5a2..03a4ed2 100755 ---- a/apps/i2psnark/launch-i2psnark -+++ b/apps/i2psnark/launch-i2psnark -@@ -4,5 +4,6 @@ - # The file jetty-i2psnark.xml must be present in the current directory. - # i2psnark will be accessed at http://127.0.0.1:8002/ - # --I2P="." -+cd /var/lib/i2p/i2p-config -+I2P="/usr/share/i2p" - java -cp "$I2P/lib/i2psnark.jar:$I2P/lib/i2p.jar:$I2P/lib/mstreaming.jar:$I2P/lib/streaming.jar:$I2P/lib/commons-el.jar:$I2P/lib/commons-logging.jar:$I2P/lib/jasper-compiler.jar:$I2P/lib/jasper-runtime.jar:$I2P/lib/javax.servlet.jar:$I2P/lib/org.mortbay.jetty.jar" org.klomp.snark.web.RunStandalone "$@" --- diff --git a/debian/patches/series b/debian/patches/series index 68d807cca..d12bfc52e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 0001-Update-paths.patch 0002-disable-browser-launch.patch 0004-Update-path-of-jbigi-and-add-soname.patch -0005-update-launch-i2psnark-paths.patch 0007-rename-jcpuid.patch