[netbeans] 13/13: Disable html.parser and html.validation.

Markus Koschany apo-guest at moszumanska.debian.org
Thu Jun 11 22:38:20 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 b1c1f5968f619c75df55f47ce9015a7fc28da6df
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Jun 12 00:08:26 2015 +0200

    Disable html.parser and html.validation.
---
 debian/patches/netbeans-cluster-properties.patch | 52 ++++++++++++------------
 debian/patches/netbeans-small-ide.patch          |  8 ++--
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch
index 0dee9f3..bbe9461 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 | 95 +---------------------------------------------
- 1 file changed, 2 insertions(+), 93 deletions(-)
+ nbbuild/cluster.properties | 97 +---------------------------------------------
+ 1 file changed, 2 insertions(+), 95 deletions(-)
 
 diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 27fb4ec..47ba3a0 100644
+index 27fb4ec..8896d74 100644
 --- a/nbbuild/cluster.properties
 +++ b/nbbuild/cluster.properties
 @@ -104,10 +104,8 @@ clusters.config.java.list=\
@@ -32,7 +32,7 @@ index 27fb4ec..47ba3a0 100644
          c.jcraft.jsch,\
          c.jcraft.jzlib,\
          code.analysis,\
-@@ -335,15 +329,12 @@ nb.cluster.ide=\
+@@ -335,15 +329,10 @@ nb.cluster.ide=\
          gsf.codecoverage,\
          gsf.testrunner,\
          html,\
@@ -42,13 +42,13 @@ index 27fb4ec..47ba3a0 100644
          html.editor.lib,\
 -        html.knockout,\
          html.lexer,\
-         html.parser,\
-         html.validation,\
+-        html.parser,\
+-        html.validation,\
 -        httpserver,\
          hudson,\
          hudson.git,\
          hudson.mercurial,\
-@@ -353,14 +344,6 @@ nb.cluster.ide=\
+@@ -353,14 +342,6 @@ nb.cluster.ide=\
          ide.kit,\
          image,\
          javaewah.dummy,\
@@ -63,7 +63,7 @@ index 27fb4ec..47ba3a0 100644
          jellytools.ide,\
          jumpto,\
          languages,\
-@@ -381,17 +364,13 @@ nb.cluster.ide=\
+@@ -381,17 +362,13 @@ nb.cluster.ide=\
          libs.json_simple,\
          libs.jvyamlb,\
          libs.lucene,\
@@ -81,7 +81,7 @@ index 27fb4ec..47ba3a0 100644
          notifications,\
          o.apache.commons.codec,\
          o.apache.commons.httpclient,\
-@@ -400,28 +379,8 @@ nb.cluster.ide=\
+@@ -400,28 +377,8 @@ nb.cluster.ide=\
          o.apache.commons.logging,\
          o.apache.ws.commons.util,\
          o.apache.xml.resolver,\
@@ -110,7 +110,7 @@ index 27fb4ec..47ba3a0 100644
          o.n.swing.dirchooser,\
          o.openidex.util,\
          options.editor,\
-@@ -446,7 +405,6 @@ nb.cluster.ide=\
+@@ -446,7 +403,6 @@ nb.cluster.ide=\
          spellchecker.apimodule,\
          spellchecker.bindings.htmlxml,\
          spellchecker.bindings.properties,\
@@ -118,7 +118,7 @@ index 27fb4ec..47ba3a0 100644
          spellchecker.kit,\
          spi.debugger.ui,\
          spi.editor.hints,\
-@@ -504,7 +462,6 @@ nb.cluster.java.depends=\
+@@ -504,7 +460,6 @@ nb.cluster.java.depends=\
          nb.cluster.ide,\
          nb.cluster.extide,\
          nb.cluster.platform,\
@@ -126,7 +126,7 @@ index 27fb4ec..47ba3a0 100644
          nb.cluster.harness
  nb.cluster.java=\
          ant.browsetask,\
-@@ -514,7 +471,6 @@ nb.cluster.java=\
+@@ -514,7 +469,6 @@ nb.cluster.java=\
          ant.kit,\
          api.debugger.jpda,\
          api.java,\
@@ -134,7 +134,7 @@ index 27fb4ec..47ba3a0 100644
          beans,\
          classfile,\
          dbschema,\
-@@ -532,21 +488,15 @@ nb.cluster.java=\
+@@ -532,21 +486,15 @@ nb.cluster.java=\
          form.kit,\
          form.nb,\
          form.refactoring,\
@@ -156,7 +156,7 @@ index 27fb4ec..47ba3a0 100644
          j2ee.persistenceapi,\
          java.api.common,\
          java.debug,\
-@@ -588,24 +538,6 @@ nb.cluster.java=\
+@@ -588,24 +536,6 @@ nb.cluster.java=\
          libs.cglib,\
          libs.javacapi,\
          libs.javacimpl,\
@@ -181,7 +181,7 @@ index 27fb4ec..47ba3a0 100644
          nashorn.execution,\
          o.jdesktop.beansbinding,\
          performance,\
-@@ -615,13 +547,8 @@ nb.cluster.java=\
+@@ -615,13 +545,8 @@ nb.cluster.java=\
          refactoring.java,\
          spellchecker.bindings.java,\
          spi.java.hints,\
@@ -195,7 +195,7 @@ index 27fb4ec..47ba3a0 100644
          whitelist,\
          xml.jaxb,\
          xml.tools.java
-@@ -639,16 +566,12 @@ nb.cluster.apisupport.depends=\
+@@ -639,16 +564,12 @@ nb.cluster.apisupport.depends=\
  nb.cluster.apisupport=\
          apisupport.ant,\
          apisupport.crudsample,\
