[jffi] 01/01: Fix FTBFS for arch any binary package libjffi-jni

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch master
in repository jffi.

commit 8a8381fdeb41a3bf5f3c69fb8b616582c8e5d6d2
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Aug 15 20:55:11 2015 +0200

    Fix FTBFS for arch any binary package libjffi-jni
---
 debian/changelog                                         |  7 +++++++
 debian/libjffi-jni.poms                                  |  1 +
 .../remove-unnecessary-target-for-native-build.patch     | 16 ++++++++++++++++
 debian/patches/series                                    |  1 +
 debian/rules                                             |  8 +++++++-
 5 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dcacd8d..57a7c6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jffi (1.2.7-6) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS for arch binary package in almost all architectures.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Sat, 15 Aug 2015 20:53:05 +0200
+
 jffi (1.2.7-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/libjffi-jni.poms b/debian/libjffi-jni.poms
new file mode 120000
index 0000000..bc74695
--- /dev/null
+++ b/debian/libjffi-jni.poms
@@ -0,0 +1 @@
+libjffi-java.poms
\ No newline at end of file
diff --git a/debian/patches/remove-unnecessary-target-for-native-build.patch b/debian/patches/remove-unnecessary-target-for-native-build.patch
new file mode 100644
index 0000000..1ea12d2
--- /dev/null
+++ b/debian/patches/remove-unnecessary-target-for-native-build.patch
@@ -0,0 +1,16 @@
+Description: Remove unnecessary target for native build
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2015-08-15
+
+--- jffi-1.2.7.orig/build.xml
++++ jffi-1.2.7/build.xml
+@@ -16,7 +16,7 @@
+ 
+   <target name="jar" depends="-init,-pre-jar,-do-jar,-post-jar"/>
+ 
+-  <target name="build-native" depends="-init, -build-platform-jar, -assemble-final-jar"/>
++  <target name="build-native" depends="-init, -build-platform-jar"/>
+ 
+   <target name="-pre-init">
+     <!-- d32/d64 options are not supported on Windows -->
diff --git a/debian/patches/series b/debian/patches/series
index f07df96..7cdb607 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ disable-warnings-as-errors-for-jni.patch
 junit_path_for_tests.patch
 disable-warnings-as-errors-for-libtest.patch
 test_fork_true.patch
+remove-unnecessary-target-for-native-build.patch
diff --git a/debian/rules b/debian/rules
index d41f09f..6eb227b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,17 +18,23 @@ override_dh_install:
 		&& jar xvf ../dist/jffi-*-Linux.jar \
 		&& find jni/ -type f -name "*.so" -exec mv -v {} ../debian/libjffi-jni/usr/lib/$(DEB_HOST_MULTIARCH)/jni \;
 	rm -rfv jni-temp
+	-cd debian/libjffi-jni/usr && rm -rf share/maven-repo share/java
 	
 override_dh_auto_build:
 	mkdir -p archive
 	ant -Duse.system.libffi=1 jar test
 	dh_auto_build
 
+override_dh_auto_build-arch:
+	mkdir -p archive
+	ant -Duse.system.libffi=1 build-native
+
 JAR=debian/libjffi-java/usr/share/java/jffi.jar
 override_jh_manifest:
-	jh_manifest
+	jh_manifest -plibjffi-java
 
 	# generate OSGi metadata
+	-test -f $(JAR) && \
 	bnd wrap -properties debian/jffi.bnd -output $(JAR) $(JAR)
 
 override_dh_clean:

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