[jffi] 01/01: Fix FTBFS on buildd.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository jffi.

commit aa8c27b7631c26a688261bec029817296021a09d
Author: Markus Koschany <apo at debian.org>
Date:   Fri Nov 20 15:38:08 2015 +0100

    Fix FTBFS on buildd.
---
 debian/changelog | 6 ++++++
 debian/rules     | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c8c3ca..0778f31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jffi (1.2.7-8) unstable; urgency=medium
+
+  * Fix FTBFS on buildd by making the jh_manifest override arch-indep.
+
+ -- Markus Koschany <apo at debian.org>  Fri, 20 Nov 2015 15:52:39 +0100
+
 jffi (1.2.7-7) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index aaa0306..7e91679 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ export CCACHE_DIR=$(CURDIR)/ccache
 override_dh_install:
 	dh_install
 	mh_installjar -plibjffi-java pom.xml target/jffi-1.2.7.jar
-	
+
 	# install -jni library in multi-arch path
 	mkdir -p debian/libjffi-jni/usr/lib/$(DEB_HOST_MULTIARCH)/jni
 	mkdir jni-temp \
@@ -20,7 +20,7 @@ override_dh_install:
 		&& 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
@@ -31,9 +31,8 @@ override_dh_auto_build-arch:
 	ant -Duse.system.libffi=1 build-native
 
 JAR=debian/libjffi-java/usr/share/java/jffi.jar
-override_jh_manifest:
+override_jh_manifest-indep:
 	jh_manifest -plibjffi-java
-
 	# generate OSGi metadata
 	-test -f $(JAR) && \
 	bnd wrap --properties debian/jffi.bnd --output $(JAR).tmp $(JAR)

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