[netbeans] 22/49: Refresh netbeans-cluster-properties.patch

Markus Koschany apo-guest at moszumanska.debian.org
Sat Dec 26 20:44:49 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 9fb2b2421ea551d1ff3dcd95e6c56218bf7f624b
Author: Markus Koschany <apo at debian.org>
Date:   Fri Dec 25 18:40:19 2015 +0100

    Refresh netbeans-cluster-properties.patch
---
 debian/patches/netbeans-build.patch                |   4 +-
 debian/patches/netbeans-cluster-properties.patch   | 317 +++++++++++++++++++++
 ...etbeans-platform-disable-net.java-modules.patch |   2 +-
 debian/patches/netbeans-platform-nbi.patch         |   4 +-
 debian/patches/netbeans-spi.java.hints.patch       |   4 +-
 debian/patches/netbeans-updatecenters.patch        |   2 +-
 debian/patches/series                              |   1 +
 7 files changed, 326 insertions(+), 8 deletions(-)

diff --git a/debian/patches/netbeans-build.patch b/debian/patches/netbeans-build.patch
index 8ec3f77..74492d0 100644
--- a/debian/patches/netbeans-build.patch
+++ b/debian/patches/netbeans-build.patch
@@ -11,7 +11,7 @@ Forwarded: not-needed
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/nbbuild/build.xml b/nbbuild/build.xml
-index 67b63dc..db573da 100644
+index 90c7a1a..e008f57 100644
 --- a/nbbuild/build.xml
 +++ b/nbbuild/build.xml
 @@ -145,7 +145,7 @@ made subject to such option by the copyright holder.
@@ -23,7 +23,7 @@ index 67b63dc..db573da 100644
      <resolvelist name="allmodules" list="${nb.clusters.list}"/>
      <pathconvert property="modules.fullpath" >
          <path>
-@@ -304,8 +304,8 @@ made subject to such option by the copyright holder.
+@@ -314,8 +314,8 @@ made subject to such option by the copyright holder.
      <mkdir dir="${netbeans.dest.dir}/bin" />
      <copy file="../ide/launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
      <chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/>
diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch
new file mode 100644
index 0000000..81cb85b
--- /dev/null
+++ b/debian/patches/netbeans-cluster-properties.patch
@@ -0,0 +1,317 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 25 Dec 2015 18:39:51 +0100
+Subject: netbeans cluster properties
+
+Disable modules which are either not supported by us, depend on packages which
+are not in Debian yet or cause other build failures.
+
+Forwarded: not-needed
+---
+ nbbuild/cluster.properties | 103 +--------------------------------------------
+ 1 file changed, 2 insertions(+), 101 deletions(-)
+
+diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
+index c145a5f..931d5a5 100644
+--- a/nbbuild/cluster.properties
++++ b/nbbuild/cluster.properties
+@@ -107,10 +107,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,\
+         nb.cluster.nb
+ 
+ clusters.config.enterprise.list=\
+@@ -297,10 +295,6 @@ nb.cluster.ide=\
+         api.knockout,\
+         api.xml,\
+         api.xml.ui,\
+-        bugtracking,\
+-        bugtracking.bridge,\
+-        bugtracking.commons,\
+-        bugzilla,\
+         c.googlecode.javaewah.JavaEWAH,\
+         c.jcraft.jsch,\
+         c.jcraft.jzlib,\
+@@ -364,7 +358,6 @@ nb.cluster.ide=\
+         extbrowser,\
+         extexecution,\
+         extexecution.base,\
+-        extexecution.impl,\
+         extexecution.process,\
+         git,\
+         gototest,\
+@@ -372,15 +365,10 @@ nb.cluster.ide=\
+         gsf.testrunner,\
+         gsf.testrunner.ui,\
+         html,\
+-        html.angular,\
+         html.custom,\
+         html.editor,\
+         html.editor.lib,\
+-        html.knockout,\
+         html.lexer,\
+-        html.parser,\
+-        html.validation,\
+-        httpserver,\
+         hudson,\
+         hudson.git,\
+         hudson.mercurial,\
+@@ -389,16 +377,6 @@ nb.cluster.ide=\
+ 	hudson.ui,\
+         ide.kit,\
+         image,\
+-        javascript2.debug,\
+-        javascript2.editor,\
+-        javascript2.extjs,\
+-	javascript2.jade,\
+-        javascript2.jquery,\
+-        javascript2.kit,\
+-        javascript2.knockout,\
+-	javascript2.nodejs,\
+-        javascript2.prototypejs,\
+-	javascript2.requirejs,\
+         jellytools.ide,\
+         jumpto,\
+         languages,\
+@@ -419,17 +397,13 @@ nb.cluster.ide=\
+         libs.json_simple,\
+         libs.jvyamlb,\
+         libs.lucene,\
+-        libs.nashorn,\
+-        libs.smack,\
+         libs.svnClientAdapter,\
+         libs.svnClientAdapter.javahl,\
+         libs.svnClientAdapter.svnkit,\
+         libs.swingx,\
+         libs.xerces,\
+         localhistory,\
+-        localtasks,\
+         mercurial,\
+-        mylyn.util,\
+         notifications,\
+         o.apache.commons.codec,\
+         o.apache.commons.httpclient,\
+@@ -438,28 +412,8 @@ nb.cluster.ide=\
+         o.apache.commons.logging,\
+         o.apache.ws.commons.util,\
+         o.apache.xml.resolver,\
+-        o.apache.xmlrpc,\
+-        o.eclipse.core.contenttype,\
+-        o.eclipse.core.jobs,\
+-        o.eclipse.core.net,\
+-        o.eclipse.core.runtime,\
+-        o.eclipse.core.runtime.compatibility.auth,\
+-        o.eclipse.equinox.app,\
+-        o.eclipse.equinox.common,\
+-        o.eclipse.equinox.preferences,\
+-        o.eclipse.equinox.registry,\
+-        o.eclipse.equinox.security,\
+         o.eclipse.jgit,\
+         o.eclipse.jgit.java7,\
+-        o.eclipse.mylyn.bugzilla.core,\
+-        o.eclipse.mylyn.commons.core,\
+-        o.eclipse.mylyn.commons.net,\
+-        o.eclipse.mylyn.commons.repositories.core,\
+-        o.eclipse.mylyn.commons.xmlrpc,\
+-        o.eclipse.mylyn.tasks.core,\
+-        o.eclipse.mylyn.wikitext.confluence.core,\
+-        o.eclipse.mylyn.wikitext.core,\
+-        o.eclipse.mylyn.wikitext.textile.core,\
+         o.n.swing.dirchooser,\
+         o.openidex.util,\
+         options.editor,\
+@@ -495,7 +449,6 @@ nb.cluster.ide=\
+         spellchecker.apimodule,\
+         spellchecker.bindings.htmlxml,\
+         spellchecker.bindings.properties,\
+-        spellchecker.dictionary_en,\
+         spellchecker.kit,\
+         spi.debugger.ui,\
+         spi.editor.hints,\
+@@ -554,7 +507,6 @@ nb.cluster.java.depends=\
+         nb.cluster.ide,\
+         nb.cluster.extide,\
+         nb.cluster.platform,\
+-        nb.cluster.websvccommon,\
+         nb.cluster.harness
+ nb.cluster.java=\
+         ant.browsetask,\
+@@ -564,7 +516,6 @@ nb.cluster.java=\
+         ant.kit,\
+         api.debugger.jpda,\
+         api.java,\
+-        api.maven,\
+         beans,\
+         classfile,\
+         dbschema,\
+@@ -583,21 +534,15 @@ nb.cluster.java=\
+         form.kit,\
+         form.nb,\
+         form.refactoring,\
+-        hibernate,\
+-        hibernate4lib,\
+         hudson.ant,\
+-        hudson.maven,\
+         i18n,\
+         i18n.form,\
+         j2ee.core.utilities,\
+         j2ee.eclipselink,\
+         j2ee.eclipselinkmodelgen,\
+-        j2ee.jpa.refactoring,\
+-        j2ee.jpa.verification,\
+         j2ee.metadata,\
+         j2ee.metadata.model.support,\
+         j2ee.persistence,\
+-        j2ee.persistence.kit,\
+         j2ee.persistenceapi,\
+         java.api.common,\
+         java.completion,\
+@@ -650,26 +595,6 @@ nb.cluster.java=\
+         libs.cglib,\
+         libs.javacapi,\
+         libs.javacimpl,\
+-        libs.springframework,\
+-        maven,\
+-        maven.checkstyle,\
+-        maven.coverage,\
+-        maven.embedder,\
+-        maven.grammar,\
+-        maven.graph,\
+-        maven.hints,\
+-        maven.indexer,\
+-        maven.indexer.ui,\
+-        maven.junit,\
+-        maven.junit.ui,\
+-        maven.kit,\
+-        maven.model,\
+-        maven.osgi,\
+-        maven.persistence,\
+-        maven.refactoring,\
+-        maven.repository,\
+-        maven.search,\
+-        maven.spring,\
+         nashorn.execution,\
+         o.jdesktop.beansbinding,\
+         performance,\
+@@ -682,14 +607,9 @@ nb.cluster.java=\
+         spellchecker.bindings.java,\
+         spi.debugger.jpda.ui,\
+         spi.java.hints,\
+-        spring.beans,\
+         testng,\
+         testng.ant,\
+-        testng.maven,\
+         testng.ui,\
+-        websvc.jaxws21,\
+-        websvc.jaxws21api,\
+-        websvc.saas.codegen.java,\
+         whitelist,\
+         xml.jaxb,\
+         xml.tools.java
+@@ -707,15 +627,10 @@ nb.cluster.apisupport.depends=\
+ nb.cluster.apisupport=\
+         apisupport.ant,\
+         apisupport.crudsample,\
+-        apisupport.feedreader,\
+-        apisupport.installer,\
+-        apisupport.installer.maven,\
+         apisupport.kit,\
+         apisupport.osgidemo,\
+         apisupport.paintapp,\
+-        apisupport.refactoring,\
+-        apisupport.wizards,\
+-        maven.apisupport
++        apisupport.refactoring
+ 
+ nb.cluster.enterprise.dir=enterprise
+ nb.cluster.enterprise.depends=\
+@@ -729,7 +644,6 @@ nb.cluster.enterprise.depends=\
+         nb.cluster.harness
+ nb.cluster.enterprise=\
+         api.web.webmodule,\
+-        apisupport.restsample,\
+         cloud.amazon,\
+         cloud.common,\
+         el.lexer,\
+@@ -777,9 +691,6 @@ nb.cluster.enterprise=\
+         libs.elimpl,\
+         libs.glassfish_logging,\
+         libs.jstl,\
+-        maven.j2ee,\
+-        maven.jaxws,\
+-        maven.samples,\
+         performance.javaee,\
+         performance.scripting,\
+         performance.web,\
+@@ -857,7 +768,6 @@ nb.cluster.nb.depends=\
+         nb.cluster.harness
+ nb.cluster.nb=\
+         autoupdate.pluginimporter,\
+-        bugzilla.exceptionreporter,\
+         deadlock.detector,\
+         ide.branding,\
+         ide.branding.kit,\
+@@ -887,7 +797,6 @@ nb.cluster.profiler=\
+         lib.profiler.charts,\
+         lib.profiler.common,\
+         lib.profiler.ui,\
+-        maven.profiler,\
+         profiler,\
+         profiler.api,\
+         profiler.attach,\
+@@ -971,9 +880,7 @@ nb.cluster.groovy=\
+         groovy.kit,\
+         groovy.refactoring,\
+         groovy.samples,\
+-        groovy.support,\
+-        libs.groovy,\
+-        maven.groovy
++        groovy.support
+ 
+ nb.cluster.mobility.dir=mobility
+ nb.cluster.mobility.depends=\
+@@ -1120,8 +1027,6 @@ nb.cluster.jira=\
+         o.apache.axis,\
+         o.apache.commons.discovery,\
+         o.codehaus.jettison,\
+-        o.eclipse.mylyn.commons.soap,\
+-        o.eclipse.mylyn.monitor.ui.dummy,\
+         o.joda.time
+ 
+ nb.cluster.team.dir=extra
+@@ -1130,7 +1035,6 @@ nb.cluster.team.depends=\
+         nb.cluster.platform,\
+         nb.cluster.ide
+ nb.cluster.team=\
+-        bugtracking.kenai,\
+         c.tasktop.c2c.server.cloud.api,\
+         c.tasktop.c2c.server.common.api,\
+         c.tasktop.c2c.server.profile.api,\
+@@ -1139,7 +1043,6 @@ nb.cluster.team=\
+         c.tasktop.c2c.server.wiki.api,\
+         kenai,\
+         kenai.kit,\
+-        kenai.maven,\
+         kenai.ui,\
+         lib.cvsclient,\
+         o.codehaus.jackson.core,\
+@@ -1193,7 +1096,6 @@ nb.cluster.stableuc=\
+         libs.oracle.cloud,\
+         libs.ppawtlayout,\
+         loadgenerator,\
+-	maven.util,\
+         mobility.antext,\
+         mobility.cldcplatform.catalog,\
+         mobility.deployment.ftpscp,\
+@@ -1266,7 +1168,6 @@ nb.cluster.betauc=\
+         contrib/modulemanager,\
+         contrib/quickfilechooser,\
+         contrib/selenium,\
+-        contrib/selenium.maven,\
+         contrib/selenium.php,\
+         contrib/selenium.server,\
+         o.apache.jmeter.module,\
diff --git a/debian/patches/netbeans-platform-disable-net.java-modules.patch b/debian/patches/netbeans-platform-disable-net.java-modules.patch
index 9c0543b..6625a76 100644
--- a/debian/patches/netbeans-platform-disable-net.java-modules.patch
+++ b/debian/patches/netbeans-platform-disable-net.java-modules.patch
@@ -24,7 +24,7 @@ index 8e3826a..3c780eb 100644
      api.io,\
      api.knockout,\
 diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index fce0fcb..776c7d4 100644
