[netbeans] 10/49: Drop netbeans-nocopy.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 04040d0e197e26481b4c0ecd162161ee99b314f1
Author: Markus Koschany <apo at debian.org>
Date:   Thu Dec 17 01:30:41 2015 +0100

    Drop netbeans-nocopy.patch
---
 debian/patches/netbeans-nocopy.patch | 114 -----------------------------------
 debian/patches/series                |   1 -
 2 files changed, 115 deletions(-)

diff --git a/debian/patches/netbeans-nocopy.patch b/debian/patches/netbeans-nocopy.patch
deleted file mode 100644
index e864070..0000000
--- a/debian/patches/netbeans-nocopy.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 8 Jun 2015 13:45:17 +0200
-Subject: netbeans nocopy
-
-Fix a FTBFS. Do not copy files which we don't use or are replaced by system jar
-files.
-
-Forwarded: not-needed
----
- css.editor/nbproject/project.properties              | 4 ++--
- db.drivers/nbproject/project.properties              | 4 ++--
- derby/nbproject/project.properties                   | 6 +++---
- html.editor/nbproject/project.properties             | 2 +-
- j2ee.eclipselink/nbproject/project.properties        | 2 +-
- libs.swingx/nbproject/project.properties             | 2 +-
- o.jdesktop.beansbinding/nbproject/project.properties | 4 ++--
- 7 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/css.editor/nbproject/project.properties b/css.editor/nbproject/project.properties
-index 35a1046..ad38710 100644
---- a/css.editor/nbproject/project.properties
-+++ b/css.editor/nbproject/project.properties
-@@ -40,8 +40,8 @@
- # Version 2 license, then the option applies only if the new code is
- # made subject to such option by the copyright holder.
- 
--release.external/css21-spec.zip=docs/css21-spec.zip
--release.external/css3-spec.zip=docs/css3-spec.zip
-+#release.external/css21-spec.zip=docs/css21-spec.zip
-+#release.external/css3-spec.zip=docs/css3-spec.zip
- 
- jnlp.indirect.files=\
-     docs/css21-spec.zip,\
-diff --git a/db.drivers/nbproject/project.properties b/db.drivers/nbproject/project.properties
-index 929aa22..d2f7131 100644
---- a/db.drivers/nbproject/project.properties
-+++ b/db.drivers/nbproject/project.properties
-@@ -42,8 +42,8 @@
- 
- javac.compilerargs=-Xlint -Xlint:-serial
- javac.source=1.6
--release.external/mysql-connector-java-5.1.23-bin.jar=modules/ext/mysql-connector-java-5.1.23-bin.jar
--release.external/postgresql-9.2-1002.jdbc4.jar=modules/ext/postgresql-9.2-1002.jdbc4.jar
-+#release.external/mysql-connector-java-5.1.23-bin.jar=modules/ext/mysql-connector-java-5.1.23-bin.jar
-+#release.external/postgresql-9.2-1002.jdbc4.jar=modules/ext/postgresql-9.2-1002.jdbc4.jar
- jnlp.indirect.jars=\
-     modules/ext/mysql-connector-java-5.1.23-bin.jar,\
-     modules/ext/postgresql-9.2-1002.jdbc4.jar
-diff --git a/derby/nbproject/project.properties b/derby/nbproject/project.properties
-index 231a09a..9212689 100644
---- a/derby/nbproject/project.properties
-+++ b/derby/nbproject/project.properties
-@@ -43,9 +43,9 @@
- javac.source=1.6
- javac.compilerargs=-Xlint:unchecked
- 
--release.external/derbysampledb.zip=modules/ext/derbysampledb.zip
--jnlp.indirect.jars=\
--    modules/ext/derbysampledb.zip
-+#release.external/derbysampledb.zip=modules/ext/derbysampledb.zip
-+#jnlp.indirect.jars=\
-+#    modules/ext/derbysampledb.zip
- 
- test.config.stableBTD.includes=**/*Test.class
- test.config.stableBTD.excludes=\
-diff --git a/html.editor/nbproject/project.properties b/html.editor/nbproject/project.properties
-index bd9151b..bfe5d8c 100644
---- a/html.editor/nbproject/project.properties
-+++ b/html.editor/nbproject/project.properties
-@@ -40,7 +40,7 @@
- # Version 2 license, then the option applies only if the new code is
- # made subject to such option by the copyright holder.
- 
--release.external/html-4.01.zip=docs/html-4.01.zip
-+#release.external/html-4.01.zip=docs/html-4.01.zip
- 
- javac.compilerargs=-Xlint:unchecked
- javac.source=1.7
-diff --git a/j2ee.eclipselink/nbproject/project.properties b/j2ee.eclipselink/nbproject/project.properties
-index 53059dc..94bff5c 100644
---- a/j2ee.eclipselink/nbproject/project.properties
-+++ b/j2ee.eclipselink/nbproject/project.properties
-@@ -52,4 +52,4 @@ jnlp.indirect.jars=\
- release.external/eclipselink.jar=modules/ext/eclipselink/eclipselink.jar
- release.external/javax.persistence_2.1.0.v201304241213.jar=modules/ext/eclipselink/javax.persistence_2.1.0.v201304241213.jar
- release.external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
--release.external/JPAjavadocs04032013.zip=modules/ext/docs/javax.persistence-2.1.0-doc.zip
-\ No newline at end of file
-+#release.external/JPAjavadocs04032013.zip=modules/ext/docs/javax.persistence-2.1.0-doc.zip
-diff --git a/libs.swingx/nbproject/project.properties b/libs.swingx/nbproject/project.properties
-index 077a5ea..b021baf 100644
---- a/libs.swingx/nbproject/project.properties
-+++ b/libs.swingx/nbproject/project.properties
-@@ -40,6 +40,6 @@
- # Version 2 license, then the option applies only if the new code is
- # made subject to such option by the copyright holder.
- 
--release.external/swingx-all-1.6.4.jar=modules/ext/swingx-all-1.6.4.jar
-+#release.external/swingx-all-1.6.4.jar=modules/ext/swingx-all-1.6.4.jar
- sigtest.gen.fail.on.error=false
- 
-diff --git a/o.jdesktop.beansbinding/nbproject/project.properties b/o.jdesktop.beansbinding/nbproject/project.properties
-index c6f4d2d..2ed0075 100644
---- a/o.jdesktop.beansbinding/nbproject/project.properties
-+++ b/o.jdesktop.beansbinding/nbproject/project.properties
-@@ -42,6 +42,6 @@
- 
- is.autoload=true
- release.external/beansbinding-1.2.1.jar=modules/ext/beansbinding-1.2.1.jar
--release.external/beansbinding-1.2.1-doc.zip=docs/beansbinding-1.2.1-doc.zip
--jnlp.indirect.jars=docs/beansbinding-1.2.1-doc.zip
-+#release.external/beansbinding-1.2.1-doc.zip=docs/beansbinding-1.2.1-doc.zip
-+#jnlp.indirect.jars=docs/beansbinding-1.2.1-doc.zip
- spec.version.base=1.24.1
diff --git a/debian/patches/series b/debian/patches/series
index ae3a6ec..cc9e04b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ netbeans-platform-nojnabinaries.patch
 netbeans-platform-o.n.html.ko4j.patch
 netbeans-platform-windowslauncher.patch
 osgi-update.patch
-netbeans-nocopy.patch
 db.dataview-setRowFilter-method.patch
 netbeans-javacc.patch
 dlight.nativeexecution.patch

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