[SCM] Java Abstracted Foreign Function Layer branch, master, updated. debian/0.5.4-1-1-gc057376

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit c057376d4981d1ebcdf74178597a9edb85915b82
Author: Matthias Klose <doko at debian.org>
Date:   Tue May 22 00:39:09 2012 +0000

    Imported Debian patch 0.5.4-1.1

diff --git a/debian/changelog b/debian/changelog
index 94e980b..5ea8a42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jaffl (0.5.4-1.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Fix build failure with GCC 4.7. Closes: #672024.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 22 May 2012 00:39:09 +0000
+
 jaffl (0.5.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
new file mode 100644
index 0000000..50623a9
--- /dev/null
+++ b/debian/patches/ftbfs-gcc-4.7.diff
@@ -0,0 +1,13 @@
+Index: jaffl-0.5.4/libtest/GNUmakefile
+===================================================================
+--- jaffl-0.5.4.orig/libtest/GNUmakefile	2010-08-01 19:40:41.000000000 +0000
++++ jaffl-0.5.4/libtest/GNUmakefile	2012-05-22 00:39:00.528083754 +0000
+@@ -42,7 +42,7 @@
+ OFLAGS = -O2 $(JFLAGS)
+ WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
+ PICFLAGS = -fPIC
+-SOFLAGS = -shared -mimpure-text -Wl,-O1
++SOFLAGS = -shared -Wl,-O1
+ LDFLAGS += $(SOFLAGS)
+ 
+ IFLAGS = -I"$(BUILD_DIR)"
diff --git a/debian/patches/series b/debian/patches/series
index dfc9397..179c2fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-ignore-test-failures.patch
 0002-remove-copyLibs-task.patch
 0003-don-t-call-ant-for-subprojects.patch
+ftbfs-gcc-4.7.diff

-- 
Java Abstracted Foreign Function Layer