[DRE-commits] [SCM] ruby-ffi.git branch, master, updated. debian/1.0.11debian-3-1-g47df47b

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 47df47ba0ce91d18db5b518adf6b82bac35072e1
Author: Matthias Klose <doko at debian.org>
Date:   Mon May 21 01:11:56 2012 +0000

    Imported Debian patch 1.0.11debian-3.1

diff --git a/debian/changelog b/debian/changelog
index 7f5be5a..e8e4c6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-ffi (1.0.11debian-3.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Remove unknown GCC command line option. Closes: #672050.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 21 May 2012 01:11:56 +0000
+
 ruby-ffi (1.0.11debian-3) unstable; urgency=low
 
   * debian/patches/fix-test-on-sparc: fixes crash while running test suite on
diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
new file mode 100644
index 0000000..ffa6124
--- /dev/null
+++ b/debian/patches/ftbfs-gcc-4.7.diff
@@ -0,0 +1,13 @@
+Index: ruby-ffi-1.0.11debian/libtest/GNUmakefile
+===================================================================
+--- ruby-ffi-1.0.11debian.orig/libtest/GNUmakefile	2011-11-13 20:03:45.000000000 +0000
++++ ruby-ffi-1.0.11debian/libtest/GNUmakefile	2012-05-21 01:11:51.482172786 +0000
+@@ -37,7 +37,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 13035bc..e86c0b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Add-types.conf-files-for-missing-Debian-architecture.patch
 fix-test-on-sparc
+ftbfs-gcc-4.7.diff

-- 
ruby-ffi.git