[DRE-commits] [ruby-ffi] 01/07: Merge branch 'upstream'

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-ffi.

commit 20935f8098017bfde2c25ac5b5b94f17f8bf9b7b
Merge: 05ec6da 691ee37
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Sep 15 19:50:43 2013 -0300

    Merge branch 'upstream'

 Rakefile                                           |    3 +-
 checksums.yaml.gz                                  |  Bin 269 -> 0 bytes
 ext/ffi_c/ClosurePool.c                            |   12 +-
 ext/ffi_c/Thread.c                                 |    2 +-
 ext/ffi_c/extconf.rb                               |    1 -
 lib/ffi/platform/{i486-gnu => i386-gnu}/types.conf |    0
 lib/ffi/platform/i386-openbsd/types.conf           |    2 +
 lib/ffi/platform/x86_64-openbsd/types.conf         |    2 +
 lib/ffi/version.rb                                 |    2 +-
 metadata.yml                                       |  166 +++++++++++---------
 10 files changed, 109 insertions(+), 81 deletions(-)

diff --cc Rakefile
index 4c41844,cc23ed3..1de6306
--- a/Rakefile
+++ b/Rakefile
@@@ -2,7 -2,14 +2,8 @@@ require 'rubygems
  require 'rubygems/package_task'
  require 'rubygems/tasks'
  require 'rbconfig'
+ require 'rake/clean'
  
 -USE_RAKE_COMPILER = (RUBY_PLATFORM =~ /java/) ? false : true
 -if USE_RAKE_COMPILER
 -  gem 'rake-compiler', '>=0.6.0'
 -  require 'rake/extensiontask'
 -end
 -
  require 'date'
  require 'fileutils'
  require 'rbconfig'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-ffi.git