[jffi-1.2.7] 01/01: Fixes to build arch-specific jar from ant config

[Tim Potter]

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

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

commit fbe970e25550362f29bba48287a0a8aba28ed2f5
Author: Tim Potter <tpot at hp.com>
Date:   Wed Feb 25 11:20:53 2015 +1100

    Fixes to build arch-specific jar from ant config
---
 debian/autoreconf        | 1 -
 debian/control           | 4 ++--
 debian/info              | 1 -
 debian/lintian-overrides | 1 -
 debian/rules             | 9 +++++++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/autoreconf b/debian/autoreconf
deleted file mode 100644
index 5b1c200..0000000
--- a/debian/autoreconf
+++ /dev/null
@@ -1 +0,0 @@
-jni/libffi
diff --git a/debian/control b/debian/control
index c5294ec..5cfc8a7 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Build-Depends: debhelper (>= 9),
  javahelper,
  maven-debian-helper,
  libmaven-antrun-plugin-java, libmaven-assembly-plugin-java,
- maven-repo-helper, libffi-dev, pkg-config,
+ maven-repo-helper, libffi-dev, pkg-config, ant,
  ant-optional, default-jdk, junit4, bnd,
- dh-autoreconf, libltdl-dev
+ libltdl-dev
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/jffi.git
 Vcs-Browser: http://anonscm.debian.org/?p=pkg-java-maint/jffi.git;a=summary
diff --git a/debian/info b/debian/info
deleted file mode 100644
index 26e7f1a..0000000
--- a/debian/info
+++ /dev/null
@@ -1 +0,0 @@
-jni/libffi/doc/libffi.info
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
deleted file mode 100644
index 6897f38..0000000
--- a/debian/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libjffi-java: codeless-jar usr/share/java/jffi-native.jar
diff --git a/debian/rules b/debian/rules
index 2a2fd29..3d816ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,17 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 
 %:
-	dh $@ --buildsystem=maven --with javahelper --with autoreconf
+	dh $@ --buildsystem=maven --with javahelper
 
 override_dh_install:
 	dh_install
 	mh_installjar -plibjffi-java pom.xml target/jffi-1.2.7.jar
-	cp target/jffi-1.2.7-native.jar debian/libjffi-java/usr/share/java/jffi-native.jar
+	mkdir -p debian/libjffi-jni/usr/share/java
+	cp target/jffi-1.2.7-native.jar debian/libjffi-jni/usr/share/java/jffi-native.jar
+
+override_dh_auto_build:
+	ant -Duse.system.libffi=1
+	dh_auto_build
 
 get-orig-source:
 	uscan --force-download --verbose --no-symlink

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