This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository libnb-platform-java.
commit c26eb590ab34beec757fa15afc84d4bc8bbd0e33 Author: Markus Koschany <[email protected]> Date: Sun Oct 23 22:54:30 2016 +0200 Readd netbeans-platform-jemmy.patch and netbeans-platform-properties.patch --- debian/patches/netbeans-platform-jemmy.patch | 26 +++++++++++++++ debian/patches/netbeans-platform-properties.patch | 39 +++++++++++++++++++++++ debian/patches/series | 2 ++ 3 files changed, 67 insertions(+) diff --git a/debian/patches/netbeans-platform-jemmy.patch b/debian/patches/netbeans-platform-jemmy.patch new file mode 100644 index 0000000..92a41c6 --- /dev/null +++ b/debian/patches/netbeans-platform-jemmy.patch @@ -0,0 +1,26 @@ +From: Markus Koschany <[email protected]> +Date: Tue, 2 Jun 2015 13:48:04 +0200 +Subject: netbeans platform jemmy + +We don't include zips of the jemmy doc or src. Otherwise this would cause a +FTBFS. + +Forwarded: not-needed +--- + jemmy/nbproject/project.properties | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/jemmy/nbproject/project.properties b/jemmy/nbproject/project.properties +index ab73fe9..f15365d 100644 +--- a/jemmy/nbproject/project.properties ++++ b/jemmy/nbproject/project.properties +@@ -43,7 +43,7 @@ is.autoload=true + javac.compilerargs=-Xlint -Xlint:-serial + javac.source=1.6 + release.external/jemmy-2.3.1.1.jar=modules/ext/jemmy-2.3.1.1.jar +-release.external/jemmy-2.3.1.1-doc.zip=docs/jemmy-2.3.1.1-doc.zip +-release.external/jemmy-2.3.1.1-src.zip=docs/jemmy-2.3.1.1-src.zip ++#release.external/jemmy-2.3.1.1-doc.zip=docs/jemmy-2.3.1.1-doc.zip ++#release.external/jemmy-2.3.1.1-src.zip=docs/jemmy-2.3.1.1-src.zip + sigtest.gen.fail.on.error=false + diff --git a/debian/patches/netbeans-platform-properties.patch b/debian/patches/netbeans-platform-properties.patch new file mode 100644 index 0000000..d635e02 --- /dev/null +++ b/debian/patches/netbeans-platform-properties.patch @@ -0,0 +1,39 @@ +From: Markus Koschany <[email protected]> +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 ba0af4b..055ff9b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,5 @@ netbeans-platform-junitlib.patch netbeans-platform-nbi.patch netbeans-platform-o.n.html.ko4j.patch netbeans-platform-windowslauncher.patch +netbeans-platform-jemmy.patch +netbeans-platform-properties.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnb-platform-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
