This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit c8c655a15ead40d4ab3bdb0ee116fcc4879c283b Author: Markus Koschany <[email protected]> Date: Sun Jan 3 18:08:07 2016 +0100 Enable html.validation module --- debian/patches/netbeans-cluster-properties.patch | 52 +++++++++++----------- debian/patches/netbeans-core.browser.webview.patch | 2 +- debian/patches/netbeans-slf4j.dummy.patch | 4 +- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch index f83b442..66b75c1 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 | 102 +-------------------------------------------- - 1 file changed, 2 insertions(+), 100 deletions(-) + nbbuild/cluster.properties | 101 +-------------------------------------------- + 1 file changed, 2 insertions(+), 99 deletions(-) diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 4d3337a..8dce700 100644 +index 4d3337a..550c4e6 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -107,10 +107,8 @@ clusters.config.java.list=\ @@ -44,7 +44,7 @@ index 4d3337a..8dce700 100644 extexecution.process,\ git,\ gototest,\ -@@ -372,15 +365,11 @@ nb.cluster.ide=\ +@@ -372,15 +365,12 @@ nb.cluster.ide=\ gsf.testrunner,\ gsf.testrunner.ui,\ html,\ @@ -55,12 +55,12 @@ index 4d3337a..8dce700 100644 - html.knockout,\ html.lexer,\ html.parser,\ -- html.validation,\ + html.validation,\ - httpserver,\ hudson,\ hudson.git,\ hudson.mercurial,\ -@@ -390,15 +379,6 @@ nb.cluster.ide=\ +@@ -390,15 +380,6 @@ nb.cluster.ide=\ ide.kit,\ image,\ javascript2.debug,\ @@ -76,7 +76,7 @@ index 4d3337a..8dce700 100644 jellytools.ide,\ jumpto,\ languages,\ -@@ -419,17 +399,13 @@ nb.cluster.ide=\ +@@ -419,17 +400,13 @@ nb.cluster.ide=\ libs.json_simple,\ libs.jvyamlb,\ libs.lucene,\ @@ -94,7 +94,7 @@ index 4d3337a..8dce700 100644 notifications,\ o.apache.commons.codec,\ o.apache.commons.httpclient,\ -@@ -438,28 +414,8 @@ nb.cluster.ide=\ +@@ -438,28 +415,8 @@ nb.cluster.ide=\ o.apache.commons.logging,\ o.apache.ws.commons.util,\ o.apache.xml.resolver,\ @@ -123,7 +123,7 @@ index 4d3337a..8dce700 100644 o.n.swing.dirchooser,\ o.openidex.util,\ options.editor,\ -@@ -495,7 +451,6 @@ nb.cluster.ide=\ +@@ -495,7 +452,6 @@ nb.cluster.ide=\ spellchecker.apimodule,\ spellchecker.bindings.htmlxml,\ spellchecker.bindings.properties,\ @@ -131,7 +131,7 @@ index 4d3337a..8dce700 100644 spellchecker.kit,\ spi.debugger.ui,\ spi.editor.hints,\ -@@ -554,7 +509,6 @@ nb.cluster.java.depends=\ +@@ -554,7 +510,6 @@ nb.cluster.java.depends=\ nb.cluster.ide,\ nb.cluster.extide,\ nb.cluster.platform,\ @@ -139,7 +139,7 @@ index 4d3337a..8dce700 100644 nb.cluster.harness nb.cluster.java=\ ant.browsetask,\ -@@ -564,7 +518,6 @@ nb.cluster.java=\ +@@ -564,7 +519,6 @@ nb.cluster.java=\ ant.kit,\ api.debugger.jpda,\ api.java,\ @@ -147,7 +147,7 @@ index 4d3337a..8dce700 100644 beans,\ classfile,\ dbschema,\ -@@ -583,21 +536,15 @@ nb.cluster.java=\ +@@ -583,21 +537,15 @@ nb.cluster.java=\ form.kit,\ form.nb,\ form.refactoring,\ @@ -169,7 +169,7 @@ index 4d3337a..8dce700 100644 j2ee.persistenceapi,\ java.api.common,\ java.completion,\ -@@ -650,26 +597,6 @@ nb.cluster.java=\ +@@ -650,26 +598,6 @@ nb.cluster.java=\ libs.cglib,\ libs.javacapi,\ libs.javacimpl,\ @@ -196,7 +196,7 @@ index 4d3337a..8dce700 100644 nashorn.execution,\ o.jdesktop.beansbinding,\ performance,\ -@@ -678,18 +605,12 @@ nb.cluster.java=\ +@@ -678,18 +606,12 @@ nb.cluster.java=\ projectimport.eclipse.j2se,\ refactoring.java,\ selenium2.java,\ @@ -215,7 +215,7 @@ index 4d3337a..8dce700 100644 whitelist,\ xml.jaxb,\ xml.tools.java -@@ -707,16 +628,12 @@ nb.cluster.apisupport.depends=\ +@@ -707,16 +629,12 @@ nb.cluster.apisupport.depends=\ nb.cluster.apisupport=\ apisupport.ant,\ apisupport.crudsample,\ @@ -233,7 +233,7 @@ index 4d3337a..8dce700 100644 nb.cluster.enterprise.dir=enterprise nb.cluster.enterprise.depends=\ -@@ -730,7 +647,6 @@ nb.cluster.enterprise.depends=\ +@@ -730,7 +648,6 @@ nb.cluster.enterprise.depends=\ nb.cluster.harness nb.cluster.enterprise=\ api.web.webmodule,\ @@ -241,7 +241,7 @@ index 4d3337a..8dce700 100644 cloud.amazon,\ cloud.common,\ el.lexer,\ -@@ -778,9 +694,6 @@ nb.cluster.enterprise=\ +@@ -778,9 +695,6 @@ nb.cluster.enterprise=\ libs.elimpl,\ libs.glassfish_logging,\ libs.jstl,\ @@ -251,7 +251,7 @@ index 4d3337a..8dce700 100644 performance.javaee,\ performance.scripting,\ performance.web,\ -@@ -858,7 +771,6 @@ nb.cluster.nb.depends=\ +@@ -858,7 +772,6 @@ nb.cluster.nb.depends=\ nb.cluster.harness nb.cluster.nb=\ autoupdate.pluginimporter,\ @@ -259,7 +259,7 @@ index 4d3337a..8dce700 100644 deadlock.detector,\ ide.branding,\ ide.branding.kit,\ -@@ -888,7 +800,6 @@ nb.cluster.profiler=\ +@@ -888,7 +801,6 @@ nb.cluster.profiler=\ lib.profiler.charts,\ lib.profiler.common,\ lib.profiler.ui,\ @@ -267,7 +267,7 @@ index 4d3337a..8dce700 100644 profiler,\ profiler.api,\ profiler.attach,\ -@@ -972,9 +883,7 @@ nb.cluster.groovy=\ +@@ -972,9 +884,7 @@ nb.cluster.groovy=\ groovy.kit,\ groovy.refactoring,\ groovy.samples,\ @@ -278,7 +278,7 @@ index 4d3337a..8dce700 100644 nb.cluster.mobility.dir=mobility nb.cluster.mobility.depends=\ -@@ -1068,7 +977,6 @@ nb.cluster.cnd=\ +@@ -1068,7 +978,6 @@ nb.cluster.cnd=\ cnd.toolchain,\ cnd.utils,\ jellytools.cnd,\ @@ -286,7 +286,7 @@ index 4d3337a..8dce700 100644 validation.nb.cluster.cnd=\ cnd.kit -@@ -1121,8 +1029,6 @@ nb.cluster.jira=\ +@@ -1121,8 +1030,6 @@ nb.cluster.jira=\ o.apache.axis,\ o.apache.commons.discovery,\ o.codehaus.jettison,\ @@ -295,7 +295,7 @@ index 4d3337a..8dce700 100644 o.joda.time nb.cluster.team.dir=extra -@@ -1131,7 +1037,6 @@ nb.cluster.team.depends=\ +@@ -1131,7 +1038,6 @@ nb.cluster.team.depends=\ nb.cluster.platform,\ nb.cluster.ide nb.cluster.team=\ @@ -303,7 +303,7 @@ index 4d3337a..8dce700 100644 c.tasktop.c2c.server.cloud.api,\ c.tasktop.c2c.server.common.api,\ c.tasktop.c2c.server.profile.api,\ -@@ -1140,7 +1045,6 @@ nb.cluster.team=\ +@@ -1140,7 +1046,6 @@ nb.cluster.team=\ c.tasktop.c2c.server.wiki.api,\ kenai,\ kenai.kit,\ @@ -311,7 +311,7 @@ index 4d3337a..8dce700 100644 kenai.ui,\ lib.cvsclient,\ o.codehaus.jackson.core,\ -@@ -1194,7 +1098,6 @@ nb.cluster.stableuc=\ +@@ -1194,7 +1099,6 @@ nb.cluster.stableuc=\ libs.oracle.cloud,\ libs.ppawtlayout,\ loadgenerator,\ @@ -319,7 +319,7 @@ index 4d3337a..8dce700 100644 mobility.antext,\ mobility.cldcplatform.catalog,\ mobility.deployment.ftpscp,\ -@@ -1267,7 +1170,6 @@ nb.cluster.betauc=\ +@@ -1267,7 +1171,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 5e298a1..8d1ab9e 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 8dce700..5ed0a92 100644 +index 550c4e6..3af7929 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 150f085..61ab20f 100644 --- a/debian/patches/netbeans-slf4j.dummy.patch +++ b/debian/patches/netbeans-slf4j.dummy.patch @@ -23,10 +23,10 @@ Forwarded: not-needed create mode 100644 slf4j.dummy/nbproject/project.xml diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 5ed0a92..996a2e9 100644 +index 3af7929..4b9bc84 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties -@@ -446,6 +446,7 @@ nb.cluster.ide=\ +@@ -447,6 +447,7 @@ nb.cluster.ide=\ selenium2.server,\ server,\ servletapi,\ -- 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
