[DRE-commits] [SCM] ruby-ffi.git branch, master, updated. debian/1.0.11debian-5-21-g999eacb

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 11e0a8c5619056f68d50354afd7de48073adfa1a
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri May 17 00:22:23 2013 -0300

    Fix FTBFS on Hurd

diff --git a/debian/changelog b/debian/changelog
index c4c3b48..f20abec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ ruby-ffi (1.8.1debian-1) UNRELEASED; urgency=low
     - debian/patches/fix-test-on-sparc
   * debian/patches/ftbfs-gcc-4.7.diff: made obsolete by upstream change; not
     neeed anymore.
+  * debian/rules: symlink i486-gnu to i386-gnu while the rename is not done
+    upstream; see https://github.com/ffi/ffi/pull/269. This fixes a FTBFS on
+    hurd-i386 (Closes: #679782)
 
   [ Cédric Boutillier ]
   * debian/control: remove obsolete DM-Upload-Allowed flag
diff --git a/debian/rules b/debian/rules
index 11aeae1..d17bdd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,9 @@ endif
 
 override_dh_auto_install:
 	dh_auto_install
+	# fix for #679782 - can be dropped in the next upstream release that has
+	# https://github.com/ffi/ffi/pull/269 merged
+	test -d debian/ruby-ffi/usr/lib/ruby/vendor_ruby/ffi/platform/i486-gnu && ln -s i486-gnu debian/ruby-ffi/usr/lib/ruby/vendor_ruby/ffi/platform/i386-gnu
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
ruby-ffi.git