This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch wheezy-backports in repository tomcat8.
commit 1abb932916f2155d32f85263ef1bc9b74a7af2ea Author: Emmanuel Bourg <[email protected]> Date: Wed Jun 25 12:05:03 2014 +0200 Depend on openjdk-7 instead of openjdk-6 --- debian/changelog | 1 + debian/control | 4 ++-- debian/rules | 2 +- debian/tomcat8.init | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index d5a91c6..69cba8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ tomcat8 (8.0.14-1~bpo70+1) wheezy-backports; urgency=low * Rebuild for wheezy-backports + - Depend on openjdk-7 instead of openjdk-6 which is the default in Wheezy -- Emmanuel Bourg <[email protected]> Wed, 10 Dec 2014 15:41:03 +0100 diff --git a/debian/control b/debian/control index 12d2e93..f3a4f5c 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Uploaders: James Page <[email protected]>, Emmanuel Bourg <[email protected]> Build-Depends: ant-optional, debhelper (>= 9), - default-jdk, + openjdk-7-jdk, po-debconf Build-Depends-Indep: javahelper, junit4 (>= 4.11), @@ -29,7 +29,7 @@ Homepage: http://tomcat.apache.org Package: tomcat8-common Architecture: all -Depends: default-jre-headless | java7-runtime-headless | java7-runtime, +Depends: openjdk-7-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/rules b/debian/rules index 800783a..3d31294 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -JAVA_HOME := /usr/lib/jvm/default-java +JAVA_HOME=/usr/lib/jvm/java-7-openjdk-$(shell dpkg-architecture -qDEB_BUILD_ARCH) JAVA_CMD := $(JAVA_HOME)/bin/java BLDLIB := output/build/lib DEB_JARS_BASE := /usr/share/java diff --git a/debian/tomcat8.init b/debian/tomcat8.init index 774c08a..26204d6 100644 --- a/debian/tomcat8.init +++ b/debian/tomcat8.init @@ -77,7 +77,7 @@ find_jdks() # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not # defined in $DEFAULT) -JDK_DIRS="/usr/lib/jvm/default-java" +JDK_DIRS="" find_jdks # Look for the right JVM to use -- 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