+index 9b1177a..36b0988 100644
 --- a/nbbuild/cluster.properties
 +++ b/nbbuild/cluster.properties
 @@ -201,7 +201,6 @@ nb.cluster.platform.dir=platform
diff --git a/debian/patches/netbeans-platform-nbi.patch b/debian/patches/netbeans-platform-nbi.patch
index cfd41d1..e063c53 100644
--- a/debian/patches/netbeans-platform-nbi.patch
+++ b/debian/patches/netbeans-platform-nbi.patch
@@ -9,10 +9,10 @@ Forwarded: not-needed
  1 file changed, 2 deletions(-)
 
 diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 9b1177a..fce0fcb 100644
+index 36b0988..776c7d4 100644
 --- a/nbbuild/cluster.properties
 +++ b/nbbuild/cluster.properties
-@@ -883,8 +883,6 @@ nb.cluster.harness=\
+@@ -875,8 +875,6 @@ nb.cluster.harness=\
          apisupport.harness,\
          jellytools.platform,\
          jemmy,\
diff --git a/debian/patches/netbeans-spi.java.hints.patch b/debian/patches/netbeans-spi.java.hints.patch
index 33e02db..a0eb7a9 100644
--- a/debian/patches/netbeans-spi.java.hints.patch
+++ b/debian/patches/netbeans-spi.java.hints.patch
@@ -10,10 +10,10 @@ Forwarded: not-needed
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
-index c6a87b8..29da027 100644
+index 8b98f4f..3248033 100644
 --- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
 +++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
-@@ -1529,9 +1529,9 @@ public class Utilities {
+@@ -1575,9 +1575,9 @@ public class Utilities {
                      @Override public int getEndPos(JCTree tree) {
                          return (int) sp.getEndPosition(null, tree);
                      }
diff --git a/debian/patches/netbeans-updatecenters.patch b/debian/patches/netbeans-updatecenters.patch
index 0a97c1f..cabc8f7 100644
--- a/debian/patches/netbeans-updatecenters.patch
+++ b/debian/patches/netbeans-updatecenters.patch
@@ -11,7 +11,7 @@ Forwarded: not-needed
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml b/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
-index 46daa72..7c5acd0 100644
+index 6ea6ac0..63b4a60 100644
 --- a/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
 +++ b/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
 @@ -55,7 +55,7 @@ made subject to such option by the copyright holder.
diff --git a/debian/patches/series b/debian/patches/series
index 56d500f..3133fe7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ netbeans-xml.jaxb.api.patch
 netbeans-build.patch
 netbeans-updatecenters.patch
 reproducible-build.patch
+netbeans-cluster-properties.patch

-- 
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