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 be482998e6e4339f22e7489fcf2ed4ebce53f28a Author: Markus Koschany <[email protected]> Date: Tue Apr 24 16:08:53 2018 +0200 Add ant-10.patch to fix the FTBFS with Ant 10 --- debian/patches/ant-10.patch | 55 +++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 56 insertions(+) diff --git a/debian/patches/ant-10.patch b/debian/patches/ant-10.patch new file mode 100644 index 0000000..0041005 --- /dev/null +++ b/debian/patches/ant-10.patch @@ -0,0 +1,55 @@ +From: Markus Koschany <[email protected]> +Date: Tue, 24 Apr 2018 16:08:39 +0200 +Subject: ant 10 + +--- + nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java | 5 +++++ + nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java +index 85c4da0..1458076 100644 +--- a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java ++++ b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java +@@ -61,6 +61,7 @@ import org.apache.tools.ant.BuildException; + import org.apache.tools.ant.Project; + import org.apache.tools.ant.types.Parameter; + import org.apache.tools.ant.types.selectors.BaseExtendSelector; ++import org.apache.tools.ant.types.Resource; + import org.xml.sax.Attributes; + import org.xml.sax.SAXException; + import org.xml.sax.helpers.DefaultHandler; +@@ -80,6 +81,10 @@ public final class ModuleSelector extends BaseExtendSelector { + public ModuleSelector() { + } + ++ public boolean isSelected(Resource r) { ++ return false; ++ } ++ + public boolean isSelected(File dir, String filename, File file) throws BuildException { + validate(); + +diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java +index 288e22f..45a90db 100644 +--- a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java ++++ b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java +@@ -58,6 +58,7 @@ import org.apache.tools.ant.BuildException; + import org.apache.tools.ant.Project; + import org.apache.tools.ant.types.Parameter; + import org.apache.tools.ant.types.selectors.BaseExtendSelector; ++import org.apache.tools.ant.types.Resource; + import org.xml.sax.Attributes; + import org.xml.sax.EntityResolver; + import org.xml.sax.InputSource; +@@ -79,6 +80,10 @@ public final class ModuleStateSelector extends BaseExtendSelector { + public ModuleStateSelector() { + } + ++ public boolean isSelected(Resource r) { ++ return false; ++ } ++ + public boolean isSelected(File dir, String filename, File file) throws BuildException { + validate(); + diff --git a/debian/patches/series b/debian/patches/series index 3c0b466..a3dc737 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ netbeans-platform-junitlib.patch netbeans-platform-o.n.html.ko4j.patch gcc-6-ftbfs.patch jna-4.4.0-compatibility.patch +ant-10.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] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
