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 cae5c38d551ecf669b9629b771cefbe7d177a5d5
Author: Markus Koschany <a...@debian.org>
Date:   Sat Feb 3 15:18:56 2018 +0100

    Sync osgi-update.patch with latest version of libequinox-osgi-java.
---
 debian/patches/osgi-update.patch | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/debian/patches/osgi-update.patch b/debian/patches/osgi-update.patch
index d429140..0414c76 100644
--- a/debian/patches/osgi-update.patch
+++ b/debian/patches/osgi-update.patch
@@ -8,23 +8,9 @@ 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(-)
+ netbinox/src/org/netbeans/modules/netbinox/Netbinox.java | 8 ++++++++
+ 1 file changed, 8 insertions(+)
 
-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

-- 
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
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to