This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit 9c8ee2b744603163a8bbd430fce23d40bf56e334 Author: Markus Koschany <[email protected]> Date: Thu Jun 11 23:53:44 2015 +0200 Enable nashorn.execution module again. --- debian/patches/netbeans-cluster-properties.patch | 35 ++++++++++++------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch index b348fa7..0dee9f3 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 | 96 +--------------------------------------------- - 1 file changed, 2 insertions(+), 94 deletions(-) + nbbuild/cluster.properties | 95 +--------------------------------------------- + 1 file changed, 2 insertions(+), 93 deletions(-) diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 27fb4ec..5459a48 100644 +index 27fb4ec..47ba3a0 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -104,10 +104,8 @@ clusters.config.java.list=\ @@ -156,7 +156,7 @@ index 27fb4ec..5459a48 100644 j2ee.persistenceapi,\ java.api.common,\ java.debug,\ -@@ -588,25 +538,6 @@ nb.cluster.java=\ +@@ -588,24 +538,6 @@ nb.cluster.java=\ libs.cglib,\ libs.javacapi,\ libs.javacimpl,\ @@ -178,11 +178,10 @@ index 27fb4ec..5459a48 100644 - maven.repository,\ - maven.search,\ - maven.spring,\ -- nashorn.execution,\ + nashorn.execution,\ o.jdesktop.beansbinding,\ performance,\ - performance.java,\ -@@ -615,13 +546,8 @@ nb.cluster.java=\ +@@ -615,13 +547,8 @@ nb.cluster.java=\ refactoring.java,\ spellchecker.bindings.java,\ spi.java.hints,\ @@ -196,7 +195,7 @@ index 27fb4ec..5459a48 100644 whitelist,\ xml.jaxb,\ xml.tools.java -@@ -639,16 +565,12 @@ nb.cluster.apisupport.depends=\ +@@ -639,16 +566,12 @@ nb.cluster.apisupport.depends=\ nb.cluster.apisupport=\ apisupport.ant,\ apisupport.crudsample,\ @@ -214,7 +213,7 @@ index 27fb4ec..5459a48 100644 nb.cluster.enterprise.dir=enterprise nb.cluster.enterprise.depends=\ -@@ -662,7 +584,6 @@ nb.cluster.enterprise.depends=\ +@@ -662,7 +585,6 @@ nb.cluster.enterprise.depends=\ nb.cluster.harness nb.cluster.enterprise=\ api.web.webmodule,\ @@ -222,7 +221,7 @@ index 27fb4ec..5459a48 100644 cloud.amazon,\ cloud.common,\ el.lexer,\ -@@ -710,9 +631,6 @@ nb.cluster.enterprise=\ +@@ -710,9 +632,6 @@ nb.cluster.enterprise=\ libs.glassfish.sdk,\ libs.glassfish_logging,\ libs.jstl,\ @@ -232,7 +231,7 @@ index 27fb4ec..5459a48 100644 performance.javaee,\ performance.scripting,\ performance.web,\ -@@ -789,7 +707,6 @@ nb.cluster.nb.depends=\ +@@ -789,7 +708,6 @@ nb.cluster.nb.depends=\ nb.cluster.harness nb.cluster.nb=\ autoupdate.pluginimporter,\ @@ -240,7 +239,7 @@ index 27fb4ec..5459a48 100644 deadlock.detector,\ ide.branding,\ ide.branding.kit,\ -@@ -819,7 +736,6 @@ nb.cluster.profiler=\ +@@ -819,7 +737,6 @@ nb.cluster.profiler=\ lib.profiler.charts,\ lib.profiler.common,\ lib.profiler.ui,\ @@ -248,7 +247,7 @@ index 27fb4ec..5459a48 100644 profiler,\ profiler.api,\ profiler.attach,\ -@@ -905,9 +821,7 @@ nb.cluster.groovy=\ +@@ -905,9 +822,7 @@ nb.cluster.groovy=\ groovy.refactoring,\ groovy.samples,\ groovy.support,\ @@ -259,7 +258,7 @@ index 27fb4ec..5459a48 100644 nb.cluster.mobility.dir=mobility nb.cluster.mobility.depends=\ nb.cluster.platform,\ -@@ -1042,8 +956,6 @@ nb.cluster.jira=\ +@@ -1042,8 +957,6 @@ nb.cluster.jira=\ o.apache.axis,\ o.apache.commons.discovery,\ o.codehaus.jettison,\ @@ -268,7 +267,7 @@ index 27fb4ec..5459a48 100644 o.joda.time nb.cluster.odcs.dir=extra -@@ -1077,7 +989,6 @@ nb.cluster.stableuc.depends=${clusters.config.full.list} +@@ -1077,7 +990,6 @@ nb.cluster.stableuc.depends=${clusters.config.full.list} nb.cluster.stableuc=\ apisupport.apidocs,\ avatar_js.project,\ @@ -276,7 +275,7 @@ index 27fb4ec..5459a48 100644 cloud.oracle,\ db.mysql.sakila,\ deployment.deviceanywhere,\ -@@ -1103,7 +1014,6 @@ nb.cluster.stableuc=\ +@@ -1103,7 +1015,6 @@ nb.cluster.stableuc=\ junitlib,\ kenai,\ kenai.kit,\ @@ -284,7 +283,7 @@ index 27fb4ec..5459a48 100644 kenai.ui,\ lib.cvsclient,\ libs.aguiswinglayout,\ -@@ -1112,7 +1022,6 @@ nb.cluster.stableuc=\ +@@ -1112,7 +1023,6 @@ nb.cluster.stableuc=\ libs.oracle.cloud,\ libs.ppawtlayout,\ loadgenerator,\ @@ -292,7 +291,7 @@ index 27fb4ec..5459a48 100644 mobility.antext,\ mobility.cldcplatform.catalog,\ mobility.deployment.ftpscp,\ -@@ -1187,7 +1096,6 @@ nb.cluster.betauc=\ +@@ -1187,7 +1097,6 @@ nb.cluster.betauc=\ contrib/modulemanager,\ contrib/quickfilechooser,\ contrib/selenium,\ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
