propagate from branch 'i2p.i2p' (head 899a1923586f3d7d622bd02e03c87717566617c4)

to branch 'i2p.i2p.zzz.jetty6' (head cb3e33be282b6002f6790609f4a3eef7f42069d3)

debian/rules

@@ -43,10 +43,9 @@ override_dh_auto_clean:
 	-[ -r $(CURDIR)/debian/routerversion.java.bak ] && mv -f $(CURDIR)/debian/routerversion.java.bak $(ROUTERVERSION)
 	dh_auto_clean
 	ant distclean
-	# 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/
+	#rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
 	debconf-updatepo
 
 override_dh_auto_build:
@@ -62,7 +61,6 @@ build-indep:
 	ant preppkg-unix javadoc
 	echo router.updateDisabled=true > $(I2P)/router.config
 	mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
-	#-cp -fv /usr/share/tor/geoip $(CURDIR)/pkg-temp/geoip/geoip.txt
 	
 
 binary-arch: build-arch