[SCM] Java Foreign Function Interface branch, master, updated. debian/1.0.2-9-9-ge691587

[tony mancill]

The following commit has been merged in the master branch:
commit d74383f9937db7c19747fd1b5f5b39682f515dc4
Merge: 68c2a3c9b898d98f1985f12d108cb9f21a4e7375 8f4fd63c30dac5494d3aa4c8bbe91a09c724a7af
Author: tony mancill <tmancill at debian.org>
Date:   Mon Jun 10 13:13:17 2013 -0700

    begin merge of -10 and -9.1 NMU changes

diff --combined debian/changelog
index 04a4daa,d5ece17..7c62c40
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,9 +1,25 @@@
+ jffi (1.0.2-10) UNRELEASED; urgency=low
+ 
++  [ Jakub Adam ]
+   * Add OSGi metadata into jffi.jar.
+ 
++  [ tony mancill ]
++  * Comment-out call to bnd as per request on debian-java:
++    http://lists.debian.org/debian-java/2013/02/msg00057.html
++  * Remove non UTF-8 in debian changelog. (Closes: #711890)
++
+  -- Jakub Adam <jakub.adam at ktknet.cz>  Fri, 18 Jan 2013 17:45:09 +0100
+ 
 +jffi (1.0.2-9.1) unstable; urgency=low
 +
 +  * Non maintainer upload.
 +  * Remove Torsten Werner from uploaders.
 +  * Don't hard-code dependency on libffi runtime library.
 +    Closes: #646593, #707797.
-   * Fix build failure with GCC 4.8. Closes: Ã#701301.
++  * Fix build failure with GCC 4.8. Closes: #701301.
 +
 + -- Matthias Klose <doko at debian.org>  Sun, 12 May 2013 01:00:25 +0200
 +
  jffi (1.0.2-9) unstable; urgency=low
  
    * Team upload.
diff --combined debian/rules
index ff010de,5ef34a9..d91e743
--- a/debian/rules
+++ b/debian/rules
@@@ -7,6 -7,10 +7,10 @@@ JAVA_HOME            := /usr/lib/jvm/de
  DEB_ANT_BUILD_TARGET := -Duse.system.libffi=1 jar test
  DEB_JARS             := ant-nodeps ant-junit junit4
  
 -common-post-build-indep::
 -	# Generate OSGi metadata for jffi.jar
 -	bnd wrap -properties debian/jffi.bnd -output dist/jffi.jar dist/jffi.jar
++#common-post-build-indep::
++#	# Generate OSGi metadata for jffi.jar
++#	bnd wrap -properties debian/jffi.bnd -output dist/jffi.jar dist/jffi.jar
+ 
  install/libjffi-java::
  	mh_installpom -plibjffi-java pom.xml
  	$(JAVA_HOME)/bin/jar umf debian/manifest dist/jffi.jar
@@@ -15,10 -19,6 +19,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

-- 
Java Foreign Function Interface