[DRE-commits] [SCM] ruby-globalhotkeys.git branch, master, updated. upstream/0.3.2-14-ge509b01

[Vincent Carmona]

The following commit has been merged in the master branch:
commit 04f16f6acaf56eb8cd0191857bcfe05e41218eb9
Author: Vincent Carmona <vinc4mai at gmail.com>
Date:   Sat Apr 30 04:32:57 2011 +0200

    Fix require bug

diff --git a/debian/changelog b/debian/changelog
index 97b9746..e558cfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-globalhotkeys (0.3.2-3) unstable; urgency=low
+
+  * d/patches: add fix-require.diff
+   "require 'globalhotkeys'" loaded so file.
+
+ -- Vincent Carmona <vinc4mai at gmail.com>  Sat, 30 Apr 2011 02:24:32 +0200
+
 ruby-globalhotkeys (0.3.2-2) unstable; urgency=low
 
   * debian/rules: drop override to remove the duplicate file in the
diff --git a/debian/patches/fix-require.diff b/debian/patches/fix-require.diff
new file mode 100644
index 0000000..f551429
--- /dev/null
+++ b/debian/patches/fix-require.diff
@@ -0,0 +1,34 @@
+Author: Vincent Carmona <vinc4mai at gmail.com>
+Description: Fix require bug
+ * "require 'globalhotkeys'" was loading globalhotkeys.so
+ * instead of globalhotkeys.rb
+--- a/extconf.rb
++++ b/extconf.rb
+@@ -62,4 +62,4 @@
+ f.close
+ add_distclean(keysyms_file)
+ 
+-create_makefile("globalhotkeys")
++create_makefile("globalhotkeys_ext")
+--- a/globalhotkeys.c
++++ b/globalhotkeys.c
+@@ -263,7 +263,7 @@
+ }
+ 
+ void
+-Init_globalhotkeys()
++Init_globalhotkeys_ext()
+ {
+ /*
+  * rghk provides a simple way to set global hotkeys.
+--- a/lib/globalhotkeys.rb
++++ b/lib/globalhotkeys.rb
+@@ -20,7 +20,7 @@
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ =end
+ 
+-require 'globalhotkeys.so'
++require 'globalhotkeys_ext.so'
+ 
+ #:main: GlobalHotKeys
+ module GlobalHotKeys
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e52a093
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-require.diff

-- 
ruby-globalhotkeys.git