[netbeans] 14/15: netbeans-cluster-properties.patch: Readd javascript2.debug module
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Dec 31 10:43:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository netbeans.
commit a85c4ad6c907712c70ea18840166472ea359f025
Author: Markus Koschany <apo at debian.org>
Date: Thu Dec 31 10:53:10 2015 +0100
netbeans-cluster-properties.patch: Readd javascript2.debug module
---
debian/patches/netbeans-cluster-properties.patch | 51 +++++++++++-----------
debian/patches/netbeans-core.browser.webview.patch | 2 +-
debian/patches/netbeans-slf4j.dummy.patch | 4 +-
3 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch
index 2ef00df..73f6db5 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 | 103 +--------------------------------------------
+ 1 file changed, 2 insertions(+), 101 deletions(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 4d3337a..9156f59 100644
+index 4d3337a..d5be751 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -107,10 +107,8 @@ clusters.config.java.list=\
@@ -60,11 +60,10 @@ index 4d3337a..9156f59 100644
hudson,\
hudson.git,\
hudson.mercurial,\
-@@ -389,16 +377,6 @@ nb.cluster.ide=\
- hudson.ui,\
+@@ -390,15 +378,6 @@ nb.cluster.ide=\
ide.kit,\
image,\
-- javascript2.debug,\
+ javascript2.debug,\
- javascript2.editor,\
- javascript2.extjs,\
- javascript2.jade,\
@@ -77,7 +76,7 @@ index 4d3337a..9156f59 100644
jellytools.ide,\
jumpto,\
languages,\
-@@ -419,17 +397,13 @@ nb.cluster.ide=\
+@@ -419,17 +398,13 @@ nb.cluster.ide=\
libs.json_simple,\
libs.jvyamlb,\
libs.lucene,\
@@ -95,7 +94,7 @@ index 4d3337a..9156f59 100644
notifications,\
o.apache.commons.codec,\
o.apache.commons.httpclient,\
-@@ -438,28 +412,8 @@ nb.cluster.ide=\
+@@ -438,28 +413,8 @@ nb.cluster.ide=\
o.apache.commons.logging,\
o.apache.ws.commons.util,\
o.apache.xml.resolver,\
@@ -124,7 +123,7 @@ index 4d3337a..9156f59 100644
o.n.swing.dirchooser,\
o.openidex.util,\
options.editor,\
-@@ -495,7 +449,6 @@ nb.cluster.ide=\
+@@ -495,7 +450,6 @@ nb.cluster.ide=\
spellchecker.apimodule,\
spellchecker.bindings.htmlxml,\
spellchecker.bindings.properties,\
@@ -132,7 +131,7 @@ index 4d3337a..9156f59 100644
spellchecker.kit,\
spi.debugger.ui,\
spi.editor.hints,\
-@@ -554,7 +507,6 @@ nb.cluster.java.depends=\
+@@ -554,7 +508,6 @@ nb.cluster.java.depends=\
nb.cluster.ide,\
nb.cluster.extide,\
nb.cluster.platform,\
@@ -140,7 +139,7 @@ index 4d3337a..9156f59 100644
nb.cluster.harness
nb.cluster.java=\
ant.browsetask,\
-@@ -564,7 +516,6 @@ nb.cluster.java=\
+@@ -564,7 +517,6 @@ nb.cluster.java=\
ant.kit,\
api.debugger.jpda,\
api.java,\
@@ -148,7 +147,7 @@ index 4d3337a..9156f59 100644
beans,\
classfile,\
dbschema,\
-@@ -583,21 +534,15 @@ nb.cluster.java=\
+@@ -583,21 +535,15 @@ nb.cluster.java=\
form.kit,\
form.nb,\
form.refactoring,\
@@ -170,7 +169,7 @@ index 4d3337a..9156f59 100644
j2ee.persistenceapi,\
java.api.common,\
java.completion,\
-@@ -650,26 +595,6 @@ nb.cluster.java=\
+@@ -650,26 +596,6 @@ nb.cluster.java=\
libs.cglib,\
libs.javacapi,\
libs.javacimpl,\
@@ -197,7 +196,7 @@ index 4d3337a..9156f59 100644
nashorn.execution,\
o.jdesktop.beansbinding,\
performance,\
-@@ -678,18 +603,12 @@ nb.cluster.java=\
+@@ -678,18 +604,12 @@ nb.cluster.java=\
projectimport.eclipse.j2se,\
refactoring.java,\
selenium2.java,\
@@ -216,7 +215,7 @@ index 4d3337a..9156f59 100644
whitelist,\
xml.jaxb,\
xml.tools.java
-@@ -707,16 +626,12 @@ nb.cluster.apisupport.depends=\
+@@ -707,16 +627,12 @@ nb.cluster.apisupport.depends=\
nb.cluster.apisupport=\
apisupport.ant,\
apisupport.crudsample,\
@@ -234,7 +233,7 @@ index 4d3337a..9156f59 100644
nb.cluster.enterprise.dir=enterprise
nb.cluster.enterprise.depends=\
-@@ -730,7 +645,6 @@ nb.cluster.enterprise.depends=\
+@@ -730,7 +646,6 @@ nb.cluster.enterprise.depends=\
nb.cluster.harness
nb.cluster.enterprise=\
api.web.webmodule,\
@@ -242,7 +241,7 @@ index 4d3337a..9156f59 100644
cloud.amazon,\
cloud.common,\
el.lexer,\
-@@ -778,9 +692,6 @@ nb.cluster.enterprise=\
+@@ -778,9 +693,6 @@ nb.cluster.enterprise=\
libs.elimpl,\
libs.glassfish_logging,\
libs.jstl,\
@@ -252,7 +251,7 @@ index 4d3337a..9156f59 100644
performance.javaee,\
performance.scripting,\
performance.web,\
-@@ -858,7 +769,6 @@ nb.cluster.nb.depends=\
+@@ -858,7 +770,6 @@ nb.cluster.nb.depends=\
nb.cluster.harness
nb.cluster.nb=\
autoupdate.pluginimporter,\
@@ -260,7 +259,7 @@ index 4d3337a..9156f59 100644
deadlock.detector,\
ide.branding,\
ide.branding.kit,\
-@@ -888,7 +798,6 @@ nb.cluster.profiler=\
+@@ -888,7 +799,6 @@ nb.cluster.profiler=\
lib.profiler.charts,\
lib.profiler.common,\
lib.profiler.ui,\
@@ -268,7 +267,7 @@ index 4d3337a..9156f59 100644
profiler,\
profiler.api,\
profiler.attach,\
-@@ -972,9 +881,7 @@ nb.cluster.groovy=\
+@@ -972,9 +882,7 @@ nb.cluster.groovy=\
groovy.kit,\
groovy.refactoring,\
groovy.samples,\
@@ -279,7 +278,7 @@ index 4d3337a..9156f59 100644
nb.cluster.mobility.dir=mobility
nb.cluster.mobility.depends=\
-@@ -1068,7 +975,6 @@ nb.cluster.cnd=\
+@@ -1068,7 +976,6 @@ nb.cluster.cnd=\
cnd.toolchain,\
cnd.utils,\
jellytools.cnd,\
@@ -287,7 +286,7 @@ index 4d3337a..9156f59 100644
validation.nb.cluster.cnd=\
cnd.kit
-@@ -1121,8 +1027,6 @@ nb.cluster.jira=\
+@@ -1121,8 +1028,6 @@ nb.cluster.jira=\
o.apache.axis,\
o.apache.commons.discovery,\
o.codehaus.jettison,\
@@ -296,7 +295,7 @@ index 4d3337a..9156f59 100644
o.joda.time
nb.cluster.team.dir=extra
-@@ -1131,7 +1035,6 @@ nb.cluster.team.depends=\
+@@ -1131,7 +1036,6 @@ nb.cluster.team.depends=\
nb.cluster.platform,\
nb.cluster.ide
nb.cluster.team=\
@@ -304,7 +303,7 @@ index 4d3337a..9156f59 100644
c.tasktop.c2c.server.cloud.api,\
c.tasktop.c2c.server.common.api,\
c.tasktop.c2c.server.profile.api,\
-@@ -1140,7 +1043,6 @@ nb.cluster.team=\
+@@ -1140,7 +1044,6 @@ nb.cluster.team=\
c.tasktop.c2c.server.wiki.api,\
kenai,\
kenai.kit,\
@@ -312,7 +311,7 @@ index 4d3337a..9156f59 100644
kenai.ui,\
lib.cvsclient,\
o.codehaus.jackson.core,\
-@@ -1194,7 +1096,6 @@ nb.cluster.stableuc=\
+@@ -1194,7 +1097,6 @@ nb.cluster.stableuc=\
libs.oracle.cloud,\
libs.ppawtlayout,\
loadgenerator,\
@@ -320,7 +319,7 @@ index 4d3337a..9156f59 100644
mobility.antext,\
mobility.cldcplatform.catalog,\
mobility.deployment.ftpscp,\
-@@ -1267,7 +1168,6 @@ nb.cluster.betauc=\
+@@ -1267,7 +1169,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 3e5d5d4..1113f31 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 9156f59..9c36fa0 100644
+index d5be751..788eac9 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 d172b34..c645185 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 9c36fa0..8d7dbc1 100644
+index 788eac9..e159085 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
-@@ -444,6 +444,7 @@ nb.cluster.ide=\
+@@ -445,6 +445,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