This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository libnb-platform-java.
commit 668029f4ea0f7c75d054e4edbe19b2b56cb53a4c Author: Markus Koschany <[email protected]> Date: Mon Jun 1 20:54:12 2015 +0200 Add osgi-update.patch --- debian/patches/osgi-update.patch | 35 +++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 36 insertions(+) diff --git a/debian/patches/osgi-update.patch b/debian/patches/osgi-update.patch new file mode 100644 index 0000000..73089f0 --- /dev/null +++ b/debian/patches/osgi-update.patch @@ -0,0 +1,35 @@ +From: Markus Koschany <[email protected]> +Date: Mon, 1 Jun 2015 20:52:04 +0200 +Subject: osgi update + +--- + netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java | 2 +- + netbinox/src/org/netbeans/modules/netbinox/Netbinox.java | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java +index d97a2cd..37846b0 100644 +--- a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java ++++ b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java +@@ -128,7 +128,7 @@ final class JarBundleFile extends BundleFile implements BundleContent { + final File bf = new File(getBaseFile().getPath()); + if (bf.isDirectory()) { + try { +- delegate = new DirBundleFile(bf, false); ++ delegate = new DirBundleFile(bf); + return false; + } catch (IOException dirEx) { + NetbinoxFactory.LOG.log(Level.WARNING, +diff --git a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java +index 89c1357..2e929ff 100644 +--- a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java ++++ b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java +@@ -239,5 +239,8 @@ class Netbinox extends Equinox { + public void addBundleListener(BundleListener bl) { + delegate.addBundleListener(bl); + } ++ public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) { ++ return null; ++ } + } // end of Context + } diff --git a/debian/patches/series b/debian/patches/series index a5d75ac..30e5070 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ netbeans-platform-nbi.patch netbeans-platform-nojnabinaries.patch netbeans-platform-windowslauncher.patch netbeans-platform-properties.patch +osgi-update.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
