[netbeans] 01/02: Readd javascrip2.debug module and disable jaxws modules in java.kit.
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Jun 11 23:32:05 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 61f0dec80ed5d5271b625927a2156d4700d599da
Author: Markus Koschany <apo at gambaru.de>
Date: Fri Jun 12 00:51:00 2015 +0200
Readd javascrip2.debug module and disable jaxws modules in java.kit.
---
debian/patches/netbeans-cluster-properties.patch | 49 ++++++++++++------------
debian/patches/netbeans-small-ide.patch | 25 +++++++++++-
2 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch
index bbe9461..3a203b8 100644
--- a/debian/patches/netbeans-cluster-properties.patch
+++ b/debian/patches/netbeans-cluster-properties.patch
@@ -3,11 +3,11 @@ Date: Sun, 7 Jun 2015 13:53:31 +0200
Subject: netbeans cluster properties
---
- nbbuild/cluster.properties | 97 +---------------------------------------------
- 1 file changed, 2 insertions(+), 95 deletions(-)
+ nbbuild/cluster.properties | 96 +---------------------------------------------
+ 1 file changed, 2 insertions(+), 94 deletions(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 27fb4ec..8896d74 100644
+index 27fb4ec..87a9410 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -104,10 +104,8 @@ clusters.config.java.list=\
@@ -48,11 +48,10 @@ index 27fb4ec..8896d74 100644
hudson,\
hudson.git,\
hudson.mercurial,\
-@@ -353,14 +342,6 @@ nb.cluster.ide=\
- ide.kit,\
+@@ -354,13 +343,6 @@ nb.cluster.ide=\
image,\
javaewah.dummy,\
-- javascript2.debug,\
+ javascript2.debug,\
- javascript2.editor,\
- javascript2.extjs,\
- javascript2.jquery,\
@@ -63,7 +62,7 @@ index 27fb4ec..8896d74 100644
jellytools.ide,\
jumpto,\
languages,\
-@@ -381,17 +362,13 @@ nb.cluster.ide=\
+@@ -381,17 +363,13 @@ nb.cluster.ide=\
libs.json_simple,\
libs.jvyamlb,\
libs.lucene,\
@@ -81,7 +80,7 @@ index 27fb4ec..8896d74 100644
notifications,\
o.apache.commons.codec,\
o.apache.commons.httpclient,\
-@@ -400,28 +377,8 @@ nb.cluster.ide=\
+@@ -400,28 +378,8 @@ nb.cluster.ide=\
o.apache.commons.logging,\
o.apache.ws.commons.util,\
o.apache.xml.resolver,\
@@ -110,7 +109,7 @@ index 27fb4ec..8896d74 100644
o.n.swing.dirchooser,\
o.openidex.util,\
options.editor,\
-@@ -446,7 +403,6 @@ nb.cluster.ide=\
+@@ -446,7 +404,6 @@ nb.cluster.ide=\
spellchecker.apimodule,\
spellchecker.bindings.htmlxml,\
spellchecker.bindings.properties,\
@@ -118,7 +117,7 @@ index 27fb4ec..8896d74 100644
spellchecker.kit,\
spi.debugger.ui,\
spi.editor.hints,\
-@@ -504,7 +460,6 @@ nb.cluster.java.depends=\
+@@ -504,7 +461,6 @@ nb.cluster.java.depends=\
nb.cluster.ide,\
nb.cluster.extide,\
nb.cluster.platform,\
@@ -126,7 +125,7 @@ index 27fb4ec..8896d74 100644
nb.cluster.harness
nb.cluster.java=\
ant.browsetask,\
-@@ -514,7 +469,6 @@ nb.cluster.java=\
+@@ -514,7 +470,6 @@ nb.cluster.java=\
ant.kit,\
api.debugger.jpda,\
api.java,\
@@ -134,7 +133,7 @@ index 27fb4ec..8896d74 100644
beans,\
classfile,\
dbschema,\
-@@ -532,21 +486,15 @@ nb.cluster.java=\
+@@ -532,21 +487,15 @@ nb.cluster.java=\
form.kit,\
form.nb,\
form.refactoring,\
@@ -156,7 +155,7 @@ index 27fb4ec..8896d74 100644
j2ee.persistenceapi,\
java.api.common,\
java.debug,\
-@@ -588,24 +536,6 @@ nb.cluster.java=\
+@@ -588,24 +537,6 @@ nb.cluster.java=\
libs.cglib,\
libs.javacapi,\
libs.javacimpl,\
@@ -181,7 +180,7 @@ index 27fb4ec..8896d74 100644
nashorn.execution,\
o.jdesktop.beansbinding,\
performance,\
-@@ -615,13 +545,8 @@ nb.cluster.java=\
+@@ -615,13 +546,8 @@ nb.cluster.java=\
refactoring.java,\
spellchecker.bindings.java,\
spi.java.hints,\
@@ -195,7 +194,7 @@ index 27fb4ec..8896d74 100644
whitelist,\
xml.jaxb,\
xml.tools.java
-@@ -639,16 +564,12 @@ nb.cluster.apisupport.depends=\
+@@ -639,16 +565,12 @@ nb.cluster.apisupport.depends=\
nb.cluster.apisupport=\
apisupport.ant,\
apisupport.crudsample,\
@@ -213,7 +212,7 @@ index 27fb4ec..8896d74 100644
nb.cluster.enterprise.dir=enterprise
nb.cluster.enterprise.depends=\
-@@ -662,7 +583,6 @@ nb.cluster.enterprise.depends=\
+@@ -662,7 +584,6 @@ nb.cluster.enterprise.depends=\
nb.cluster.harness
nb.cluster.enterprise=\
api.web.webmodule,\
@@ -221,7 +220,7 @@ index 27fb4ec..8896d74 100644
cloud.amazon,\
cloud.common,\
el.lexer,\
-@@ -710,9 +630,6 @@ nb.cluster.enterprise=\
+@@ -710,9 +631,6 @@ nb.cluster.enterprise=\
libs.glassfish.sdk,\
libs.glassfish_logging,\
libs.jstl,\
@@ -231,7 +230,7 @@ index 27fb4ec..8896d74 100644
performance.javaee,\
performance.scripting,\
performance.web,\
-@@ -789,7 +706,6 @@ nb.cluster.nb.depends=\
+@@ -789,7 +707,6 @@ nb.cluster.nb.depends=\
nb.cluster.harness
nb.cluster.nb=\
autoupdate.pluginimporter,\
@@ -239,7 +238,7 @@ index 27fb4ec..8896d74 100644
deadlock.detector,\
ide.branding,\
ide.branding.kit,\
-@@ -819,7 +735,6 @@ nb.cluster.profiler=\
+@@ -819,7 +736,6 @@ nb.cluster.profiler=\
lib.profiler.charts,\
lib.profiler.common,\
lib.profiler.ui,\
@@ -247,7 +246,7 @@ index 27fb4ec..8896d74 100644
profiler,\
profiler.api,\
profiler.attach,\
-@@ -905,9 +820,7 @@ nb.cluster.groovy=\
+@@ -905,9 +821,7 @@ nb.cluster.groovy=\
groovy.refactoring,\
groovy.samples,\
groovy.support,\
@@ -258,7 +257,7 @@ index 27fb4ec..8896d74 100644
nb.cluster.mobility.dir=mobility
nb.cluster.mobility.depends=\
nb.cluster.platform,\
-@@ -1042,8 +955,6 @@ nb.cluster.jira=\
+@@ -1042,8 +956,6 @@ nb.cluster.jira=\
o.apache.axis,\
o.apache.commons.discovery,\
o.codehaus.jettison,\
@@ -267,7 +266,7 @@ index 27fb4ec..8896d74 100644
o.joda.time
nb.cluster.odcs.dir=extra
-@@ -1077,7 +988,6 @@ nb.cluster.stableuc.depends=${clusters.config.full.list}
+@@ -1077,7 +989,6 @@ nb.cluster.stableuc.depends=${clusters.config.full.list}
nb.cluster.stableuc=\
apisupport.apidocs,\
avatar_js.project,\
@@ -275,7 +274,7 @@ index 27fb4ec..8896d74 100644
cloud.oracle,\
db.mysql.sakila,\
deployment.deviceanywhere,\
-@@ -1103,7 +1013,6 @@ nb.cluster.stableuc=\
+@@ -1103,7 +1014,6 @@ nb.cluster.stableuc=\
junitlib,\
kenai,\
kenai.kit,\
@@ -283,7 +282,7 @@ index 27fb4ec..8896d74 100644
kenai.ui,\
lib.cvsclient,\
libs.aguiswinglayout,\
-@@ -1112,7 +1021,6 @@ nb.cluster.stableuc=\
+@@ -1112,7 +1022,6 @@ nb.cluster.stableuc=\
libs.oracle.cloud,\
libs.ppawtlayout,\
loadgenerator,\
@@ -291,7 +290,7 @@ index 27fb4ec..8896d74 100644
mobility.antext,\
mobility.cldcplatform.catalog,\
mobility.deployment.ftpscp,\
-@@ -1187,7 +1095,6 @@ nb.cluster.betauc=\
+@@ -1187,7 +1096,6 @@ nb.cluster.betauc=\
contrib/modulemanager,\
contrib/quickfilechooser,\
contrib/selenium,\
diff --git a/debian/patches/netbeans-small-ide.patch b/debian/patches/netbeans-small-ide.patch
index 312feae..42c668e 100644
--- a/debian/patches/netbeans-small-ide.patch
+++ b/debian/patches/netbeans-small-ide.patch
@@ -6,8 +6,9 @@ Subject: netbeans small ide
apisupport.kit/nbproject/project.xml | 4 ++--
editor.kit/nbproject/project.xml | 8 ++++----
ide.kit/nbproject/project.xml | 4 ++--
+ java.kit/nbproject/project.xml | 4 ++--
xsl/nbproject/project.xml | 4 ++--
- 4 files changed, 10 insertions(+), 10 deletions(-)
+ 5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/apisupport.kit/nbproject/project.xml b/apisupport.kit/nbproject/project.xml
index 96d469f..7098a61 100644
@@ -89,6 +90,28 @@ index 1c3c371..36c6ca5 100644
<dependency>
<code-name-base>org.netbeans.modules.jumpto</code-name-base>
<run-dependency>
+diff --git a/java.kit/nbproject/project.xml b/java.kit/nbproject/project.xml
+index 7afb94f..27936f9 100644
+--- a/java.kit/nbproject/project.xml
++++ b/java.kit/nbproject/project.xml
+@@ -272,7 +272,7 @@ made subject to such option by the copyright holder.
+ <specification-version>1.8</specification-version>
+ </run-dependency>
+ </dependency>
+- <dependency>
++ <!--<dependency>
+ <code-name-base>org.netbeans.modules.websvc.jaxws21</code-name-base>
+ <run-dependency>
+ <release-version>1</release-version>
+@@ -284,7 +284,7 @@ made subject to such option by the copyright holder.
+ <run-dependency>
+ <release-version>1</release-version>
+ </run-dependency>
+- </dependency>
++ </dependency>-->
+ <dependency>
+ <code-name-base>org.netbeans.modules.xml.jaxb</code-name-base>
+ <run-dependency>
diff --git a/xsl/nbproject/project.xml b/xsl/nbproject/project.xml
index 006cbff..a5079aa 100644
--- a/xsl/nbproject/project.xml
--
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