diff --git a/debian/control b/debian/control index 978745492f2ca76c72da7da2ab69f6fb5abe7fd7..e56a71ac9577f9247ca3ace2f17a80f52519c6e1 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7.0.50~) ,ant (>= 1.8) ,ant-optional ,debconf - ,default-jdk | openjdk-7-jdk + ,openjdk-7-jdk ,dh-apparmor ,gettext ,libgmp-dev (>= 2:5.0.5) diff --git a/debian/rules b/debian/rules index 760bd5709e3881d6eee7a14deca5d8f88921e330..80cd2b5769316dfe5580ab762cc24bb72dc7a5ce 100755 --- a/debian/rules +++ b/debian/rules @@ -48,6 +48,7 @@ override_dh_auto_clean: rm -rf $(CURDIR)/core/c/jcpuid/lib/ rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar rm -rf $(CURDIR)/debian/python-i2p + rm -f $(CURDIR)/override.properties debconf-updatepo override_dh_auto_build: @@ -71,6 +72,11 @@ ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" else @echo "Already found deb in version, not doing anything" endif + # build options + @/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties + @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties + @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties + @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties 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