[netbeans] 01/04: Enable libs.nashorn module.
Markus Koschany
apo at moszumanska.debian.org
Sun Apr 17 10:28:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch javascript
in repository netbeans.
commit e455d55da56acae2e52e79bc594f338bec334a98
Author: Markus Koschany <apo at debian.org>
Date: Sat Apr 16 18:19:24 2016 +0200
Enable libs.nashorn module.
---
debian/patches/netbeans-cluster-properties.patch | 49 ++++++++++++------------
debian/patches/netbeans-ide-launcher.patch | 2 +-
debian/patches/netbeans-slf4j.dummy.patch | 2 +-
3 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch
index bea046c..6e7d76e 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, 3 insertions(+), 101 deletions(-)
+ nbbuild/cluster.properties | 103 ++-------------------------------------------
+ 1 file changed, 3 insertions(+), 100 deletions(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 4d3337a..a552b65 100644
+index 4d3337a..0248f48 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -107,10 +107,8 @@ clusters.config.java.list=\
@@ -82,11 +82,10 @@ index 4d3337a..a552b65 100644
jellytools.ide,\
jumpto,\
languages,\
-@@ -419,17 +398,13 @@ nb.cluster.ide=\
- libs.json_simple,\
+@@ -420,16 +399,13 @@ nb.cluster.ide=\
libs.jvyamlb,\
libs.lucene,\
-- libs.nashorn,\
+ libs.nashorn,\
- libs.smack,\
libs.svnClientAdapter,\
libs.svnClientAdapter.javahl,\
@@ -100,7 +99,7 @@ index 4d3337a..a552b65 100644
notifications,\
o.apache.commons.codec,\
o.apache.commons.httpclient,\
-@@ -438,28 +413,8 @@ nb.cluster.ide=\
+@@ -438,28 +414,8 @@ nb.cluster.ide=\
o.apache.commons.logging,\
o.apache.ws.commons.util,\
o.apache.xml.resolver,\
@@ -129,7 +128,7 @@ index 4d3337a..a552b65 100644
o.n.swing.dirchooser,\
o.openidex.util,\
options.editor,\
-@@ -491,11 +446,11 @@ nb.cluster.ide=\
+@@ -491,11 +447,11 @@ nb.cluster.ide=\
selenium2.server,\
server,\
servletapi,\
@@ -142,7 +141,7 @@ index 4d3337a..a552b65 100644
spellchecker.kit,\
spi.debugger.ui,\
spi.editor.hints,\
-@@ -554,7 +509,6 @@ nb.cluster.java.depends=\
+@@ -554,7 +510,6 @@ nb.cluster.java.depends=\
nb.cluster.ide,\
nb.cluster.extide,\
nb.cluster.platform,\
@@ -150,7 +149,7 @@ index 4d3337a..a552b65 100644
nb.cluster.harness
nb.cluster.java=\
ant.browsetask,\
-@@ -564,7 +518,6 @@ nb.cluster.java=\
+@@ -564,7 +519,6 @@ nb.cluster.java=\
ant.kit,\
api.debugger.jpda,\
api.java,\
@@ -158,7 +157,7 @@ index 4d3337a..a552b65 100644
beans,\
classfile,\
dbschema,\
-@@ -583,21 +536,15 @@ nb.cluster.java=\
+@@ -583,21 +537,15 @@ nb.cluster.java=\
form.kit,\
form.nb,\
form.refactoring,\
@@ -180,7 +179,7 @@ index 4d3337a..a552b65 100644
j2ee.persistenceapi,\
java.api.common,\
java.completion,\
-@@ -650,26 +597,6 @@ nb.cluster.java=\
+@@ -650,26 +598,6 @@ nb.cluster.java=\
libs.cglib,\
libs.javacapi,\
libs.javacimpl,\
@@ -207,7 +206,7 @@ index 4d3337a..a552b65 100644
nashorn.execution,\
o.jdesktop.beansbinding,\
performance,\
-@@ -678,18 +605,12 @@ nb.cluster.java=\
+@@ -678,18 +606,12 @@ nb.cluster.java=\
projectimport.eclipse.j2se,\
refactoring.java,\
selenium2.java,\
@@ -226,7 +225,7 @@ index 4d3337a..a552b65 100644
whitelist,\
xml.jaxb,\
xml.tools.java
-@@ -707,16 +628,12 @@ nb.cluster.apisupport.depends=\
+@@ -707,16 +629,12 @@ nb.cluster.apisupport.depends=\
nb.cluster.apisupport=\
apisupport.ant,\
apisupport.crudsample,\
@@ -244,7 +243,7 @@ index 4d3337a..a552b65 100644
nb.cluster.enterprise.dir=enterprise
nb.cluster.enterprise.depends=\
-@@ -730,7 +647,6 @@ nb.cluster.enterprise.depends=\
+@@ -730,7 +648,6 @@ nb.cluster.enterprise.depends=\
nb.cluster.harness
nb.cluster.enterprise=\
api.web.webmodule,\
@@ -252,7 +251,7 @@ index 4d3337a..a552b65 100644
cloud.amazon,\
cloud.common,\
el.lexer,\
-@@ -778,9 +694,6 @@ nb.cluster.enterprise=\
+@@ -778,9 +695,6 @@ nb.cluster.enterprise=\
libs.elimpl,\
libs.glassfish_logging,\
libs.jstl,\
@@ -262,7 +261,7 @@ index 4d3337a..a552b65 100644
performance.javaee,\
performance.scripting,\
performance.web,\
-@@ -858,7 +771,6 @@ nb.cluster.nb.depends=\
+@@ -858,7 +772,6 @@ nb.cluster.nb.depends=\
nb.cluster.harness
nb.cluster.nb=\
autoupdate.pluginimporter,\
@@ -270,7 +269,7 @@ index 4d3337a..a552b65 100644
deadlock.detector,\
ide.branding,\
ide.branding.kit,\
-@@ -888,7 +800,6 @@ nb.cluster.profiler=\
+@@ -888,7 +801,6 @@ nb.cluster.profiler=\
lib.profiler.charts,\
lib.profiler.common,\
lib.profiler.ui,\
@@ -278,7 +277,7 @@ index 4d3337a..a552b65 100644
profiler,\
profiler.api,\
profiler.attach,\
-@@ -972,9 +883,7 @@ nb.cluster.groovy=\
+@@ -972,9 +884,7 @@ nb.cluster.groovy=\
groovy.kit,\
groovy.refactoring,\
groovy.samples,\
@@ -289,7 +288,7 @@ index 4d3337a..a552b65 100644
nb.cluster.mobility.dir=mobility
nb.cluster.mobility.depends=\
-@@ -1068,7 +977,6 @@ nb.cluster.cnd=\
+@@ -1068,7 +978,6 @@ nb.cluster.cnd=\
cnd.toolchain,\
cnd.utils,\
jellytools.cnd,\
@@ -297,7 +296,7 @@ index 4d3337a..a552b65 100644
validation.nb.cluster.cnd=\
cnd.kit
-@@ -1121,8 +1029,6 @@ nb.cluster.jira=\
+@@ -1121,8 +1030,6 @@ nb.cluster.jira=\
o.apache.axis,\
o.apache.commons.discovery,\
o.codehaus.jettison,\
@@ -306,7 +305,7 @@ index 4d3337a..a552b65 100644
o.joda.time
nb.cluster.team.dir=extra
-@@ -1131,7 +1037,6 @@ nb.cluster.team.depends=\
+@@ -1131,7 +1038,6 @@ nb.cluster.team.depends=\
nb.cluster.platform,\
nb.cluster.ide
nb.cluster.team=\
@@ -314,7 +313,7 @@ index 4d3337a..a552b65 100644
c.tasktop.c2c.server.cloud.api,\
c.tasktop.c2c.server.common.api,\
c.tasktop.c2c.server.profile.api,\
-@@ -1140,7 +1045,6 @@ nb.cluster.team=\
+@@ -1140,7 +1046,6 @@ nb.cluster.team=\
c.tasktop.c2c.server.wiki.api,\
kenai,\
kenai.kit,\
@@ -322,7 +321,7 @@ index 4d3337a..a552b65 100644
kenai.ui,\
lib.cvsclient,\
o.codehaus.jackson.core,\
-@@ -1194,7 +1098,6 @@ nb.cluster.stableuc=\
+@@ -1194,7 +1099,6 @@ nb.cluster.stableuc=\
libs.oracle.cloud,\
libs.ppawtlayout,\
loadgenerator,\
@@ -330,7 +329,7 @@ index 4d3337a..a552b65 100644
mobility.antext,\
mobility.cldcplatform.catalog,\
mobility.deployment.ftpscp,\
-@@ -1267,7 +1170,6 @@ nb.cluster.betauc=\
+@@ -1267,7 +1171,6 @@ nb.cluster.betauc=\
contrib/modulemanager,\
contrib/quickfilechooser,\
contrib/selenium,\
diff --git a/debian/patches/netbeans-ide-launcher.patch b/debian/patches/netbeans-ide-launcher.patch
index ef6997c..42b8db9 100644
--- a/debian/patches/netbeans-ide-launcher.patch
+++ b/debian/patches/netbeans-ide-launcher.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/ide/launcher/netbeans.conf b/ide/launcher/netbeans.conf
-index 3cdd3dc..96a12fc 100644
+index 3cdd3dc..8a2d6b9 100644
--- a/ide/launcher/netbeans.conf
+++ b/ide/launcher/netbeans.conf
@@ -43,8 +43,7 @@ netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/8.1"
diff --git a/debian/patches/netbeans-slf4j.dummy.patch b/debian/patches/netbeans-slf4j.dummy.patch
index 4e173f7..c3fb69d 100644
--- a/debian/patches/netbeans-slf4j.dummy.patch
+++ b/debian/patches/netbeans-slf4j.dummy.patch
@@ -39,7 +39,7 @@ index f31a978..0925156 100644
<class-path-extension>
diff --git a/slf4j.dummy/build.xml b/slf4j.dummy/build.xml
new file mode 100644
-index 0000000..34be746
+index 0000000..b7663bc
--- /dev/null
+++ b/slf4j.dummy/build.xml
@@ -0,0 +1,12 @@
--
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