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 fbacc1aceb67766abc238a7314943aea29c8f2e0 Author: Markus Koschany <[email protected]> Date: Sun Oct 23 23:18:28 2016 +0200 Readd osgi-update.patch --- debian/patches/osgi-update.patch | 52 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 53 insertions(+) diff --git a/debian/patches/osgi-update.patch b/debian/patches/osgi-update.patch new file mode 100644 index 0000000..d429140 --- /dev/null +++ b/debian/patches/osgi-update.patch @@ -0,0 +1,52 @@ +From: Markus Koschany <[email protected]> +Date: Mon, 1 Jun 2015 20:52:04 +0200 +Subject: osgi update + +Implement missing methods or correct parameter changes due to the latest OSGi +upgrade. It may be possible to drop this patch in the future, when upstream +catches up. + +Forwarded: not-needed +--- + netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java | 2 +- + netbinox/src/org/netbeans/modules/netbinox/Netbinox.java | 8 ++++++++ + 2 files changed, 9 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..77a70d3 100644 +--- a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java ++++ b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java +@@ -61,6 +61,8 @@ import org.osgi.framework.InvalidSyntaxException; + import org.osgi.framework.ServiceListener; + import org.osgi.framework.ServiceReference; + import org.osgi.framework.ServiceRegistration; ++import org.osgi.framework.ServiceObjects; ++import org.osgi.framework.ServiceFactory; + + /** + * +@@ -239,5 +241,11 @@ class Netbinox extends Equinox { + public void addBundleListener(BundleListener bl) { + delegate.addBundleListener(bl); + } ++ public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> refer) { ++ return null; ++ } ++ public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String,?> dictio) { ++ return null; ++ } + } // end of Context + } diff --git a/debian/patches/series b/debian/patches/series index 055ff9b..57e0278 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ netbeans-platform-o.n.html.ko4j.patch netbeans-platform-windowslauncher.patch netbeans-platform-jemmy.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
