This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch profiler in repository netbeans.
commit 56da17cf37c741f5474ceed71ecd3c841f3cf811 Author: Markus Koschany <[email protected]> Date: Sun Jun 28 22:44:43 2015 +0200 Enable the profiler module --- debian/patches/netbeans-cluster-properties.patch | 57 +++++++++++------------- debian/patches/netbeans-include-junit.patch | 6 +-- debian/patches/netbeans-slf4j.dummy.patch | 4 +- 3 files changed, 32 insertions(+), 35 deletions(-) diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch index dd10ac6..2d3b331 100644 --- a/debian/patches/netbeans-cluster-properties.patch +++ b/debian/patches/netbeans-cluster-properties.patch @@ -7,25 +7,22 @@ are not in Debian yet or cause other build failures. Forwarded: not-needed --- - 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..1da0278 100644 +index 27fb4ec..e49f66d 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties -@@ -104,10 +104,8 @@ clusters.config.java.list=\ +@@ -104,7 +104,6 @@ clusters.config.java.list=\ ${clusters.config.platform.list},\ nb.cluster.ide,\ nb.cluster.extide,\ - nb.cluster.websvccommon,\ nb.cluster.java,\ nb.cluster.javafx,\ -- nb.cluster.profiler,\ - nb.cluster.nb - - clusters.config.enterprise.list=\ -@@ -267,10 +265,6 @@ nb.cluster.ide=\ + nb.cluster.profiler,\ +@@ -267,10 +266,6 @@ nb.cluster.ide=\ api.debugger,\ api.java.classpath,\ api.xml,\ @@ -36,7 +33,7 @@ index 27fb4ec..1da0278 100644 c.jcraft.jsch,\ c.jcraft.jzlib,\ code.analysis,\ -@@ -329,21 +323,15 @@ nb.cluster.ide=\ +@@ -329,21 +324,15 @@ nb.cluster.ide=\ editor.util,\ extbrowser,\ extexecution,\ @@ -58,7 +55,7 @@ index 27fb4ec..1da0278 100644 hudson,\ hudson.git,\ hudson.mercurial,\ -@@ -354,13 +342,6 @@ nb.cluster.ide=\ +@@ -354,13 +343,6 @@ nb.cluster.ide=\ image,\ javaewah.dummy,\ javascript2.debug,\ @@ -72,7 +69,7 @@ index 27fb4ec..1da0278 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,\ @@ -90,7 +87,7 @@ index 27fb4ec..1da0278 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,\ @@ -119,7 +116,7 @@ index 27fb4ec..1da0278 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,\ @@ -127,7 +124,7 @@ index 27fb4ec..1da0278 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,\ @@ -135,7 +132,7 @@ index 27fb4ec..1da0278 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,\ @@ -143,7 +140,7 @@ index 27fb4ec..1da0278 100644 beans,\ classfile,\ dbschema,\ -@@ -532,21 +486,15 @@ nb.cluster.java=\ +@@ -532,21 +487,15 @@ nb.cluster.java=\ form.kit,\ form.nb,\ form.refactoring,\ @@ -165,7 +162,7 @@ index 27fb4ec..1da0278 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,\ @@ -190,7 +187,7 @@ index 27fb4ec..1da0278 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,\ @@ -204,7 +201,7 @@ index 27fb4ec..1da0278 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,\ @@ -222,7 +219,7 @@ index 27fb4ec..1da0278 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,\ @@ -230,7 +227,7 @@ index 27fb4ec..1da0278 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,\ @@ -240,7 +237,7 @@ index 27fb4ec..1da0278 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,\ @@ -248,7 +245,7 @@ index 27fb4ec..1da0278 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,\ @@ -256,7 +253,7 @@ index 27fb4ec..1da0278 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,\ @@ -267,7 +264,7 @@ index 27fb4ec..1da0278 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,\ @@ -276,7 +273,7 @@ index 27fb4ec..1da0278 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,\ @@ -284,7 +281,7 @@ index 27fb4ec..1da0278 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,\ @@ -292,7 +289,7 @@ index 27fb4ec..1da0278 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,\ @@ -300,7 +297,7 @@ index 27fb4ec..1da0278 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-include-junit.patch b/debian/patches/netbeans-include-junit.patch index 2797406..738e13b 100644 --- a/debian/patches/netbeans-include-junit.patch +++ b/debian/patches/netbeans-include-junit.patch @@ -657,10 +657,10 @@ index 0000000..40640f8 + </folder> +</filesystem> diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 910581e..10ce18f 100644 +index 3dbe30e..0cec190 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties -@@ -533,6 +533,7 @@ nb.cluster.java=\ +@@ -534,6 +534,7 @@ nb.cluster.java=\ javawebstart,\ jellytools.java,\ junit,\ @@ -668,7 +668,7 @@ index 910581e..10ce18f 100644 lib.nbjavac,\ libs.cglib,\ libs.javacapi,\ -@@ -1011,7 +1012,6 @@ nb.cluster.stableuc=\ +@@ -1012,7 +1013,6 @@ nb.cluster.stableuc=\ jconsole,\ jmx,\ jmx.common,\ diff --git a/debian/patches/netbeans-slf4j.dummy.patch b/debian/patches/netbeans-slf4j.dummy.patch index 64ec842..2ece10a 100644 --- a/debian/patches/netbeans-slf4j.dummy.patch +++ b/debian/patches/netbeans-slf4j.dummy.patch @@ -26,10 +26,10 @@ Forwarded: not-needed create mode 100644 slf4j.dummy/nbproject/project.xml diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 1da0278..910581e 100644 +index e49f66d..3dbe30e 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties -@@ -341,6 +341,7 @@ nb.cluster.ide=\ +@@ -342,6 +342,7 @@ nb.cluster.ide=\ ide.kit,\ image,\ javaewah.dummy,\ -- 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
