I fixed netbeans-6.0.1 to be able to build it with openjdk-6-jdk
Here is the patch attached.
I have removed all non needed non free dependencies but you maybe they should 
still be included in case someone still wants to use a non-free jdk.


Ahora también puedes acceder a tu correo Terra desde el móvil.
Infórmate pinchando aquí.

--- netbeans-ide-6.0.1+dfsg/debian/control	2008-07-25 14:40:24.000000000 +0000
+++ netbeans-ide-6.0.1+dfsg/debian/control	2008-07-23 20:41:03.000000000 +0000
@@ -2,7 +2,7 @@
 Section: contrib/devel
 Priority: optional
 Maintainer: Daniel Baumann <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), dpatch, ant, ant-optional, sun-java5-jdk
+Build-Depends: debhelper (>= 5), dpatch, ant, ant-optional, openjdk-6-jdk
 Standards-Version: 3.7.3
 Homepage: http://www.netbeans.org/
 
@@ -21,7 +21,7 @@
 
 Package: netbeans-platform
 Architecture: all
-Depends: sun-java5-jdk | sun-java5-jre | sun-java6-jdk | sun-java6-jre
+Depends: openjdk-6-jdk
 Description: IDE for Java Development and More, version 6 (platform foundation)
  NetBeans is a cross-platform IDE written in Java. It supports development in
  Java, and support for other languages can be added. The whole IDE is built
--- netbeans-ide-6.0.1+dfsg/debian/rules	2008-07-25 14:40:24.000000000 +0000
+++ netbeans-ide-6.0.1+dfsg/debian/rules	2008-07-23 20:42:31.000000000 +0000
@@ -17,7 +17,7 @@
 	dh_testdir
 
 	# Building package
-	ANT_OPTS="-Xmx500M" JAVA_HOME="/usr/lib/jvm/java-1.5.0-sun" PATH="$$JAVA_HOME/bin:$$PATH" ant -f nbbuild/build.xml
+	ANT_OPTS="-Xmx500M" JAVA_HOME="/usr/lib/jvm/java-6-openjdk" PATH="$$JAVA_HOME/bin:$$PATH" ant -f nbbuild/build.xml
 
 	touch build-stamp
 
@@ -27,7 +27,7 @@
 	rm -f build-stamp
 
 	# Cleaning package
-	ANT_OPTS="-Xmx500M" JAVA_HOME="/usr/lib/jvm/java-1.5.0-sun" PATH="$$JAVA_HOME/bin:$$PATH" ant -f nbbuild/build.xml real-clean
+	ANT_OPTS="-Xmx500M" JAVA_HOME="/usr/lib/jvm/java-6-openjdk" PATH="$$JAVA_HOME/bin:$$PATH" ant -f nbbuild/build.xml real-clean
 
 	dh_clean
 
--- netbeans-ide-6.0.1+dfsg/enterprise/compapp/jbimanager/src/org/netbeans/modules/sun/manager/jbi/management/AdministrationService.java	2007-09-26 00:09:50.000000000 +0000
+++ netbeans-ide-6.0.1+dfsg/enterprise/compapp/jbimanager/src/org/netbeans/modules/sun/manager/jbi/management/AdministrationService.java	2008-07-25 14:26:13.000000000 +0000
@@ -960,9 +960,9 @@
         TabularDataSupport tabularData =
                 (TabularDataSupport) properties.get(ENVIRONMENT_VARIABLES);
         if (tabularData != null) {
-            for (CompositeDataSupport rowData : (Collection<CompositeDataSupport>)tabularData.values()) {
-                String name = (String) rowData.get(ENVIRONMENT_VARIABLE_NAME);
-                String value = (String) rowData.get(ENVIRONMENT_VARIABLE_VALUE);
+            for (Object rowData : tabularData.values()) {
+                String name = (String) ((CompositeDataSupport)rowData).get(ENVIRONMENT_VARIABLE_NAME);
+                String value = (String) ((CompositeDataSupport)rowData).get(ENVIRONMENT_VARIABLE_VALUE);
                 map.put(name, value);
             }
         }
--- netbeans-ide-6.0.1+dfsg/nbbuild/build.xml	2007-12-13 17:14:20.000000000 +0000
+++ netbeans-ide-6.0.1+dfsg/nbbuild/build.xml	2008-07-23 20:44:07.000000000 +0000
@@ -69,13 +69,6 @@
   <target name="bootstrap"
           description="Bootstrap NetBeans-specific Ant extensions."
           depends="-jdk-init,assure-ant">
-    <fail message="You need JDK 1.5 to build NetBeans">
-        <condition>
-            <not>
-                <isset property="have-jdk-1.5"/>
-            </not>
-        </condition>
-    </fail>
 
     <property file="build.properties"/>
     <echo message="Bootstrapping NetBeans-specific Ant extensions..."/>
--- netbeans-ide-6.0.1+dfsg/nbbuild/templates/projectized.xml	2007-12-13 16:10:36.000000000 +0000
+++ netbeans-ide-6.0.1+dfsg/nbbuild/templates/projectized.xml	2008-07-23 20:46:27.000000000 +0000
@@ -59,16 +59,7 @@
         <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
     </target>
 
-    <target name="jdk-5-check" depends="-jdk-init" if="have-jdk-1.6" unless="permit.jdk6.builds">
-        <property name="user.build.properties" location="${nb_all}/nbbuild/user.build.properties"/>
-        <fail>You are attempting to build NetBeans using JDK 6 (or higher).
-This is forbidden as it may lead to accidental usage of JDK 6+ APIs.
-Either run Ant with JDK 5, or set nbjdk.home=&lt;JDK 5 home&gt; in ${user.build.properties}
-(can be set from IDE by opening a module project's Properties dialog and picking the right Java Platform in Libraries).
-If you are sure you want to build with JDK 6+ anyway, use: -Dpermit.jdk6.builds=true</fail>
-    </target>
-
-    <target name="build-init" depends="basic-init,jdk-5-check">
+    <target name="build-init" depends="basic-init">
         <property name="public.package.jar.dir" location="${nb_all}/nbbuild/build/public-package-jars"/>
         <mkdir dir="${public.package.jar.dir}"/>
         <property name="test.dist.dir" location="${nb_all}/nbbuild/build/testdist"/>

Reply via email to