This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit 6a38adfd9728eb6ac1b2903489d3d8b7dfc948ed Author: Markus Koschany <[email protected]> Date: Thu Dec 17 01:37:18 2015 +0100 Drop netbeans-wildUpperBound.patch --- debian/patches/netbeans-wildUpperBound.patch | 28 ---------------------------- debian/patches/series | 1 - 2 files changed, 29 deletions(-) diff --git a/debian/patches/netbeans-wildUpperBound.patch b/debian/patches/netbeans-wildUpperBound.patch deleted file mode 100644 index ce20170..0000000 --- a/debian/patches/netbeans-wildUpperBound.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Tue, 9 Jun 2015 19:41:36 +0200 -Subject: netbeans wildUpperBound - -Fix a FTBFS due to missing method wildUpperBound. - -Forwarded:not-needed ---- - java.source/src/org/netbeans/api/java/source/SourceUtils.java | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/java.source/src/org/netbeans/api/java/source/SourceUtils.java b/java.source/src/org/netbeans/api/java/source/SourceUtils.java -index 98f4e6b..29ef22e 100644 ---- a/java.source/src/org/netbeans/api/java/source/SourceUtils.java -+++ b/java.source/src/org/netbeans/api/java/source/SourceUtils.java -@@ -211,9 +211,9 @@ public class SourceUtils { - return info.getTypes().isAssignable(t.getUpperBound(), to) - || info.getTypes().isAssignable(to, t.getUpperBound()); - } -- if (from.getKind() == TypeKind.WILDCARD) { -- from = Types.instance(c).wildUpperBound((Type)from); -- } -+ //if (from.getKind() == TypeKind.WILDCARD) { -+ // from = Types.instance(c).wildUpperBound((Type)from); -+ //} - return Check.instance(c).checkType(null, (Type)from, (Type)to).getKind() != TypeKind.ERROR; - } - diff --git a/debian/patches/series b/debian/patches/series index b57e023..20faf53 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,7 +9,6 @@ osgi-update.patch netbeans-javacc.patch netbeans-commons-net.patch netbeans-o.apache.tools.ant.module.patch -netbeans-wildUpperBound.patch netbeans-spi.java.hints.patch netbeans-libs.jaxb.patch netbeans-xml.jaxb.api.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
