This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit d55529a11755647088d093896bca05361f39c4d6 Author: Markus Koschany <[email protected]> Date: Fri Dec 25 20:03:34 2015 +0100 Add netbeans-platform-properties.patch --- debian/patches/netbeans-platform-properties.patch | 39 +++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 40 insertions(+) diff --git a/debian/patches/netbeans-platform-properties.patch b/debian/patches/netbeans-platform-properties.patch new file mode 100644 index 0000000..049aeef --- /dev/null +++ b/debian/patches/netbeans-platform-properties.patch @@ -0,0 +1,39 @@ +From: Markus Koschany <[email protected]> +Date: Fri, 25 Dec 2015 20:03:02 +0100 +Subject: netbeans platform properties + +We don't include the swing layout source zip or testng javadoc. +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 4ed4717..a9a9ffc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,3 +17,4 @@ netbeans-updatecenters.patch reproducible-build.patch netbeans-cluster-properties.patch netbeans-o.n.bootstrap.patch +netbeans-platform-properties.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