@@ -213,7 +213,7 @@ index 27fb4ec..47ba3a0 100644
  
  nb.cluster.enterprise.dir=enterprise
  nb.cluster.enterprise.depends=\
-@@ -662,7 +585,6 @@ nb.cluster.enterprise.depends=\
+@@ -662,7 +583,6 @@ nb.cluster.enterprise.depends=\
          nb.cluster.harness
  nb.cluster.enterprise=\
          api.web.webmodule,\
@@ -221,7 +221,7 @@ index 27fb4ec..47ba3a0 100644
          cloud.amazon,\
          cloud.common,\
          el.lexer,\
-@@ -710,9 +632,6 @@ nb.cluster.enterprise=\
+@@ -710,9 +630,6 @@ nb.cluster.enterprise=\
          libs.glassfish.sdk,\
          libs.glassfish_logging,\
          libs.jstl,\
@@ -231,7 +231,7 @@ index 27fb4ec..47ba3a0 100644
          performance.javaee,\
          performance.scripting,\
          performance.web,\
-@@ -789,7 +708,6 @@ nb.cluster.nb.depends=\
+@@ -789,7 +706,6 @@ nb.cluster.nb.depends=\
          nb.cluster.harness
  nb.cluster.nb=\
          autoupdate.pluginimporter,\
@@ -239,7 +239,7 @@ index 27fb4ec..47ba3a0 100644
          deadlock.detector,\
          ide.branding,\
          ide.branding.kit,\
-@@ -819,7 +737,6 @@ nb.cluster.profiler=\
+@@ -819,7 +735,6 @@ nb.cluster.profiler=\
          lib.profiler.charts,\
          lib.profiler.common,\
          lib.profiler.ui,\
@@ -247,7 +247,7 @@ index 27fb4ec..47ba3a0 100644
          profiler,\
          profiler.api,\
          profiler.attach,\
-@@ -905,9 +822,7 @@ nb.cluster.groovy=\
+@@ -905,9 +820,7 @@ nb.cluster.groovy=\
          groovy.refactoring,\
          groovy.samples,\
          groovy.support,\
@@ -258,7 +258,7 @@ index 27fb4ec..47ba3a0 100644
  nb.cluster.mobility.dir=mobility
  nb.cluster.mobility.depends=\
          nb.cluster.platform,\
-@@ -1042,8 +957,6 @@ nb.cluster.jira=\
+@@ -1042,8 +955,6 @@ nb.cluster.jira=\
          o.apache.axis,\
          o.apache.commons.discovery,\
          o.codehaus.jettison,\
@@ -267,7 +267,7 @@ index 27fb4ec..47ba3a0 100644
          o.joda.time
  
  nb.cluster.odcs.dir=extra
-@@ -1077,7 +990,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,\
@@ -275,7 +275,7 @@ index 27fb4ec..47ba3a0 100644
          cloud.oracle,\
          db.mysql.sakila,\
          deployment.deviceanywhere,\
-@@ -1103,7 +1015,6 @@ nb.cluster.stableuc=\
+@@ -1103,7 +1013,6 @@ nb.cluster.stableuc=\
          junitlib,\
          kenai,\
          kenai.kit,\
@@ -283,7 +283,7 @@ index 27fb4ec..47ba3a0 100644
          kenai.ui,\
          lib.cvsclient,\
          libs.aguiswinglayout,\
-@@ -1112,7 +1023,6 @@ nb.cluster.stableuc=\
+@@ -1112,7 +1021,6 @@ nb.cluster.stableuc=\
          libs.oracle.cloud,\
          libs.ppawtlayout,\
          loadgenerator,\
@@ -291,7 +291,7 @@ index 27fb4ec..47ba3a0 100644
          mobility.antext,\
          mobility.cldcplatform.catalog,\
          mobility.deployment.ftpscp,\
-@@ -1187,7 +1097,6 @@ nb.cluster.betauc=\
+@@ -1187,7 +1095,6 @@ nb.cluster.betauc=\
          contrib/modulemanager,\
          contrib/quickfilechooser,\
          contrib/selenium,\
diff --git a/debian/patches/netbeans-small-ide.patch b/debian/patches/netbeans-small-ide.patch
index eadd827..312feae 100644
--- a/debian/patches/netbeans-small-ide.patch
+++ b/debian/patches/netbeans-small-ide.patch
@@ -32,10 +32,10 @@ index 96d469f..7098a61 100644
                      <code-name-base>org.netbeans.modules.apisupport.osgidemo</code-name-base>
                      <run-dependency>
 diff --git a/editor.kit/nbproject/project.xml b/editor.kit/nbproject/project.xml
-index 17fde0b..2b2d272 100644
+index 17fde0b..91e0cc6 100644
 --- a/editor.kit/nbproject/project.xml
 +++ b/editor.kit/nbproject/project.xml
-@@ -39,13 +39,13 @@
+@@ -39,7 +39,7 @@
                          <specification-version>1.23</specification-version>
                      </run-dependency>
                  </dependency>
@@ -44,12 +44,14 @@ index 17fde0b..2b2d272 100644
                      <code-name-base>org.netbeans.modules.html.parser</code-name-base>
                      <run-dependency>
                          <release-version>1</release-version>
+@@ -52,7 +52,7 @@
+                         <release-version>1</release-version>
                          <specification-version>1.1</specification-version>
                      </run-dependency>
 -                </dependency>
 +                </dependency>-->
                  <dependency>
-                     <code-name-base>org.netbeans.modules.html.validation</code-name-base>
+                     <code-name-base>org.netbeans.modules.image</code-name-base>
                      <run-dependency>
 @@ -60,13 +60,13 @@
                          <specification-version>1.19</specification-version>

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