This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit 0d799b3bfb5fcc3834a6c4da8f8ee82fe7154887 Author: Markus Koschany <[email protected]> Date: Tue Jun 30 02:35:56 2015 +0200 Revert "Merge branch 'profiler'" This reverts commit 60c9a56b0e3a2f36603013a651798f1f288aa699, reversing changes made to ca393b93435b713332099ebc13ab74be4874b12f. --- debian/control | 1 - debian/patches/netbeans-cluster-properties.patch | 57 +++++++++++++----------- debian/patches/netbeans-include-junit.patch | 6 +-- debian/patches/netbeans-profiler.patch | 36 --------------- debian/patches/netbeans-slf4j.dummy.patch | 4 +- debian/patches/series | 1 - debian/rules | 14 +----- 7 files changed, 37 insertions(+), 82 deletions(-) diff --git a/debian/control b/debian/control index b8ead0e..5cc0369 100644 --- a/debian/control +++ b/debian/control @@ -170,7 +170,6 @@ Depends: libnb-ide14-java (= ${binary:Version}), libnb-java5-java (= ${binary:Version}), libnb-platform18-java (>= 8.0.2), - libvisualvm-jni, ${java:Depends}, ${misc:Depends} Description: Extensible Java IDE diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch index 2d3b331..dd10ac6 100644 --- a/debian/patches/netbeans-cluster-properties.patch +++ b/debian/patches/netbeans-cluster-properties.patch @@ -7,22 +7,25 @@ are not in Debian yet or cause other build failures. Forwarded: not-needed --- - nbbuild/cluster.properties | 96 +--------------------------------------------- - 1 file changed, 2 insertions(+), 94 deletions(-) + nbbuild/cluster.properties | 97 +--------------------------------------------- + 1 file changed, 2 insertions(+), 95 deletions(-) diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 27fb4ec..e49f66d 100644 +index 27fb4ec..1da0278 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties -@@ -104,7 +104,6 @@ clusters.config.java.list=\ +@@ -104,10 +104,8 @@ 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,\ -@@ -267,10 +266,6 @@ nb.cluster.ide=\ +- nb.cluster.profiler,\ + nb.cluster.nb + + clusters.config.enterprise.list=\ +@@ -267,10 +265,6 @@ nb.cluster.ide=\ api.debugger,\ api.java.classpath,\ api.xml,\ @@ -33,7 +36,7 @@ index 27fb4ec..e49f66d 100644 c.jcraft.jsch,\ c.jcraft.jzlib,\ code.analysis,\ -@@ -329,21 +324,15 @@ nb.cluster.ide=\ +@@ -329,21 +323,15 @@ nb.cluster.ide=\ editor.util,\ extbrowser,\ extexecution,\ @@ -55,7 +58,7 @@ index 27fb4ec..e49f66d 100644 hudson,\ hudson.git,\ hudson.mercurial,\ -@@ -354,13 +343,6 @@ nb.cluster.ide=\ +@@ -354,13 +342,6 @@ nb.cluster.ide=\ image,\ javaewah.dummy,\ javascript2.debug,\ @@ -69,7 +72,7 @@ index 27fb4ec..e49f66d 100644 jellytools.ide,\ jumpto,\ languages,\ -@@ -381,17 +363,13 @@ nb.cluster.ide=\ +@@ -381,17 +362,13 @@ nb.cluster.ide=\ libs.json_simple,\ libs.jvyamlb,\ libs.lucene,\ @@ -87,7 +90,7 @@ index 27fb4ec..e49f66d 100644 notifications,\ o.apache.commons.codec,\ o.apache.commons.httpclient,\ -@@ -400,28 +378,8 @@ nb.cluster.ide=\ +@@ -400,28 +377,8 @@ nb.cluster.ide=\ o.apache.commons.logging,\ o.apache.ws.commons.util,\ o.apache.xml.resolver,\ @@ -116,7 +119,7 @@ index 27fb4ec..e49f66d 100644 o.n.swing.dirchooser,\ o.openidex.util,\ options.editor,\ -@@ -446,7 +404,6 @@ nb.cluster.ide=\ +@@ -446,7 +403,6 @@ nb.cluster.ide=\ spellchecker.apimodule,\ spellchecker.bindings.htmlxml,\ spellchecker.bindings.properties,\ @@ -124,7 +127,7 @@ index 27fb4ec..e49f66d 100644 spellchecker.kit,\ spi.debugger.ui,\ spi.editor.hints,\ -@@ -504,7 +461,6 @@ nb.cluster.java.depends=\ +@@ -504,7 +460,6 @@ nb.cluster.java.depends=\ nb.cluster.ide,\ nb.cluster.extide,\ nb.cluster.platform,\ @@ -132,7 +135,7 @@ index 27fb4ec..e49f66d 100644 nb.cluster.harness nb.cluster.java=\ ant.browsetask,\ -@@ -514,7 +470,6 @@ nb.cluster.java=\ +@@ -514,7 +469,6 @@ nb.cluster.java=\ ant.kit,\ api.debugger.jpda,\ api.java,\ @@ -140,7 +143,7 @@ index 27fb4ec..e49f66d 100644 beans,\ classfile,\ dbschema,\ -@@ -532,21 +487,15 @@ nb.cluster.java=\ +@@ -532,21 +486,15 @@ nb.cluster.java=\ form.kit,\ form.nb,\ form.refactoring,\ @@ -162,7 +165,7 @@ index 27fb4ec..e49f66d 100644 j2ee.persistenceapi,\ java.api.common,\ java.debug,\ -@@ -588,24 +537,6 @@ nb.cluster.java=\ +@@ -588,24 +536,6 @@ nb.cluster.java=\ libs.cglib,\ libs.javacapi,\ libs.javacimpl,\ @@ -187,7 +190,7 @@ index 27fb4ec..e49f66d 100644 nashorn.execution,\ o.jdesktop.beansbinding,\ performance,\ -@@ -615,13 +546,8 @@ nb.cluster.java=\ +@@ -615,13 +545,8 @@ nb.cluster.java=\ refactoring.java,\ spellchecker.bindings.java,\ spi.java.hints,\ @@ -201,7 +204,7 @@ index 27fb4ec..e49f66d 100644 whitelist,\ xml.jaxb,\ xml.tools.java -@@ -639,16 +565,12 @@ nb.cluster.apisupport.depends=\ +@@ -639,16 +564,12 @@ nb.cluster.apisupport.depends=\ nb.cluster.apisupport=\ apisupport.ant,\ apisupport.crudsample,\ @@ -219,7 +222,7 @@ index 27fb4ec..e49f66d 100644 nb.cluster.enterprise.dir=enterprise nb.cluster.enterprise.depends=\ -@@ -662,7 +584,6 @@ nb.cluster.enterprise.depends=\ +@@ -662,7 +583,6 @@ nb.cluster.enterprise.depends=\ nb.cluster.harness nb.cluster.enterprise=\ api.web.webmodule,\ @@ -227,7 +230,7 @@ index 27fb4ec..e49f66d 100644 cloud.amazon,\ cloud.common,\ el.lexer,\ -@@ -710,9 +631,6 @@ nb.cluster.enterprise=\ +@@ -710,9 +630,6 @@ nb.cluster.enterprise=\ libs.glassfish.sdk,\ libs.glassfish_logging,\ libs.jstl,\ @@ -237,7 +240,7 @@ index 27fb4ec..e49f66d 100644 performance.javaee,\ performance.scripting,\ performance.web,\ -@@ -789,7 +707,6 @@ nb.cluster.nb.depends=\ +@@ -789,7 +706,6 @@ nb.cluster.nb.depends=\ nb.cluster.harness nb.cluster.nb=\ autoupdate.pluginimporter,\ @@ -245,7 +248,7 @@ index 27fb4ec..e49f66d 100644 deadlock.detector,\ ide.branding,\ ide.branding.kit,\ -@@ -819,7 +736,6 @@ nb.cluster.profiler=\ +@@ -819,7 +735,6 @@ nb.cluster.profiler=\ lib.profiler.charts,\ lib.profiler.common,\ lib.profiler.ui,\ @@ -253,7 +256,7 @@ index 27fb4ec..e49f66d 100644 profiler,\ profiler.api,\ profiler.attach,\ -@@ -905,9 +821,7 @@ nb.cluster.groovy=\ +@@ -905,9 +820,7 @@ nb.cluster.groovy=\ groovy.refactoring,\ groovy.samples,\ groovy.support,\ @@ -264,7 +267,7 @@ index 27fb4ec..e49f66d 100644 nb.cluster.mobility.dir=mobility nb.cluster.mobility.depends=\ nb.cluster.platform,\ -@@ -1042,8 +956,6 @@ nb.cluster.jira=\ +@@ -1042,8 +955,6 @@ nb.cluster.jira=\ o.apache.axis,\ o.apache.commons.discovery,\ o.codehaus.jettison,\ @@ -273,7 +276,7 @@ index 27fb4ec..e49f66d 100644 o.joda.time nb.cluster.odcs.dir=extra -@@ -1077,7 +989,6 @@ nb.cluster.stableuc.depends=${clusters.config.full.list} +@@ -1077,7 +988,6 @@ nb.cluster.stableuc.depends=${clusters.config.full.list} nb.cluster.stableuc=\ apisupport.apidocs,\ avatar_js.project,\ @@ -281,7 +284,7 @@ index 27fb4ec..e49f66d 100644 cloud.oracle,\ db.mysql.sakila,\ deployment.deviceanywhere,\ -@@ -1103,7 +1014,6 @@ nb.cluster.stableuc=\ +@@ -1103,7 +1013,6 @@ nb.cluster.stableuc=\ junitlib,\ kenai,\ kenai.kit,\ @@ -289,7 +292,7 @@ index 27fb4ec..e49f66d 100644 kenai.ui,\ lib.cvsclient,\ libs.aguiswinglayout,\ -@@ -1112,7 +1022,6 @@ nb.cluster.stableuc=\ +@@ -1112,7 +1021,6 @@ nb.cluster.stableuc=\ libs.oracle.cloud,\ libs.ppawtlayout,\ loadgenerator,\ @@ -297,7 +300,7 @@ index 27fb4ec..e49f66d 100644 mobility.antext,\ mobility.cldcplatform.catalog,\ mobility.deployment.ftpscp,\ -@@ -1187,7 +1096,6 @@ nb.cluster.betauc=\ +@@ -1187,7 +1095,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 738e13b..2797406 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 3dbe30e..0cec190 100644 +index 910581e..10ce18f 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties -@@ -534,6 +534,7 @@ nb.cluster.java=\ +@@ -533,6 +533,7 @@ nb.cluster.java=\ javawebstart,\ jellytools.java,\ junit,\ @@ -668,7 +668,7 @@ index 3dbe30e..0cec190 100644 lib.nbjavac,\ libs.cglib,\ libs.javacapi,\ -@@ -1012,7 +1013,6 @@ nb.cluster.stableuc=\ +@@ -1011,7 +1012,6 @@ nb.cluster.stableuc=\ jconsole,\ jmx,\ jmx.common,\ diff --git a/debian/patches/netbeans-profiler.patch b/debian/patches/netbeans-profiler.patch deleted file mode 100644 index 5a73233..0000000 --- a/debian/patches/netbeans-profiler.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sun, 28 Jun 2015 23:21:16 +0200 -Subject: netbeans profiler - ---- - lib.profiler/release/remote-pack-defs/build.xml | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/lib.profiler/release/remote-pack-defs/build.xml b/lib.profiler/release/remote-pack-defs/build.xml -index 6819795..2f317f5 100644 ---- a/lib.profiler/release/remote-pack-defs/build.xml -+++ b/lib.profiler/release/remote-pack-defs/build.xml -@@ -227,9 +227,9 @@ made subject to such option by the copyright holder. - <fileset file="${lib.dir}/jfluid-server-${jdk-version}.jar" /> - </copy> - <mkdir dir="${build.dir}/lib/deployed/${jdk-version}"/> -- <copy todir="${build.dir}/lib/deployed/${jdk-version}/${os-long-version}"> -+ <!--<copy todir="${build.dir}/lib/deployed/${jdk-version}/${os-long-version}"> - <fileset dir="${profiler.cluster}/lib/deployed/${jdk-version}/${os-long-version}" /> -- </copy> -+ </copy>--> - <antcall target="profiler-server-zip-unix"> - <param name="os-version" value="${os-version}cvm"/> - </antcall> -@@ -286,9 +286,9 @@ made subject to such option by the copyright holder. - <fileset file="${lib.dir}/jfluid-server-${jdk-version}.jar" /> - </copy> - <mkdir dir="${build.dir}/lib/deployed/jdk${jdk-version}"/> -- <copy todir="${build.dir}/lib/deployed/jdk${jdk-version}/${os-long-version}"> -+ <!--<copy todir="${build.dir}/lib/deployed/jdk${jdk-version}/${os-long-version}"> - <fileset dir="${profiler.cluster}/lib/deployed/jdk${jdk-version}/${os-long-version}" /> -- </copy> -+ </copy>--> - </target> - - <target name="profiler-server-zip-unix"> diff --git a/debian/patches/netbeans-slf4j.dummy.patch b/debian/patches/netbeans-slf4j.dummy.patch index 2ece10a..64ec842 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 e49f66d..3dbe30e 100644 +index 1da0278..910581e 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties -@@ -342,6 +342,7 @@ nb.cluster.ide=\ +@@ -341,6 +341,7 @@ nb.cluster.ide=\ ide.kit,\ image,\ javaewah.dummy,\ diff --git a/debian/patches/series b/debian/patches/series index df06d36..dc9d329 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -28,4 +28,3 @@ netbeans-slf4j.dummy.patch netbeans-platform-o.n.bootstrap.patch netbeans-include-junit.patch reproducible-build.patch -netbeans-profiler.patch diff --git a/debian/rules b/debian/rules index 218ac4f..f4f25b3 100755 --- a/debian/rules +++ b/debian/rules @@ -128,21 +128,11 @@ override_dh_auto_install: $(INSTALL)$(pkg-nb) nbbuild/netbeans/CREDITS.html usr/share/$(pkg-nb) $(INSTALL)$(pkg-nb) nbbuild/netbeans/README.html usr/share/$(pkg-nb) $(INSTALL)$(pkg-nb) nbbuild/netbeans/netbeans.css usr/share/$(pkg-nb) - $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/$(base-platform) $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/platform - $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/harness $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/harness + $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/$(base-platform) $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/platform + $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/harness $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/harness $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/$(base-apisupport) $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/apisupport $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/$(base-ide) $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/ide $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/$(base-java) $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/java - # Install profiler cluster into netbeans package and link to libvisualvm-jni libraries - $(INSTALL)$(pkg-nb) nbbuild/netbeans/profiler/* $(NB_INSTALL_DIR)/profiler - $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/profiler $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/profiler - $(LINK)$(pkg-nb) /usr/lib/jni/libprofilerinterface-jdk16.so $(NB_INSTALL_DIR)/profiler/lib/deployed/jdk16/linux/libprofilerinterface.so - $(LINK)$(pkg-nb) /usr/lib/jni/libprofilerinterface-jdk16.so $(NB_INSTALL_DIR)/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so - $(LINK)$(pkg-nb) /usr/lib/jni/libprofilerinterface-jdk16.so $(NB_INSTALL_DIR)/profiler/lib/deployed/jdk16/linux-arm/libprofilerinterface.so - $(LINK)$(pkg-nb) /usr/lib/jni/libprofilerinterface-jdk15.so $(NB_INSTALL_DIR)/profiler/lib/deployed/jdk15/linux/libprofilerinterface.so - $(LINK)$(pkg-nb) /usr/lib/jni/libprofilerinterface-jdk15.so $(NB_INSTALL_DIR)/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so - $(LINK)$(pkg-nb) /usr/lib/jni/libprofilerinterface-jdk15.so $(NB_INSTALL_DIR)/profiler/lib/deployed/jdk15/linux-arm/libprofilerinterface.so - # Symlink netbeans icon to the appropriate hicolor directory $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/nb/netbeans.png \ /usr/share/icons/hicolor/32x32/apps/netbeans.png -- 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
