This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit c7334802679629d17412f4ca924c2fc2f776b5fc Author: Markus Koschany <[email protected]> Date: Sat Dec 26 21:24:23 2015 +0100 Update netbeans-cluster-properties.patch --- debian/patches/netbeans-cluster-properties.patch | 36 ++++++++++++---------- debian/patches/netbeans-core.browser.webview.patch | 2 +- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch index bc8ea4f..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 | 104 +-------------------------------------------- - 1 file changed, 2 insertions(+), 102 deletions(-) + nbbuild/cluster.properties | 105 +-------------------------------------------- + 1 file changed, 2 insertions(+), 103 deletions(-) diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index c145a5f..6174264 100644 +index c145a5f..47f7ab8 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -107,10 +107,8 @@ clusters.config.java.list=\ @@ -197,7 +197,11 @@ index c145a5f..6174264 100644 nashorn.execution,\ o.jdesktop.beansbinding,\ performance,\ -@@ -682,14 +607,9 @@ nb.cluster.java=\ +@@ -678,18 +603,12 @@ nb.cluster.java=\ + projectimport.eclipse.j2se,\ + refactoring.java,\ + selenium2.java,\ +- selenium2.maven,\ spellchecker.bindings.java,\ spi.debugger.jpda.ui,\ spi.java.hints,\ @@ -212,7 +216,7 @@ index c145a5f..6174264 100644 whitelist,\ xml.jaxb,\ xml.tools.java -@@ -707,15 +627,10 @@ nb.cluster.apisupport.depends=\ +@@ -707,15 +626,10 @@ nb.cluster.apisupport.depends=\ nb.cluster.apisupport=\ apisupport.ant,\ apisupport.crudsample,\ @@ -229,7 +233,7 @@ index c145a5f..6174264 100644 nb.cluster.enterprise.dir=enterprise nb.cluster.enterprise.depends=\ -@@ -729,7 +644,6 @@ nb.cluster.enterprise.depends=\ +@@ -729,7 +643,6 @@ nb.cluster.enterprise.depends=\ nb.cluster.harness nb.cluster.enterprise=\ api.web.webmodule,\ @@ -237,7 +241,7 @@ index c145a5f..6174264 100644 cloud.amazon,\ cloud.common,\ el.lexer,\ -@@ -777,9 +691,6 @@ nb.cluster.enterprise=\ +@@ -777,9 +690,6 @@ nb.cluster.enterprise=\ libs.elimpl,\ libs.glassfish_logging,\ libs.jstl,\ @@ -247,7 +251,7 @@ index c145a5f..6174264 100644 performance.javaee,\ performance.scripting,\ performance.web,\ -@@ -857,7 +768,6 @@ nb.cluster.nb.depends=\ +@@ -857,7 +767,6 @@ nb.cluster.nb.depends=\ nb.cluster.harness nb.cluster.nb=\ autoupdate.pluginimporter,\ @@ -255,7 +259,7 @@ index c145a5f..6174264 100644 deadlock.detector,\ ide.branding,\ ide.branding.kit,\ -@@ -887,7 +797,6 @@ nb.cluster.profiler=\ +@@ -887,7 +796,6 @@ nb.cluster.profiler=\ lib.profiler.charts,\ lib.profiler.common,\ lib.profiler.ui,\ @@ -263,7 +267,7 @@ index c145a5f..6174264 100644 profiler,\ profiler.api,\ profiler.attach,\ -@@ -971,9 +880,7 @@ nb.cluster.groovy=\ +@@ -971,9 +879,7 @@ nb.cluster.groovy=\ groovy.kit,\ groovy.refactoring,\ groovy.samples,\ @@ -274,7 +278,7 @@ index c145a5f..6174264 100644 nb.cluster.mobility.dir=mobility nb.cluster.mobility.depends=\ -@@ -1067,7 +974,6 @@ nb.cluster.cnd=\ +@@ -1067,7 +973,6 @@ nb.cluster.cnd=\ cnd.toolchain,\ cnd.utils,\ jellytools.cnd,\ @@ -282,7 +286,7 @@ index c145a5f..6174264 100644 validation.nb.cluster.cnd=\ cnd.kit -@@ -1120,8 +1026,6 @@ nb.cluster.jira=\ +@@ -1120,8 +1025,6 @@ nb.cluster.jira=\ o.apache.axis,\ o.apache.commons.discovery,\ o.codehaus.jettison,\ @@ -291,7 +295,7 @@ index c145a5f..6174264 100644 o.joda.time nb.cluster.team.dir=extra -@@ -1130,7 +1034,6 @@ nb.cluster.team.depends=\ +@@ -1130,7 +1033,6 @@ nb.cluster.team.depends=\ nb.cluster.platform,\ nb.cluster.ide nb.cluster.team=\ @@ -299,7 +303,7 @@ index c145a5f..6174264 100644 c.tasktop.c2c.server.cloud.api,\ c.tasktop.c2c.server.common.api,\ c.tasktop.c2c.server.profile.api,\ -@@ -1139,7 +1042,6 @@ nb.cluster.team=\ +@@ -1139,7 +1041,6 @@ nb.cluster.team=\ c.tasktop.c2c.server.wiki.api,\ kenai,\ kenai.kit,\ @@ -307,7 +311,7 @@ index c145a5f..6174264 100644 kenai.ui,\ lib.cvsclient,\ o.codehaus.jackson.core,\ -@@ -1193,7 +1095,6 @@ nb.cluster.stableuc=\ +@@ -1193,7 +1094,6 @@ nb.cluster.stableuc=\ libs.oracle.cloud,\ libs.ppawtlayout,\ loadgenerator,\ @@ -315,7 +319,7 @@ index c145a5f..6174264 100644 mobility.antext,\ mobility.cldcplatform.catalog,\ mobility.deployment.ftpscp,\ -@@ -1266,7 +1167,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 d7a4091..b04ead2 100644 --- a/debian/patches/netbeans-core.browser.webview.patch +++ b/debian/patches/netbeans-core.browser.webview.patch @@ -7,7 +7,7 @@ Subject: netbeans-core.browser.webview 1 file changed, 1 deletion(-) diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 6174264..f155cab 100644 +index 47f7ab8..9a44d57 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -300,7 +300,6 @@ 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
