[netbeans] 08/49: Drop netbeans-platform-properties.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 d9654b01bfea5d1f556ce98d53c8570a2869c99b
Author: Markus Koschany <apo at debian.org>
Date:   Thu Dec 17 01:29:21 2015 +0100

    Drop netbeans-platform-properties.patch
---
 debian/patches/netbeans-platform-properties.patch | 39 -----------------------
 debian/patches/series                             |  2 --
 2 files changed, 41 deletions(-)

diff --git a/debian/patches/netbeans-platform-properties.patch b/debian/patches/netbeans-platform-properties.patch
deleted file mode 100644
index d635e02..0000000
--- a/debian/patches/netbeans-platform-properties.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 1 Jun 2015 19:35:45 +0200
-Subject: netbeans platform properties
-
-We don't include the swing layout source zip. Otherwise this would cause a
-FTBFS.
-
-Forwarded: not-needed
----
- libs.testng/nbproject/project.properties       | 2 +-
- o.jdesktop.layout/nbproject/project.properties | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libs.testng/nbproject/project.properties b/libs.testng/nbproject/project.properties
-index 4d3caca..9d9f860 100644
---- a/libs.testng/nbproject/project.properties
-+++ b/libs.testng/nbproject/project.properties
-@@ -42,7 +42,7 @@
- 
- is.autoload=true
- release.external/testng-6.8.1-dist.jar=modules/ext/testng-6.8.1-dist.jar
--release.external/testng-6.8.1-javadoc.zip=docs/testng-6.8.1-javadoc.zip
-+#release.external/testng-6.8.1-javadoc.zip=docs/testng-6.8.1-javadoc.zip
- sigtest.skip.check=true
- sigtest.fail.on.error=false
- jnlp.indirect.jars=\
-diff --git a/o.jdesktop.layout/nbproject/project.properties b/o.jdesktop.layout/nbproject/project.properties
-index bf2a43b..015c254 100644
---- a/o.jdesktop.layout/nbproject/project.properties
-+++ b/o.jdesktop.layout/nbproject/project.properties
-@@ -42,6 +42,6 @@
- 
- is.autoload=true
- release.external/swing-layout-1.0.4.jar=modules/ext/swing-layout-1.0.4.jar
--release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
--release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
-+#release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
-+#release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
- jnlp.indirect.jars=docs/swing-layout-1.0.4-doc.zip, docs/swing-layout-1.0.4-src.zip
diff --git a/debian/patches/series b/debian/patches/series
index ac355c1..ac6f334 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,9 +5,7 @@ netbeans-platform-junitlib.patch
 netbeans-platform-nbi.patch
 netbeans-platform-nojnabinaries.patch
 netbeans-platform-o.n.html.ko4j.patch
-netbeans-platform-properties.patch
 netbeans-platform-windowslauncher.patch
-netbeans-platform-properties.patch
 osgi-update.patch
 netbeans-platform-jemmy.patch
 netbeans-nocopy.patch

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