[DRE-commits] [SCM] ruby-cairo.git branch, master, updated. debian/1.10.0-2-3-gc02a545

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit e89a0d16983f188b4f448bb96b2dfe96c5d5ac65
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sat Jul 2 01:03:02 2011 -0700

    Revert "Fix name clash between cairo.rb and cairo.so"
    
    This reverts commit 1cf42bcef621bc5d6418e97adf091a669c0d91fe.

diff --git a/ext/cairo/extconf.rb b/ext/cairo/extconf.rb
index aa6372e..ea3cb8c 100755
--- a/ext/cairo/extconf.rb
+++ b/ext/cairo/extconf.rb
@@ -75,4 +75,4 @@ have_header("ruby/io.h") unless have_macro("HAVE_RUBY_IO_H", "ruby.h")
 have_func("rb_errinfo", "ruby.h")
 have_type("enum ruby_value_type", "ruby.h")
 
-create_makefile(module_name + '_ext')
+create_makefile(module_name)
diff --git a/ext/cairo/rb_cairo.c b/ext/cairo/rb_cairo.c
index 9f221e1..89554c3 100644
--- a/ext/cairo/rb_cairo.c
+++ b/ext/cairo/rb_cairo.c
@@ -46,7 +46,7 @@ rb_cairo_satisfied_version (int argc, VALUE *argv, VALUE self)
 }
 
 void
-Init_cairo_ext ()
+Init_cairo ()
 {
   int major, minor, micro;
 
diff --git a/lib/cairo.rb b/lib/cairo.rb
index 470bcc4..6c6d5c2 100644
--- a/lib/cairo.rb
+++ b/lib/cairo.rb
@@ -41,9 +41,9 @@ require 'cairo/paper'
 
 begin
   major, minor, micro, = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/cairo_ext"
+  require "#{major}.#{minor}/cairo.so"
 rescue LoadError
-  require 'cairo_ext'
+  require 'cairo.so'
 end
 require 'cairo/constants'
 

-- 
ruby-cairo.git