[netbeans] 12/15: Re-add apisupport.wizards 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 e9cf8a60a0d593d720ac541ca29fe314bfc52fa3
Author: Markus Koschany <apo at debian.org>
Date: Thu Dec 31 08:38:04 2015 +0100
Re-add apisupport.wizards module.
This hopefully fixes the module import error at runtime
---
debian/patches/netbeans-cluster-properties.patch | 34 +++++++++++-----------
debian/patches/netbeans-core.browser.webview.patch | 2 +-
debian/patches/netbeans-slf4j.dummy.patch | 2 +-
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch
index 6b7c69e..9bc6b72 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 | 105 +--------------------------------------------
- 1 file changed, 2 insertions(+), 103 deletions(-)
+ nbbuild/cluster.properties | 104 +--------------------------------------------
+ 1 file changed, 2 insertions(+), 102 deletions(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index c145a5f..47f7ab8 100644
+index c145a5f..e5f7132 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -107,10 +107,8 @@ clusters.config.java.list=\
@@ -216,7 +216,7 @@ index c145a5f..47f7ab8 100644
whitelist,\
xml.jaxb,\
xml.tools.java
-@@ -707,15 +626,10 @@ nb.cluster.apisupport.depends=\
+@@ -707,15 +626,11 @@ nb.cluster.apisupport.depends=\
nb.cluster.apisupport=\
apisupport.ant,\
apisupport.crudsample,\
@@ -226,14 +226,14 @@ index c145a5f..47f7ab8 100644
apisupport.kit,\
apisupport.osgidemo,\
apisupport.paintapp,\
-- apisupport.refactoring,\
+ apisupport.refactoring,\
- apisupport.wizards,\
- maven.apisupport
-+ apisupport.refactoring
++ apisupport.wizards
nb.cluster.enterprise.dir=enterprise
nb.cluster.enterprise.depends=\
-@@ -729,7 +643,6 @@ nb.cluster.enterprise.depends=\
+@@ -729,7 +644,6 @@ nb.cluster.enterprise.depends=\
nb.cluster.harness
nb.cluster.enterprise=\
api.web.webmodule,\
@@ -241,7 +241,7 @@ index c145a5f..47f7ab8 100644
cloud.amazon,\
cloud.common,\
el.lexer,\
-@@ -777,9 +690,6 @@ nb.cluster.enterprise=\
+@@ -777,9 +691,6 @@ nb.cluster.enterprise=\
libs.elimpl,\
libs.glassfish_logging,\
libs.jstl,\
@@ -251,7 +251,7 @@ index c145a5f..47f7ab8 100644
performance.javaee,\
performance.scripting,\
performance.web,\
-@@ -857,7 +767,6 @@ nb.cluster.nb.depends=\
+@@ -857,7 +768,6 @@ nb.cluster.nb.depends=\
nb.cluster.harness
nb.cluster.nb=\
autoupdate.pluginimporter,\
@@ -259,7 +259,7 @@ index c145a5f..47f7ab8 100644
deadlock.detector,\
ide.branding,\
ide.branding.kit,\
-@@ -887,7 +796,6 @@ nb.cluster.profiler=\
+@@ -887,7 +797,6 @@ nb.cluster.profiler=\
lib.profiler.charts,\
lib.profiler.common,\
lib.profiler.ui,\
@@ -267,7 +267,7 @@ index c145a5f..47f7ab8 100644
profiler,\
profiler.api,\
profiler.attach,\
-@@ -971,9 +879,7 @@ nb.cluster.groovy=\
+@@ -971,9 +880,7 @@ nb.cluster.groovy=\
groovy.kit,\
groovy.refactoring,\
groovy.samples,\
@@ -278,7 +278,7 @@ index c145a5f..47f7ab8 100644
nb.cluster.mobility.dir=mobility
nb.cluster.mobility.depends=\
-@@ -1067,7 +973,6 @@ nb.cluster.cnd=\
+@@ -1067,7 +974,6 @@ nb.cluster.cnd=\
cnd.toolchain,\
cnd.utils,\
jellytools.cnd,\
@@ -286,7 +286,7 @@ index c145a5f..47f7ab8 100644
validation.nb.cluster.cnd=\
cnd.kit
-@@ -1120,8 +1025,6 @@ nb.cluster.jira=\
+@@ -1120,8 +1026,6 @@ nb.cluster.jira=\
o.apache.axis,\
o.apache.commons.discovery,\
o.codehaus.jettison,\
@@ -295,7 +295,7 @@ index c145a5f..47f7ab8 100644
o.joda.time
nb.cluster.team.dir=extra
-@@ -1130,7 +1033,6 @@ nb.cluster.team.depends=\
+@@ -1130,7 +1034,6 @@ nb.cluster.team.depends=\
nb.cluster.platform,\
nb.cluster.ide
nb.cluster.team=\
@@ -303,7 +303,7 @@ index c145a5f..47f7ab8 100644
c.tasktop.c2c.server.cloud.api,\
c.tasktop.c2c.server.common.api,\
c.tasktop.c2c.server.profile.api,\
-@@ -1139,7 +1041,6 @@ nb.cluster.team=\
+@@ -1139,7 +1042,6 @@ nb.cluster.team=\
c.tasktop.c2c.server.wiki.api,\
kenai,\
kenai.kit,\
@@ -311,7 +311,7 @@ index c145a5f..47f7ab8 100644
kenai.ui,\
lib.cvsclient,\
o.codehaus.jackson.core,\
-@@ -1193,7 +1094,6 @@ nb.cluster.stableuc=\
+@@ -1193,7 +1095,6 @@ nb.cluster.stableuc=\
libs.oracle.cloud,\
libs.ppawtlayout,\
loadgenerator,\
@@ -319,7 +319,7 @@ index c145a5f..47f7ab8 100644
mobility.antext,\
mobility.cldcplatform.catalog,\
mobility.deployment.ftpscp,\
-@@ -1266,7 +1166,6 @@ nb.cluster.betauc=\
+@@ -1266,7 +1167,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 098403c..c91f533 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 47f7ab8..9a44d57 100644
+index e5f7132..8997c30 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 7d64549..11a6b57 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 9a44d57..019f825 100644
+index 8997c30..1971bcb 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