This is an automated email from the git hooks/post-receive script. jzobel-guest pushed a commit to branch master in repository netbeans.
commit 5eac13ced2229a37597f072cc68d471239002141 Author: Joachim Zobel <[email protected]> Date: Tue Dec 3 21:06:50 2013 +0100 force openjdk-6-jdk as build jdk --- debian/changelog | 8 +++++++- debian/control | 2 +- debian/rules | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5fda60f..03a6c05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -netbeans (7.0.1+dfsg1-6) stable; urgency=medium +netbeans (7.0.1+dfsg1-7) unstable; urgency=medium + + * Forced openjdk-6-jdk as build jdk to enable building on unstable. + + -- Joachim Zobel <[email protected]> Tue, 03 Dec 2013 20:52:44 +0100 + +netbeans (7.0.1+dfsg1-6) UNRELEASED; urgency=medium * Workaround for bug #720684 in openjdk-6-jdk. - Changes the jdk dependency to openjdk-7-jdk. diff --git a/debian/control b/debian/control index 8223848..ab52eca 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Yulia Novozhilova <[email protected]>, Andres Mejia <[email protected]>, Andrew Ross <[email protected]> Build-Depends: debhelper (>= 7.0.50~), javahelper, ant (>= 1.7.0), - ant-optional (>= 1.7.0), default-jdk, mingw32, maven-repo-helper, + ant-optional (>= 1.7.0), openjdk-6-jdk, mingw32, maven-repo-helper, w3c-dtd-xhtml, javacc, libjemmy2-java, javahelp2, libbindex-java, libswing-layout-java (>= 1.0.3), libjna-java (>= 3.2.7-2~), diff --git a/debian/rules b/debian/rules index 75b436a..e51d86e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export JAVA_HOME=/usr/lib/jvm/default-java +export JAVA_HOME=/usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) #package names pkg-platform := platform13 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
