[netbeans] 01/04: Revert "force openjdk-6-jdk as build jdk"

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository netbeans.

commit ff6aaa241ca32291b291822c383a84ffa9fdc457
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun May 11 16:21:27 2014 +0200

    Revert "force openjdk-6-jdk as build jdk"
    
    This reverts commit 5eac13ced2229a37597f072cc68d471239002141.
---
 debian/changelog | 8 +-------
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03a6c05..5fda60f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,4 @@
-netbeans (7.0.1+dfsg1-7) unstable; urgency=medium
-
-  * Forced openjdk-6-jdk as build jdk to enable building on unstable.
-
- -- Joachim Zobel <jz-2013 at heute.morgen.de>  Tue, 03 Dec 2013 20:52:44 +0100
-
-netbeans (7.0.1+dfsg1-6) UNRELEASED; urgency=medium
+netbeans (7.0.1+dfsg1-6) stable; 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 ab52eca..8223848 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Yulia Novozhilova <Yulia.Novozhilova at sun.com>,
  Andres Mejia <mcitadel at gmail.com>, Andrew Ross <ubuntu at rossfamily.co.uk>
 Build-Depends: debhelper (>= 7.0.50~), javahelper, ant (>= 1.7.0),
- ant-optional (>= 1.7.0), openjdk-6-jdk, mingw32, maven-repo-helper,
+ ant-optional (>= 1.7.0), default-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 e51d86e..75b436a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH)
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 #package names
 pkg-platform			:= platform13

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git