[netbeans] 08/13: Rebase three patches into netbeans-small-ide.patch.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository netbeans.

commit c3f587a0775295e923c98e706a5facfb04bb8608
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Jun 11 22:56:13 2015 +0200

    Rebase three patches into netbeans-small-ide.patch.
---
 debian/patches/netbeans-html.parser.patch | 43 ------------------------------
 debian/patches/netbeans-httpserver.patch  | 44 -------------------------------
 debian/patches/netbeans-nashorn.patch     | 28 --------------------
 debian/patches/series                     |  3 ---
 4 files changed, 118 deletions(-)

diff --git a/debian/patches/netbeans-html.parser.patch b/debian/patches/netbeans-html.parser.patch
deleted file mode 100644
index 3beb37b..0000000
--- a/debian/patches/netbeans-html.parser.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Tue, 9 Jun 2015 04:50:44 +0200
-Subject: netbeans html.parser
-
----
- editor.kit/nbproject/project.xml | 4 ++--
- nbbuild/cluster.properties       | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/editor.kit/nbproject/project.xml b/editor.kit/nbproject/project.xml
-index 8ae93f4..91e0cc6 100644
---- a/editor.kit/nbproject/project.xml
-+++ b/editor.kit/nbproject/project.xml
-@@ -39,7 +39,7 @@
-                         <specification-version>1.23</specification-version>
-                     </run-dependency>
-                 </dependency>
--                <dependency>
-+                <!--<dependency>
-                     <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.image</code-name-base>
-                     <run-dependency>
-diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 150b544..0c9cd27 100644
---- a/nbbuild/cluster.properties
-+++ b/nbbuild/cluster.properties
-@@ -333,6 +333,7 @@ nb.cluster.ide=\
-         html.editor,\
-         html.editor.lib,\
-         html.lexer,\
-+        httpserver,\
-         hudson,\
-         hudson.git,\
-         hudson.mercurial,\
diff --git a/debian/patches/netbeans-httpserver.patch b/debian/patches/netbeans-httpserver.patch
deleted file mode 100644
index 03d2ad4..0000000
--- a/debian/patches/netbeans-httpserver.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Tue, 9 Jun 2015 13:10:10 +0200
-Subject: netbeans httpserver
-
-Don't require a build-dependency on tomcat and don't build the web server.
-
-Forwareded: not-needed
----
- ide.kit/nbproject/project.xml | 4 ++--
- nbbuild/cluster.properties    | 1 -
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/ide.kit/nbproject/project.xml b/ide.kit/nbproject/project.xml
-index 1c3c371..36c6ca5 100644
---- a/ide.kit/nbproject/project.xml
-+++ b/ide.kit/nbproject/project.xml
-@@ -154,13 +154,13 @@
-                         <specification-version>1.11</specification-version>
-                     </run-dependency>
-                 </dependency>
--                <dependency>
-+                <!--<dependency>
-                     <code-name-base>org.netbeans.modules.httpserver</code-name-base>
-                     <run-dependency>
-                         <release-version>2</release-version>
-                         <specification-version>2.7</specification-version>
-                     </run-dependency>
--                </dependency>
-+                </dependency>-->
-                 <dependency>
-                     <code-name-base>org.netbeans.modules.jumpto</code-name-base>
-                     <run-dependency>
-diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 0c9cd27..150b544 100644
---- a/nbbuild/cluster.properties
-+++ b/nbbuild/cluster.properties
-@@ -333,7 +333,6 @@ nb.cluster.ide=\
-         html.editor,\
-         html.editor.lib,\
-         html.lexer,\
--        httpserver,\
-         hudson,\
-         hudson.git,\
-         hudson.mercurial,\
diff --git a/debian/patches/netbeans-nashorn.patch b/debian/patches/netbeans-nashorn.patch
deleted file mode 100644
index 8d85949..0000000
--- a/debian/patches/netbeans-nashorn.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Tue, 9 Jun 2015 04:37:49 +0200
-Subject: netbeans nashorn
-
----
- editor.kit/nbproject/project.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/editor.kit/nbproject/project.xml b/editor.kit/nbproject/project.xml
-index 17fde0b..8ae93f4 100644
---- a/editor.kit/nbproject/project.xml
-+++ b/editor.kit/nbproject/project.xml
-@@ -60,13 +60,13 @@
-                         <specification-version>1.19</specification-version>
-                     </run-dependency>
-                 </dependency>
--                <dependency>
-+                <!--<dependency>
-                     <code-name-base>org.netbeans.modules.javascript2.kit</code-name-base>
-                     <run-dependency>
-                         <release-version>1</release-version>
-                         <specification-version>0.1</specification-version>
-                     </run-dependency>
--                </dependency>
-+                </dependency>-->
-                 <dependency>
-                     <code-name-base>org.netbeans.modules.languages.diff</code-name-base>
-                     <run-dependency>
diff --git a/debian/patches/series b/debian/patches/series
index 9d642e4..aa48f5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,9 +15,6 @@ netbeans-javacc.patch
 dlight.nativeexecution.patch
 netbeans-extexecution.impl.patch
 netbeans-libs.jsch.agentproxy.patch
-netbeans-nashorn.patch
-netbeans-html.parser.patch
-netbeans-httpserver.patch
 netbeans-commons-net.patch
 netbeans-o.apache.tools.ant.module.patch
 netbeans-wildUpperBound.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git