This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit f33378ae87f9e92d8895053489052890a701b743 Author: Markus Koschany <[email protected]> Date: Thu Dec 31 06:33:28 2015 +0100 Enable debugger.jpda.js module again. Otherwise this would cause a FTBFS. The silent runtime errors need further investigations and the whole handling of javascript modules should be reviewed. --- debian/patches/netbeans-cluster-properties.patch | 44 ++++++++++------------ debian/patches/netbeans-core.browser.webview.patch | 2 +- debian/patches/netbeans-slf4j.dummy.patch | 2 +- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch index 1b23fff..6b7c69e 100644 --- a/debian/patches/netbeans-cluster-properties.patch +++ b/debian/patches/netbeans-cluster-properties.patch @@ -7,11 +7,11 @@ are not in Debian yet or cause other build failures. Forwarded: not-needed --- - nbbuild/cluster.properties | 106 +-------------------------------------------- - 1 file changed, 2 insertions(+), 104 deletions(-) + nbbuild/cluster.properties | 105 +-------------------------------------------- + 1 file changed, 2 insertions(+), 103 deletions(-) diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index c145a5f..d7593f5 100644 +index c145a5f..47f7ab8 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -107,10 +107,8 @@ clusters.config.java.list=\ @@ -140,7 +140,7 @@ index c145a5f..d7593f5 100644 nb.cluster.harness nb.cluster.java=\ ant.browsetask,\ -@@ -564,13 +516,11 @@ nb.cluster.java=\ +@@ -564,7 +516,6 @@ nb.cluster.java=\ ant.kit,\ api.debugger.jpda,\ api.java,\ @@ -148,13 +148,7 @@ index c145a5f..d7593f5 100644 beans,\ classfile,\ dbschema,\ - debugger.jpda,\ - debugger.jpda.ant,\ -- debugger.jpda.js,\ - debugger.jpda.kit,\ - debugger.jpda.projects,\ - debugger.jpda.projectsui,\ -@@ -583,21 +533,15 @@ nb.cluster.java=\ +@@ -583,21 +534,15 @@ nb.cluster.java=\ form.kit,\ form.nb,\ form.refactoring,\ @@ -176,7 +170,7 @@ index c145a5f..d7593f5 100644 j2ee.persistenceapi,\ java.api.common,\ java.completion,\ -@@ -650,26 +594,6 @@ nb.cluster.java=\ +@@ -650,26 +595,6 @@ nb.cluster.java=\ libs.cglib,\ libs.javacapi,\ libs.javacimpl,\ @@ -203,7 +197,7 @@ index c145a5f..d7593f5 100644 nashorn.execution,\ o.jdesktop.beansbinding,\ performance,\ -@@ -678,18 +602,12 @@ nb.cluster.java=\ +@@ -678,18 +603,12 @@ nb.cluster.java=\ projectimport.eclipse.j2se,\ refactoring.java,\ selenium2.java,\ @@ -222,7 +216,7 @@ index c145a5f..d7593f5 100644 whitelist,\ xml.jaxb,\ xml.tools.java -@@ -707,15 +625,10 @@ nb.cluster.apisupport.depends=\ +@@ -707,15 +626,10 @@ nb.cluster.apisupport.depends=\ nb.cluster.apisupport=\ apisupport.ant,\ apisupport.crudsample,\ @@ -239,7 +233,7 @@ index c145a5f..d7593f5 100644 nb.cluster.enterprise.dir=enterprise nb.cluster.enterprise.depends=\ -@@ -729,7 +642,6 @@ nb.cluster.enterprise.depends=\ +@@ -729,7 +643,6 @@ nb.cluster.enterprise.depends=\ nb.cluster.harness nb.cluster.enterprise=\ api.web.webmodule,\ @@ -247,7 +241,7 @@ index c145a5f..d7593f5 100644 cloud.amazon,\ cloud.common,\ el.lexer,\ -@@ -777,9 +689,6 @@ nb.cluster.enterprise=\ +@@ -777,9 +690,6 @@ nb.cluster.enterprise=\ libs.elimpl,\ libs.glassfish_logging,\ libs.jstl,\ @@ -257,7 +251,7 @@ index c145a5f..d7593f5 100644 performance.javaee,\ performance.scripting,\ performance.web,\ -@@ -857,7 +766,6 @@ nb.cluster.nb.depends=\ +@@ -857,7 +767,6 @@ nb.cluster.nb.depends=\ nb.cluster.harness nb.cluster.nb=\ autoupdate.pluginimporter,\ @@ -265,7 +259,7 @@ index c145a5f..d7593f5 100644 deadlock.detector,\ ide.branding,\ ide.branding.kit,\ -@@ -887,7 +795,6 @@ nb.cluster.profiler=\ +@@ -887,7 +796,6 @@ nb.cluster.profiler=\ lib.profiler.charts,\ lib.profiler.common,\ lib.profiler.ui,\ @@ -273,7 +267,7 @@ index c145a5f..d7593f5 100644 profiler,\ profiler.api,\ profiler.attach,\ -@@ -971,9 +878,7 @@ nb.cluster.groovy=\ +@@ -971,9 +879,7 @@ nb.cluster.groovy=\ groovy.kit,\ groovy.refactoring,\ groovy.samples,\ @@ -284,7 +278,7 @@ index c145a5f..d7593f5 100644 nb.cluster.mobility.dir=mobility nb.cluster.mobility.depends=\ -@@ -1067,7 +972,6 @@ nb.cluster.cnd=\ +@@ -1067,7 +973,6 @@ nb.cluster.cnd=\ cnd.toolchain,\ cnd.utils,\ jellytools.cnd,\ @@ -292,7 +286,7 @@ index c145a5f..d7593f5 100644 validation.nb.cluster.cnd=\ cnd.kit -@@ -1120,8 +1024,6 @@ nb.cluster.jira=\ +@@ -1120,8 +1025,6 @@ nb.cluster.jira=\ o.apache.axis,\ o.apache.commons.discovery,\ o.codehaus.jettison,\ @@ -301,7 +295,7 @@ index c145a5f..d7593f5 100644 o.joda.time nb.cluster.team.dir=extra -@@ -1130,7 +1032,6 @@ nb.cluster.team.depends=\ +@@ -1130,7 +1033,6 @@ nb.cluster.team.depends=\ nb.cluster.platform,\ nb.cluster.ide nb.cluster.team=\ @@ -309,7 +303,7 @@ index c145a5f..d7593f5 100644 c.tasktop.c2c.server.cloud.api,\ c.tasktop.c2c.server.common.api,\ c.tasktop.c2c.server.profile.api,\ -@@ -1139,7 +1040,6 @@ nb.cluster.team=\ +@@ -1139,7 +1041,6 @@ nb.cluster.team=\ c.tasktop.c2c.server.wiki.api,\ kenai,\ kenai.kit,\ @@ -317,7 +311,7 @@ index c145a5f..d7593f5 100644 kenai.ui,\ lib.cvsclient,\ o.codehaus.jackson.core,\ -@@ -1193,7 +1093,6 @@ nb.cluster.stableuc=\ +@@ -1193,7 +1094,6 @@ nb.cluster.stableuc=\ libs.oracle.cloud,\ libs.ppawtlayout,\ loadgenerator,\ @@ -325,7 +319,7 @@ index c145a5f..d7593f5 100644 mobility.antext,\ mobility.cldcplatform.catalog,\ mobility.deployment.ftpscp,\ -@@ -1266,7 +1165,6 @@ nb.cluster.betauc=\ +@@ -1266,7 +1166,6 @@ nb.cluster.betauc=\ contrib/modulemanager,\ contrib/quickfilechooser,\ contrib/selenium,\ diff --git a/debian/patches/netbeans-core.browser.webview.patch b/debian/patches/netbeans-core.browser.webview.patch index a0a48fb..098403c 100644 --- a/debian/patches/netbeans-core.browser.webview.patch +++ b/debian/patches/netbeans-core.browser.webview.patch @@ -11,7 +11,7 @@ Forwarded: not-needed 1 file changed, 1 deletion(-) diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index d7593f5..4aef87a 100644 +index 47f7ab8..9a44d57 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -300,7 +300,6 @@ nb.cluster.ide=\ diff --git a/debian/patches/netbeans-slf4j.dummy.patch b/debian/patches/netbeans-slf4j.dummy.patch index 068dcd7..7d64549 100644 --- a/debian/patches/netbeans-slf4j.dummy.patch +++ b/debian/patches/netbeans-slf4j.dummy.patch @@ -23,7 +23,7 @@ Forwarded: not-needed create mode 100644 slf4j.dummy/nbproject/project.xml diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 4aef87a..b58d5a9 100644 +index 9a44d57..019f825 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -444,6 +444,7 @@ nb.cluster.ide=\ -- 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
