[netbeans] 01/13: Readd html.parser and html.validation modules.
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Jan 3 13:28:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository netbeans.
commit 81a777975e53fb3016e940e13e6d65bfc4670250
Author: Markus Koschany <apo at debian.org>
Date: Fri Jan 1 13:38:53 2016 +0100
Readd html.parser and html.validation modules.
---
debian/patches/netbeans-cluster-properties.patch | 54 +++++++++++-----------
debian/patches/netbeans-core.browser.webview.patch | 2 +-
debian/patches/netbeans-slf4j.dummy.patch | 4 +-
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch
index 73f6db5..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 | 103 +--------------------------------------------
- 1 file changed, 2 insertions(+), 101 deletions(-)
+ nbbuild/cluster.properties | 101 +--------------------------------------------
+ 1 file changed, 2 insertions(+), 99 deletions(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 4d3337a..d5be751 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..d5be751 100644
extexecution.process,\
git,\
gototest,\
-@@ -372,15 +365,10 @@ nb.cluster.ide=\
+@@ -372,15 +365,12 @@ nb.cluster.ide=\
gsf.testrunner,\
gsf.testrunner.ui,\
html,\
@@ -54,13 +54,13 @@ index 4d3337a..d5be751 100644
html.editor.lib,\
- html.knockout,\
html.lexer,\
-- html.parser,\
-- html.validation,\
+ html.parser,\
+ html.validation,\
- httpserver,\
hudson,\
hudson.git,\
hudson.mercurial,\
-@@ -390,15 +378,6 @@ nb.cluster.ide=\
+@@ -390,15 +380,6 @@ nb.cluster.ide=\
ide.kit,\
image,\
javascript2.debug,\
@@ -76,7 +76,7 @@ index 4d3337a..d5be751 100644
jellytools.ide,\
jumpto,\
languages,\
-@@ -419,17 +398,13 @@ nb.cluster.ide=\
+@@ -419,17 +400,13 @@ nb.cluster.ide=\
libs.json_simple,\
libs.jvyamlb,\
libs.lucene,\
@@ -94,7 +94,7 @@ index 4d3337a..d5be751 100644
notifications,\
o.apache.commons.codec,\
o.apache.commons.httpclient,\
-@@ -438,28 +413,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..d5be751 100644
o.n.swing.dirchooser,\
o.openidex.util,\
options.editor,\
-@@ -495,7 +450,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..d5be751 100644
spellchecker.kit,\
spi.debugger.ui,\
spi.editor.hints,\
-@@ -554,7 +508,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..d5be751 100644
nb.cluster.harness
nb.cluster.java=\
ant.browsetask,\
-@@ -564,7 +517,6 @@ nb.cluster.java=\
+@@ -564,7 +519,6 @@ nb.cluster.java=\
ant.kit,\
api.debugger.jpda,\
api.java,\
@@ -147,7 +147,7 @@ index 4d3337a..d5be751 100644
beans,\
classfile,\
dbschema,\
-@@ -583,21 +535,15 @@ nb.cluster.java=\
+@@ -583,21 +537,15 @@ nb.cluster.java=\
form.kit,\
form.nb,\
form.refactoring,\
@@ -169,7 +169,7 @@ index 4d3337a..d5be751 100644
j2ee.persistenceapi,\
java.api.common,\
java.completion,\
-@@ -650,26 +596,6 @@ nb.cluster.java=\
+@@ -650,26 +598,6 @@ nb.cluster.java=\
libs.cglib,\
libs.javacapi,\
libs.javacimpl,\
@@ -196,7 +196,7 @@ index 4d3337a..d5be751 100644
nashorn.execution,\
o.jdesktop.beansbinding,\
performance,\
-@@ -678,18 +604,12 @@ nb.cluster.java=\
+@@ -678,18 +606,12 @@ nb.cluster.java=\
projectimport.eclipse.j2se,\
refactoring.java,\
selenium2.java,\
@@ -215,7 +215,7 @@ index 4d3337a..d5be751 100644
whitelist,\
xml.jaxb,\
xml.tools.java
-@@ -707,16 +627,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..d5be751 100644
nb.cluster.enterprise.dir=enterprise
nb.cluster.enterprise.depends=\
-@@ -730,7 +646,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..d5be751 100644
cloud.amazon,\
cloud.common,\
el.lexer,\
-@@ -778,9 +693,6 @@ nb.cluster.enterprise=\
+@@ -778,9 +695,6 @@ nb.cluster.enterprise=\
libs.elimpl,\
libs.glassfish_logging,\
libs.jstl,\
@@ -251,7 +251,7 @@ index 4d3337a..d5be751 100644
performance.javaee,\
performance.scripting,\
performance.web,\
-@@ -858,7 +770,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..d5be751 100644
deadlock.detector,\
ide.branding,\
ide.branding.kit,\
-@@ -888,7 +799,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..d5be751 100644
profiler,\
profiler.api,\
profiler.attach,\
-@@ -972,9 +882,7 @@ nb.cluster.groovy=\
+@@ -972,9 +884,7 @@ nb.cluster.groovy=\
groovy.kit,\
groovy.refactoring,\
groovy.samples,\
@@ -278,7 +278,7 @@ index 4d3337a..d5be751 100644
nb.cluster.mobility.dir=mobility
nb.cluster.mobility.depends=\
-@@ -1068,7 +976,6 @@ nb.cluster.cnd=\
+@@ -1068,7 +978,6 @@ nb.cluster.cnd=\
cnd.toolchain,\
cnd.utils,\
jellytools.cnd,\
@@ -286,7 +286,7 @@ index 4d3337a..d5be751 100644
validation.nb.cluster.cnd=\
cnd.kit
-@@ -1121,8 +1028,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..d5be751 100644
o.joda.time
nb.cluster.team.dir=extra
-@@ -1131,7 +1036,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..d5be751 100644
c.tasktop.c2c.server.cloud.api,\
c.tasktop.c2c.server.common.api,\
c.tasktop.c2c.server.profile.api,\
-@@ -1140,7 +1044,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..d5be751 100644
kenai.ui,\
lib.cvsclient,\
o.codehaus.jackson.core,\
-@@ -1194,7 +1097,6 @@ nb.cluster.stableuc=\
+@@ -1194,7 +1099,6 @@ nb.cluster.stableuc=\
libs.oracle.cloud,\
libs.ppawtlayout,\
loadgenerator,\
@@ -319,7 +319,7 @@ index 4d3337a..d5be751 100644
mobility.antext,\
mobility.cldcplatform.catalog,\
mobility.deployment.ftpscp,\
-@@ -1267,7 +1169,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 1113f31..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 d5be751..788eac9 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 c645185..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 788eac9..e159085 100644
+index 3af7929..4b9bc84 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
-@@ -445,6 +445,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
More information about the pkg-java-commits
mailing list