[libnb-platform-java] 05/23: Update netbeans-platform-nojnabinaries.patch and fix FTBFS
Markus Koschany
apo-guest at moszumanska.debian.org
Tue Jun 2 13:46:02 UTC 2015
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 b1f088f27220a27da10ffc77a05225abdeecb079
Author: Markus Koschany <apo at gambaru.de>
Date: Mon Jun 1 18:54:59 2015 +0200
Update netbeans-platform-nojnabinaries.patch and fix FTBFS
---
.../patches/netbeans-platform-nojnabinaries.patch | 25 +++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/debian/patches/netbeans-platform-nojnabinaries.patch b/debian/patches/netbeans-platform-nojnabinaries.patch
index f914de8..9792bfb 100644
--- a/debian/patches/netbeans-platform-nojnabinaries.patch
+++ b/debian/patches/netbeans-platform-nojnabinaries.patch
@@ -3,17 +3,32 @@ Date: Mon, 1 Jun 2015 14:21:49 +0200
Subject: netbeans platform~nojnabinaries
---
- libs.jna/nbproject/project.properties | 22 +++++++++++-----------
+ libs.jna.platform/nbproject/project.properties | 2 +-
+ libs.jna/nbproject/project.properties | 24 +++++++++++------------
libs.jna/src/org/netbeans/libs/jna/Installer.java | 2 +-
- 2 files changed, 12 insertions(+), 12 deletions(-)
+ 3 files changed, 14 insertions(+), 14 deletions(-)
+diff --git a/libs.jna.platform/nbproject/project.properties b/libs.jna.platform/nbproject/project.properties
+index b8afdb4..608ea2b 100644
+--- a/libs.jna.platform/nbproject/project.properties
++++ b/libs.jna.platform/nbproject/project.properties
+@@ -42,5 +42,5 @@
+
+ is.autoload=true
+ javac.source=1.6
+-release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
++#release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
+ sigtest.gen.fail.on.error=false
diff --git a/libs.jna/nbproject/project.properties b/libs.jna/nbproject/project.properties
-index c6de368..afbc880 100644
+index c6de368..0a8e520 100644
--- a/libs.jna/nbproject/project.properties
+++ b/libs.jna/nbproject/project.properties
-@@ -43,15 +43,15 @@
+@@ -41,17 +41,17 @@
+ # made subject to such option by the copyright holder.
+
javac.source=1.6
- release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
+-release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
++#release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.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.1.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-410.jnilib
-release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-410.so
--
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