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

Mon Jun 10 20:39:22 UTC 2013

The following commit has been merged in the master branch:
commit 68c2a3c9b898d98f1985f12d108cb9f21a4e7375
Author: Matthias Klose <doko at debian.org>
Date:   Sun May 12 01:00:25 2013 +0200

    Imported Debian patch 1.0.2-9.1

diff --git a/debian/changelog b/debian/changelog
index 66d8894..04a4daa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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.
+
+ -- 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 --git a/debian/control b/debian/control
index 511a8a8..980e03b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,9 @@ Source: jffi
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, maven-repo-helper, libffi-dev, pkg-config,
  ant-optional, default-jdk, junit4
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-java/jffi.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/jffi.git
 Homepage: http://github.com/wmeissner/jffi
@@ -21,7 +20,7 @@ Description: Java Foreign Function Interface
 
 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
diff --git a/debian/patches/0004-load-jffi-native.jar-from-system-directory.patch b/debian/patches/0004-load-jffi-native.jar-from-system-directory.patch
index 75b9f99..2899637 100644
--- a/debian/patches/0004-load-jffi-native.jar-from-system-directory.patch
+++ b/debian/patches/0004-load-jffi-native.jar-from-system-directory.patch
@@ -6,11 +6,11 @@ Subject: load jffi-native.jar from system directory
  src/com/kenai/jffi/Init.java |   20 ++++++++++++++++++--
  1 files changed, 18 insertions(+), 2 deletions(-)
 
-diff --git a/src/com/kenai/jffi/Init.java b/src/com/kenai/jffi/Init.java
-index ff7e7b2..4bd8947 100644
---- a/src/com/kenai/jffi/Init.java
-+++ b/src/com/kenai/jffi/Init.java
-@@ -27,6 +27,9 @@ import java.nio.channels.Channels;
+Index: b/src/com/kenai/jffi/Init.java
+===================================================================
+--- a/src/com/kenai/jffi/Init.java	2013-05-11 23:11:40.488998792 +0000
++++ b/src/com/kenai/jffi/Init.java	2013-05-11 23:11:40.484998854 +0000
+@@ -27,6 +27,9 @@
  import java.nio.channels.FileChannel;
  import java.nio.channels.ReadableByteChannel;
  import java.util.Properties;
@@ -20,7 +20,7 @@ index ff7e7b2..4bd8947 100644
  
  /**
   * Utility class to load the jffi stub library
-@@ -159,7 +162,20 @@ final class Init {
+@@ -159,7 +162,20 @@
      private static final InputStream getStubLibraryStream() {
          String path = getStubLibraryPath();
  
@@ -42,7 +42,7 @@ index ff7e7b2..4bd8947 100644
  
          // On MacOS, the stub might be named .dylib or .jnilib - cater for both
          if (is == null && Platform.getPlatform().getOS() == Platform.OS.DARWIN) {
-@@ -188,7 +204,7 @@ final class Init {
+@@ -188,7 +204,7 @@
       * @return The path of the jar file.
       */
      private static final String getStubLibraryPath() {
@@ -51,4 +51,3 @@ index ff7e7b2..4bd8947 100644
      }
  
  }
--- 
diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
index ad95584..780c3bc 100644
--- a/debian/patches/ftbfs-gcc-4.7.diff
+++ b/debian/patches/ftbfs-gcc-4.7.diff
@@ -1,7 +1,16 @@
-Index: jffi-1.0.2/jni/GNUmakefile
+Index: b/jni/GNUmakefile
 ===================================================================
---- jffi-1.0.2.orig/jni/GNUmakefile	2012-05-29 07:10:47.000000000 +0000
-+++ jffi-1.0.2/jni/GNUmakefile	2012-05-29 07:11:34.000000000 +0000
+--- a/jni/GNUmakefile	2013-05-11 23:13:56.101912633 +0000
++++ b/jni/GNUmakefile	2013-05-11 23:14:28.978133869 +0000
+@@ -65,7 +65,7 @@
+ 
+ # MacOS headers aren't completely warning free, so turn them off
+ ifneq ($(OS),darwin)
+-  WFLAGS += -Wundef -Werror
++  WFLAGS += -Wundef -Werror -Wno-error=unused-parameter
+ endif
+ WFLAGS += -W -Wall -Wno-unused -Wno-parentheses
+ PICFLAGS = -fPIC
 @@ -156,7 +156,7 @@
  endif
  
@@ -11,13 +20,16 @@ Index: jffi-1.0.2/jni/GNUmakefile
    CFLAGS += -pthread
  endif
  
-Index: jffi-1.0.2/libtest/GNUmakefile
+Index: b/libtest/GNUmakefile
 ===================================================================
---- jffi-1.0.2.orig/libtest/GNUmakefile	2012-05-29 07:10:47.000000000 +0000
-+++ jffi-1.0.2/libtest/GNUmakefile	2012-05-29 07:14:19.110281617 +0000
-@@ -47,7 +47,7 @@
+--- a/libtest/GNUmakefile	2013-05-11 23:13:56.101912633 +0000
++++ b/libtest/GNUmakefile	2013-05-11 23:14:17.886064740 +0000
+@@ -45,9 +45,9 @@
+ #   http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
+ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
  OFLAGS = -O2 $(JFLAGS)
- WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
+-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
++WFLAGS = -W -Werror -Wno-error=unused-parameter -Wall -Wno-unused -Wno-parentheses
  PICFLAGS = -fPIC
 -SOFLAGS = -shared -mimpure-text -Wl,-O1
 +SOFLAGS = -shared -Wl,-O1
diff --git a/debian/rules b/debian/rules
index a756f89..ff010de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,10 @@ install/libjffi-java::
 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

