This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to annotated tag debian/8.5.11-2_bpo8+1 in repository tomcat8.
commit 60d83ae138e380e493c5eefeb7337ba0811c5233 Author: Emmanuel Bourg <[email protected]> Date: Tue Apr 18 16:22:52 2017 +0200 Rebuild for jessie-backports --- debian/ant.properties | 2 +- debian/changelog | 6 ++++++ debian/control | 4 ++-- debian/defaults.template | 4 ++-- debian/tomcat8.init | 5 ++++- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties index 0d97b42..b4b78a7 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -2,7 +2,7 @@ compile.debug=true jdt.jar=/usr/share/java/ecj.jar junit.jar=/usr/share/java/junit4.jar -cglib.jar=/usr/share/java/cglib-nodep.jar +cglib.jar=/usr/share/java/cglib3-nodep.jar easymock.jar=/usr/share/java/easymock.jar hamcrest.jar=/usr/share/java/hamcrest-core.jar objenesis.jar=/usr/share/java/objenesis.jar diff --git a/debian/changelog b/debian/changelog index 2af6b8a..b96b0bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +tomcat8 (8.5.11-2~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Emmanuel Bourg <[email protected]> Tue, 18 Apr 2017 16:18:17 +0200 + tomcat8 (8.5.11-2) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 4d41135..786bccc 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: ant-optional, po-debconf Build-Depends-Indep: javahelper, junit4 (>= 4.11), - libcglib-nodep-java, + libcglib3-java, libeasymock-java (>= 3.0), libecj-java (>= 3.11.0), libhamcrest-java (>= 1.3), @@ -30,7 +30,7 @@ Homepage: http://tomcat.apache.org Package: tomcat8-common Architecture: all -Depends: default-jre-headless | java8-runtime-headless | java8-runtime, +Depends: default-jre-headless | java7-runtime-headless | java7-runtime, libtomcat8-java (>= ${source:Version}), ${misc:Depends} Description: Apache Tomcat 8 - Servlet and JSP engine -- common files diff --git a/debian/defaults.template b/debian/defaults.template index bf8361f..33f8ba2 100644 --- a/debian/defaults.template +++ b/debian/defaults.template @@ -7,9 +7,9 @@ TOMCAT8_USER=tomcat8 TOMCAT8_GROUP=tomcat8 # The home directory of the Java development kit (JDK). You need at least -# JDK version 8. If JAVA_HOME is not set, some common directories for +# JDK version 7. If JAVA_HOME is not set, some common directories for # OpenJDK and the Oracle JDK are tried. -#JAVA_HOME=/usr/lib/jvm/java-8-openjdk +#JAVA_HOME=/usr/lib/jvm/java-7-openjdk # You may pass JVM startup parameters to Java here. If unset, the default # options will be: -Djava.awt.headless=true -XX:+UseConcMarkSweepGC diff --git a/debian/tomcat8.init b/debian/tomcat8.init index 44fa6be..4fe223a 100644 --- a/debian/tomcat8.init +++ b/debian/tomcat8.init @@ -58,7 +58,7 @@ TOMCAT8_GROUP=tomcat8 # this function sets the variable JDK_DIRS find_jdks() { - for java_version in 9 8 + for java_version in 9 8 7 do for jvmdir in /usr/lib/jvm/java-${java_version}-openjdk-* \ /usr/lib/jvm/jdk-${java_version}-oracle-* \ @@ -71,6 +71,9 @@ find_jdks() fi done done + + # Add the paths for the JVMs packaged by the older versions of java-package (<< 0.52 as in Wheezy and Trusty) + JDK_DIRS="${JDK_DIRS} /usr/lib/jvm/j2re1.7-oracle /usr/lib/jvm/j2sdk1.7-oracle" } # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
