Bug#646593: jffi: Pickup shlibs dependencies automatically

[James Page]

Package: jffi
Version: 1.0.2-8
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256


In Ubuntu, the attached patch was applied to achieve the following:

  * Don't hard-code dependency on libffi runtime library.

This enables automatic detection of the correct ffi library at build time.

Thanks for considering the patch.


- -- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJOpsBrAAoJEL/srsug59jDRr0QAJjB/LyQqVYQcGijj2FBqCVS
il26TvDT10rSTJqHxPojWXGHAPYreYtY+wxq3FuDdia49CyDFk6adRlguQANxKa9
FZJoSYSRzsOHEb1OK//grIwYmYGuVMhQjPPIlUjTUlRdrXnaOdeYxPrwmvmM2wLj
YRq8GNFC6xtHA9VTqS2Mqi79xRslos+OeeivkROs90SqyhIos9XTnCGvS3c6gUnK
UUi4TMIDmRfDAlSX0SH9I+PeSf27dJBeuXWV997DIDRX/4sbYHwKtwRpFu2+8hUc
apUbsAqemME0pgkhIeahTnVlBcqr6eBeVwx7jRFSDHj2vVBzopUjMzFkmsLNAz5q
BJmuqFLAMnQmKyP8Vj+hjDZte69e+UU5DQnM7i0AxWguIwiqyWbZSB+RjqlO4H82
PhrtsZYtRVP3ylh13kEp2eTZFvyAn3VRBv0+8kVFfY4QYHEkEeNTGa65S5ZOBipQ
9FmwXq3KYEVRWxmawoku7Q7AnbPiZkEIJPUQ5OUzz1+Li4Fs4WED6hnz4V3kRUxx
6yftKhzpbiJrVWervKRovu1f0q4r7uYSJiWvJw3TBQfMmaGMTeMakBiKe4wN2PbG
WtKsxbWsxhD2G5+hI95DMM+TlzeSujbjH1tXZJeyY7bityxg7CNj0FN22K+N7set
OIa3y+fNyAVj6Sx2nmyU
=PzEu
-----END PGP SIGNATURE-----
-------------- next part --------------
=== modified file 'debian/changelog'

=== modified file 'debian/control'
--- debian/control	2011-09-17 11:44:48 +0000
+++ debian/control	2011-10-25 13:56:28 +0000
@@ -21,7 +21,7 @@
 
 Package: libjffi-jni
 Architecture: any
-Depends: ${misc:Depends}, libffi5
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: libjffi-java
 Description: Java Foreign Function Interface (JNI library)
  JFFI is a wrapper for libffi, the foreign function interface library. A foreign

=== modified file 'debian/rules'
--- debian/rules	2010-08-01 19:59:54 +0000
+++ debian/rules	2011-10-25 13:10:02 +0000
@@ -15,6 +15,10 @@
 install/libjffi-jni::
 	install -D -m644 dist/jffi-*-*.jar \
 		debian/libjffi-jni/usr/lib/jffi/jffi-native.jar
+	cp ./build/jni/libjffi-1.0.so debian/libjffi-jni/usr/lib/
+
+binary-predeb/libjffi-jni::
+	rm -f debian/libjffi-jni/usr/lib/libjffi-1.0.so
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename