[libnb-platform-java] 10/22: Update netbeans-platform-windowslauncher.patch

Markus Koschany apo at moszumanska.debian.org
Sat Oct 29 13:12:15 UTC 2016


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 5670ee33ff82a3493f64e24039b6c248d1a10f80
Author: Markus Koschany <apo at debian.org>
Date:   Thu Oct 27 19:44:35 2016 +0200

    Update netbeans-platform-windowslauncher.patch
---
 debian/patches/netbeans-platform-windowslauncher.patch | 12 +++++++++---
 debian/patches/osgi-update.patch                       |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/patches/netbeans-platform-windowslauncher.patch b/debian/patches/netbeans-platform-windowslauncher.patch
index faf00d2..99de912 100644
--- a/debian/patches/netbeans-platform-windowslauncher.patch
+++ b/debian/patches/netbeans-platform-windowslauncher.patch
@@ -5,9 +5,9 @@ Subject: netbeans platform windowslauncher
 ---
  apisupport.harness/windows-launcher-src/Makefile |  7 ++++---
  ide/launcher/windows/nblauncher.cpp              |  1 +
- o.n.bootstrap/launcher/windows/Makefile          | 18 +++++++-----------
+ o.n.bootstrap/launcher/windows/Makefile          | 20 ++++++++------------
  o.n.bootstrap/launcher/windows/utilsfuncs.cpp    |  1 +
- 4 files changed, 13 insertions(+), 14 deletions(-)
+ 4 files changed, 14 insertions(+), 15 deletions(-)
 
 diff --git a/apisupport.harness/windows-launcher-src/Makefile b/apisupport.harness/windows-launcher-src/Makefile
 index 8393fb3..ba4394d 100644
@@ -56,7 +56,7 @@ index b601ca3..29bd9de 100644
  using namespace std;
  
 diff --git a/o.n.bootstrap/launcher/windows/Makefile b/o.n.bootstrap/launcher/windows/Makefile
-index d0c66a4..089c946 100644
+index d0c66a4..efa4a92 100644
 --- a/o.n.bootstrap/launcher/windows/Makefile
 +++ b/o.n.bootstrap/launcher/windows/Makefile
 @@ -53,7 +53,7 @@
@@ -99,6 +99,12 @@ index d0c66a4..089c946 100644
  	
  .clean-post-nbexec64: .clean-impl
  	rm -f nbexec_exe64.res nbexec64.exe
+@@ -125,4 +121,4 @@ help: .help-post
+ 
+ 
+ # include project implementation makefile
+-include nbproject/Makefile-impl.mk
++#include nbproject/Makefile-impl.mk
 diff --git a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
 index a43453b..8ade281 100644
 --- a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
diff --git a/debian/patches/osgi-update.patch b/debian/patches/osgi-update.patch
index d429140..39a40d0 100644
--- a/debian/patches/osgi-update.patch
+++ b/debian/patches/osgi-update.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
  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
+index 8d71aef..0d8aa8b 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 {
@@ -26,7 +26,7 @@ index d97a2cd..37846b0 100644
                                  } 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
+index 64bfcd4..83e49ff 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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnb-platform-java.git



More information about the pkg-java-commits mailing list