[libnb-platform-java] 15/22: Refresh netbeans-platform-nojnabinaries.patch

[Markus Koschany]

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 47f94fd9753c1bd3d2fd778207fb02aa5ec5490a
Author: Markus Koschany <apo at debian.org>
Date:   Thu Oct 27 22:46:13 2016 +0200

    Refresh netbeans-platform-nojnabinaries.patch
---
 .../patches/netbeans-platform-nojnabinaries.patch  | 54 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 55 insertions(+)

diff --git a/debian/patches/netbeans-platform-nojnabinaries.patch b/debian/patches/netbeans-platform-nojnabinaries.patch
new file mode 100644
index 0000000..ca8fd6c
--- /dev/null
+++ b/debian/patches/netbeans-platform-nojnabinaries.patch
@@ -0,0 +1,54 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 27 Oct 2016 22:45:50 +0200
+Subject: netbeans platform nojnabinaries
+
+---
+ libs.jna.platform/nbproject/project.properties    |  1 -
+ libs.jna/nbproject/project.properties             | 13 -------------
+ libs.jna/src/org/netbeans/libs/jna/Installer.java |  2 +-
+ 3 files changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/libs.jna.platform/nbproject/project.properties b/libs.jna.platform/nbproject/project.properties
+index c8688d8..47f4925 100644
+--- a/libs.jna.platform/nbproject/project.properties
++++ b/libs.jna.platform/nbproject/project.properties
+@@ -42,5 +42,4 @@
+ 
+ is.autoload=true
+ javac.source=1.6
+-release.external/jna-platform-4.2.2.jar=modules/ext/jna-platform-4.2.2.jar
+ sigtest.gen.fail.on.error=false
+diff --git a/libs.jna/nbproject/project.properties b/libs.jna/nbproject/project.properties
+index 2800236..a4ce0d9 100644
+--- a/libs.jna/nbproject/project.properties
++++ b/libs.jna/nbproject/project.properties
+@@ -41,17 +41,4 @@
+ # made subject to such option by the copyright holder.
+ 
+ javac.source=1.6
+-release.external/jna-4.2.2.jar=modules/ext/jna-4.2.2.jar
+-# Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well.
+-release.external/jna-4.2.2.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-422.jnilib
+-release.external/jna-4.2.2.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-422.so
+-release.external/jna-4.2.2.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-422.so
+-release.external/jna-4.2.2.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-422.dll
+-release.external/jna-4.2.2.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-422.dll
+-jnlp.verify.excludes=\
+-    modules/lib/amd64/jnidispatch-422.dll,\
+-    modules/lib/amd64/linux/libjnidispatch-422.so,\
+-    modules/lib/i386/linux/libjnidispatch-422.so,\
+-    modules/lib/x86/jnidispatch-422.dll,\
+-    modules/lib/libjnidispatch-422.jnilib
+ sigtest.gen.fail.on.error=false
+diff --git a/libs.jna/src/org/netbeans/libs/jna/Installer.java b/libs.jna/src/org/netbeans/libs/jna/Installer.java
+index 58c0c35..fa3201f 100644
+--- a/libs.jna/src/org/netbeans/libs/jna/Installer.java
++++ b/libs.jna/src/org/netbeans/libs/jna/Installer.java
+@@ -50,6 +50,6 @@ public class Installer extends ModuleInstall {
+     public void validate() {
+         super.validate();
+         //#211655
+-        System.setProperty( "jna.boot.library.name", "jnidispatch-422" ); //NOI18N
++        System.setProperty( "jna.boot.library.name", "jnidispatch" ); //NOI18N
+     }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 8750086..478a680 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ netbeans-platform-o.n.html.ko4j.patch
 netbeans-platform-jemmy.patch
 netbeans-platform-properties.patch
 osgi-update.patch
+netbeans-platform-nojnabinaries.patch

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