This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jenkins-winstone.
commit 703f2dc04f4a3a8562611b5dd9e3740b83959954 Author: Emmanuel Bourg <[email protected]> Date: Sat Apr 5 22:55:49 2014 +0200 Build depend on default-jdk instead of openjdk-7-jdk --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/rules | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8e61e9d..c93c226 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +jenkins-winstone (0.9.10-jenkins-47+dfsg-2) UNRELEASED; urgency=medium + + * Team upload. + * Build depend on default-jdk instead of openjdk-7-jdk + + -- Emmanuel Bourg <[email protected]> Sat, 05 Apr 2014 22:55:02 +0200 + jenkins-winstone (0.9.10-jenkins-47+dfsg-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 6a922c6..b4b3a6d 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: James Page <[email protected]> Build-Depends: cdbs, debhelper (>= 7), - openjdk-7-jdk, + default-jdk, javahelper, maven-debian-helper (>= 1.4) Build-Depends-Indep: diff --git a/debian/rules b/debian/rules index f6ab5e8..db8ea57 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/maven.mk -DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) -JAVA_HOME := /usr/lib/jvm/java-7-openjdk-$(DEB_BUILD_ARCH) +JAVA_HOME := /usr/lib/jvm/default-java + DEB_MAVEN_INSTALL_TO_USJ := false PACKAGE := jenkins-winstone JAR := winstone -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-winstone.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
