merge of '4fff03e3acecbfb131a884b6c151967978058c49'

and '7ec0520d4bb67df2b9c378aab53bffbf8dcb222b'

debian/control

@@ -1,5 +1,5 @@
 Source: i2p
-Maintainer: i2p
+Maintainer: Hungry Hobo <HungryHobo@i2pmail.org>
 Section: net
 Priority: optional
 Homepage: http://www.i2p2.de/

debian/scripts/init

@@ -5,7 +5,7 @@
 # Required-Start:	$remote_fs $syslog
 # Required-Stop:	$remote_fs $syslog
 # Default-Start:	
-# Default-Stop:		1 2 3 4 5
+# Default-Stop:		0 1 2 3 4 5 6
 # Short-Description:	I2P anonymizing mixnet
 ### END INIT INFO
 
@@ -39,7 +39,7 @@ case "$1" in
 	    log_end_msg 1
 	fi
 	;;
-  restart)
+  restart|force-reload)
 	log_daemon_msg "Restarting I2P" "i2p"
 	if I2P restart; then
 	    log_end_msg 0

debian/scripts/postrm

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# /etc/rc*.d/*i2p files	
+update-rc.d -f i2p remove
+
 I2PUSER=i2psvc
 # delete $I2PUSER if it exists (it will not if this is a purge after a remove)
 id $I2PUSER 2>/dev/null

debian/scripts/prerm

@@ -2,10 +2,8 @@
 /etc/init.d/i2p stop
 
 # stuff in /tmp
-rm -f /tmp/wrapper.log /tmp/wrapper.log.1 /tmp/wrapper.log.2 /tmp/i2p.pid /tmp/routerjvm.pid /tmp/router.ping
-
-# /etc/rc*.d/*i2p files	
-update-rc.d -f i2p remove
+TMPDIR=/tmp
+rm -f ${TMPDIR}/wrapper.log ${TMPDIR}/wrapper.log.1 ${TMPDIR}/wrapper.log.2 ${TMPDIR}/i2p.pid ${TMPDIR}/routerjvm.pid ${TMPDIR}/router.ping
 
 # dpkg doesn't know about these files, they were copied out of jbigi.jar by the router
 LIB=/usr/lib/i2p

installer/resources/runplain.sh

@@ -1,4 +1,5 @@
-#
+#!/bin/sh
+
 # This runs the router by itself, WITHOUT the wrapper.
 # This means the router will not restart if it crashes.
 # Also, you will be using the default memory size, which is