[DRE-commits] [SCM] Packaging for ruby-taglib2 branch, master, updated. upstream/0.1.3-11-g24c5180

[Vincent Carmona]

The following commit has been merged in the master branch:
commit ff7af23a06bd6c6f6a72d5154695bf26ed0d0c70
Author: Vincent Carmona <vinc4mai at gmail.com>
Date:   Sat Apr 30 01:29:19 2011 +0200

    Add fix-require.diff patch

diff --git a/debian/changelog b/debian/changelog
index 4931de4..d9b1e75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,5 +5,7 @@ ruby-taglib2 (0.1.3-1) unstable; urgency=low
     - Provides/Replaces/Conflicts ruby-taglib
   * d/patches:
     - add compat.diff see README.Debian
+    - add fix-require.diff
+      fix "require 'taglib2'" loading taglib2.so instead of taglib2.rb
 
  -- Vincent Carmona <vinc4mai at gmail.com>  Thu, 28 Apr 2011 20:13:21 +0200
diff --git a/debian/patches/fix-require.diff b/debian/patches/fix-require.diff
new file mode 100644
index 0000000..26d099b
--- /dev/null
+++ b/debian/patches/fix-require.diff
@@ -0,0 +1,30 @@
+--- a/extconf.rb
++++ b/extconf.rb
+@@ -28,4 +28,4 @@
+ if ARGV.include?("--compat")
+ 	($INSTALLFILES ||= []) << ["compat/taglib.rb", "$(RUBYLIBDIR)", 'compat']
+ end
+-create_makefile("taglib2")
++create_makefile("taglib2_ext")
+--- a/lib/taglib2.rb
++++ b/lib/taglib2.rb
+@@ -19,7 +19,7 @@
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ =end
+ 
+-require "taglib2.so"
++require "taglib2_ext.so"
+ 
+ #:main: TagLib::File
+ module TagLib
+--- a/taglib2.c
++++ b/taglib2.c
+@@ -372,7 +372,7 @@
+ }
+ 
+ void
+-Init_taglib2()
++Init_taglib2_ext()
+ {
+ /*
+ ruby-taglib2 is a Ruby interface to TagLib, the audio meta-data library.
diff --git a/debian/patches/series b/debian/patches/series
index e96754c..f61f59b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix-require.diff
 compat.diff

-- 
Packaging for ruby-taglib2