From d12b52f82a048332661e517a0b72526de7fd4619 Mon Sep 17 00:00:00 2001 From: zzz <zzz@mail.i2p> Date: Thu, 19 Nov 2020 12:53:26 +0000 Subject: [PATCH] Debian: Clean up old commented-out rules --- debian-alt/bionic/rules | 23 ----------------------- debian-alt/focal/rules | 23 ----------------------- debian/rules | 23 ----------------------- 3 files changed, 69 deletions(-) diff --git a/debian-alt/bionic/rules b/debian-alt/bionic/rules index 107d5fd6cc..2bfbda5f6c 100755 --- a/debian-alt/bionic/rules +++ b/debian-alt/bionic/rules @@ -131,20 +131,6 @@ endif ln -sf /usr/share/java/taglibs-standard-impl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar ln -sf /usr/share/java/taglibs-standard-jstlel.jar $(CURDIR)/apps/susidns/src/lib/jstlel.jar - @# debian and ubuntu: everywhere - @#/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties - @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail - @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar - @#ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar - - @# debian and ubuntu: everywhere - @#/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties - @#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/lib/standard.jar - - @# debian and ubuntu: everywhere - @#/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties - @#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar - @# debian and ubuntu: everywhere @/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties @mkdir -p $(CURDIR)/core/java/build @@ -163,15 +149,6 @@ endif @# debian: everywhere; ubuntu: trusty+ @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties - @# 2 MB of dependencies vs. 20 KB of copied source - @# Requires 4.4 or higher. - @# Debian: Not in wheezy/jessie - @# Ubuntu: Only in wily and later - @#/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties - @#mkdir -p $(CURDIR)/core/java/build - @#ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar - @#ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar - TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc echo router.updateDisabled=true > $(I2P)/router.config mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper diff --git a/debian-alt/focal/rules b/debian-alt/focal/rules index 0783ecb9ea..f41b83ba0a 100755 --- a/debian-alt/focal/rules +++ b/debian-alt/focal/rules @@ -129,20 +129,6 @@ endif ln -sf /usr/share/java/taglibs-standard-impl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar ln -sf /usr/share/java/taglibs-standard-jstlel.jar $(CURDIR)/apps/susidns/src/lib/jstlel.jar - @# debian and ubuntu: everywhere - @#/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties - @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail - @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar - @#ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar - - @# debian and ubuntu: everywhere - @#/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties - @#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/lib/standard.jar - - @# debian and ubuntu: everywhere - @#/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties - @#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar - @# debian and ubuntu: everywhere @/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties @mkdir -p $(CURDIR)/core/java/build @@ -161,15 +147,6 @@ endif @# debian: everywhere; ubuntu: trusty+ @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties - @# 2 MB of dependencies vs. 20 KB of copied source - @# Requires 4.4 or higher. - @# Debian: Not in wheezy/jessie - @# Ubuntu: Only in wily and later - @#/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties - @#mkdir -p $(CURDIR)/core/java/build - @#ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar - @#ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar - TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc echo router.updateDisabled=true > $(I2P)/router.config mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper diff --git a/debian/rules b/debian/rules index b74f515705..f7148533bc 100755 --- a/debian/rules +++ b/debian/rules @@ -141,20 +141,6 @@ endif ln -sf /usr/share/java/taglibs-standard-impl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar ln -sf /usr/share/java/taglibs-standard-jstlel.jar $(CURDIR)/apps/susidns/src/lib/jstlel.jar - @# debian and ubuntu: everywhere - @#/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties - @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail - @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar - @#ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar - - @# debian and ubuntu: everywhere - @#/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties - @#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/lib/standard.jar - - @# debian and ubuntu: everywhere - @#/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties - @#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar - @# debian and ubuntu: everywhere @/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties @mkdir -p $(CURDIR)/core/java/build @@ -180,15 +166,6 @@ endif @# debian: everywhere; ubuntu: trusty+ @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties - @# 2 MB of dependencies vs. 20 KB of copied source - @# Requires 4.4 or higher. - @# Debian: Not in wheezy/jessie - @# Ubuntu: Only in wily and later - @#/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties - @#mkdir -p $(CURDIR)/core/java/build - @#ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar - @#ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar - TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc echo router.updateDisabled=true > $(I2P)/router.config mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper -- GitLab