[netbeans] 13/15: netbeans-platform-o.n.html.ko4j.patch: Readd apisupport.project 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 3b84379ef0b65a516a0a1dd412a22bc1c92a86a4
Author: Markus Koschany <apo at debian.org>
Date: Thu Dec 31 10:18:50 2015 +0100
netbeans-platform-o.n.html.ko4j.patch: Readd apisupport.project module
---
debian/patches/netbeans-cluster-properties.patch | 27 +++++++++++-----------
debian/patches/netbeans-core.browser.webview.patch | 2 +-
.../patches/netbeans-platform-o.n.html.ko4j.patch | 14 +++--------
debian/patches/netbeans-slf4j.dummy.patch | 2 +-
4 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch
index 9bc6b72..2ef00df 100644
--- a/debian/patches/netbeans-cluster-properties.patch
+++ b/debian/patches/netbeans-cluster-properties.patch
@@ -11,7 +11,7 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 102 deletions(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index c145a5f..e5f7132 100644
+index 4d3337a..9156f59 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -107,10 +107,8 @@ clusters.config.java.list=\
@@ -216,7 +216,7 @@ index c145a5f..e5f7132 100644
whitelist,\
xml.jaxb,\
xml.tools.java
-@@ -707,15 +626,11 @@ nb.cluster.apisupport.depends=\
+@@ -707,16 +626,12 @@ nb.cluster.apisupport.depends=\
nb.cluster.apisupport=\
apisupport.ant,\
apisupport.crudsample,\
@@ -226,6 +226,7 @@ index c145a5f..e5f7132 100644
apisupport.kit,\
apisupport.osgidemo,\
apisupport.paintapp,\
+ apisupport.project,\
apisupport.refactoring,\
- apisupport.wizards,\
- maven.apisupport
@@ -233,7 +234,7 @@ index c145a5f..e5f7132 100644
nb.cluster.enterprise.dir=enterprise
nb.cluster.enterprise.depends=\
-@@ -729,7 +644,6 @@ nb.cluster.enterprise.depends=\
+@@ -730,7 +645,6 @@ nb.cluster.enterprise.depends=\
nb.cluster.harness
nb.cluster.enterprise=\
api.web.webmodule,\
@@ -241,7 +242,7 @@ index c145a5f..e5f7132 100644
cloud.amazon,\
cloud.common,\
el.lexer,\
-@@ -777,9 +691,6 @@ nb.cluster.enterprise=\
+@@ -778,9 +692,6 @@ nb.cluster.enterprise=\
libs.elimpl,\
libs.glassfish_logging,\
libs.jstl,\
@@ -251,7 +252,7 @@ index c145a5f..e5f7132 100644
performance.javaee,\
performance.scripting,\
performance.web,\
-@@ -857,7 +768,6 @@ nb.cluster.nb.depends=\
+@@ -858,7 +769,6 @@ nb.cluster.nb.depends=\
nb.cluster.harness
nb.cluster.nb=\
autoupdate.pluginimporter,\
@@ -259,7 +260,7 @@ index c145a5f..e5f7132 100644
deadlock.detector,\
ide.branding,\
ide.branding.kit,\
-@@ -887,7 +797,6 @@ nb.cluster.profiler=\
+@@ -888,7 +798,6 @@ nb.cluster.profiler=\
lib.profiler.charts,\
lib.profiler.common,\
lib.profiler.ui,\
@@ -267,7 +268,7 @@ index c145a5f..e5f7132 100644
profiler,\
profiler.api,\
profiler.attach,\
-@@ -971,9 +880,7 @@ nb.cluster.groovy=\
+@@ -972,9 +881,7 @@ nb.cluster.groovy=\
groovy.kit,\
groovy.refactoring,\
groovy.samples,\
@@ -278,7 +279,7 @@ index c145a5f..e5f7132 100644
nb.cluster.mobility.dir=mobility
nb.cluster.mobility.depends=\
-@@ -1067,7 +974,6 @@ nb.cluster.cnd=\
+@@ -1068,7 +975,6 @@ nb.cluster.cnd=\
cnd.toolchain,\
cnd.utils,\
jellytools.cnd,\
@@ -286,7 +287,7 @@ index c145a5f..e5f7132 100644
validation.nb.cluster.cnd=\
cnd.kit
-@@ -1120,8 +1026,6 @@ nb.cluster.jira=\
+@@ -1121,8 +1027,6 @@ nb.cluster.jira=\
o.apache.axis,\
o.apache.commons.discovery,\
o.codehaus.jettison,\
@@ -295,7 +296,7 @@ index c145a5f..e5f7132 100644
o.joda.time
nb.cluster.team.dir=extra
-@@ -1130,7 +1034,6 @@ nb.cluster.team.depends=\
+@@ -1131,7 +1035,6 @@ nb.cluster.team.depends=\
nb.cluster.platform,\
nb.cluster.ide
nb.cluster.team=\
@@ -303,7 +304,7 @@ index c145a5f..e5f7132 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=\
+@@ -1140,7 +1043,6 @@ nb.cluster.team=\
c.tasktop.c2c.server.wiki.api,\
kenai,\
kenai.kit,\
@@ -311,7 +312,7 @@ index c145a5f..e5f7132 100644
kenai.ui,\
lib.cvsclient,\
o.codehaus.jackson.core,\
-@@ -1193,7 +1095,6 @@ nb.cluster.stableuc=\
+@@ -1194,7 +1096,6 @@ nb.cluster.stableuc=\
libs.oracle.cloud,\
libs.ppawtlayout,\
loadgenerator,\
@@ -319,7 +320,7 @@ index c145a5f..e5f7132 100644
mobility.antext,\
mobility.cldcplatform.catalog,\
mobility.deployment.ftpscp,\
-@@ -1266,7 +1167,6 @@ nb.cluster.betauc=\
+@@ -1267,7 +1168,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 c91f533..3e5d5d4 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 e5f7132..8997c30 100644
+index 9156f59..9c36fa0 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -300,7 +300,6 @@ nb.cluster.ide=\
diff --git a/debian/patches/netbeans-platform-o.n.html.ko4j.patch b/debian/patches/netbeans-platform-o.n.html.ko4j.patch
index 925e330..15467a3 100644
--- a/debian/patches/netbeans-platform-o.n.html.ko4j.patch
+++ b/debian/patches/netbeans-platform-o.n.html.ko4j.patch
@@ -6,11 +6,11 @@ Disable the o.n.html.ko4j module similar to net.java.html.
Forwarded: not-needed
---
- nbbuild/cluster.properties | 3 ---
- 1 file changed, 3 deletions(-)
+ nbbuild/cluster.properties | 2 --
+ 1 file changed, 2 deletions(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 776c7d4..c145a5f 100644
+index 776c7d4..4d3337a 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -251,7 +251,6 @@ nb.cluster.platform=\
@@ -29,11 +29,3 @@ index 776c7d4..c145a5f 100644
uihandler
validation.nb.cluster.platform=\
o.n.core,\
-@@ -715,7 +713,6 @@ nb.cluster.apisupport=\
- apisupport.kit,\
- apisupport.osgidemo,\
- apisupport.paintapp,\
-- apisupport.project,\
- apisupport.refactoring,\
- apisupport.wizards,\
- maven.apisupport
diff --git a/debian/patches/netbeans-slf4j.dummy.patch b/debian/patches/netbeans-slf4j.dummy.patch
index 11a6b57..d172b34 100644
--- a/debian/patches/netbeans-slf4j.dummy.patch
+++ b/debian/patches/netbeans-slf4j.dummy.patch
@@ -23,7 +23,7 @@ Forwarded: not-needed
create mode 100644 slf4j.dummy/nbproject/project.xml
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 8997c30..1971bcb 100644
+index 9c36fa0..8d7dbc1 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -444,6 +444,7 @@ nb.cluster.ide=\
--
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