[DRE-commits] [SCM] ruby-fssm.git branch, master, updated. upstream/0.2.9-10-g8b256d3

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 5654b66387e6becd6cbbfd4ddb15483f6d6f8cfe
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue May 15 23:50:41 2012 +0200

    patch example.rb and lib/fssb.rb to remove rubygems and avoid load path manip

diff --git a/debian/patches/modify_example_rb.patch b/debian/patches/modify_example_rb.patch
new file mode 100644
index 0000000..b47a050
--- /dev/null
+++ b/debian/patches/modify_example_rb.patch
@@ -0,0 +1,20 @@
+Description: Modify slightly the example to avoid requirement on rubygems
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2012-05-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/example.rb
++++ b/example.rb
+@@ -1,7 +1,8 @@
+-$:.unshift(File.join(File.dirname(__FILE__), 'lib'))
+-
+-# for rb-inotify/rb-fsevent
+-require 'rubygems'
++begin
++  require 'rb-inotify'
++rescue LoadError
++  puts "Cannot load rb-inotify"
++end
+ 
+ require 'fssm'
+ 
diff --git a/debian/patches/remove_load_path_manipulations.patch b/debian/patches/remove_load_path_manipulations.patch
new file mode 100644
index 0000000..b940ac5
--- /dev/null
+++ b/debian/patches/remove_load_path_manipulations.patch
@@ -0,0 +1,14 @@
+Description: Avoid $LOAD_PATH manipulations in lib/fssm.rb
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2012-05-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lib/fssm.rb
++++ b/lib/fssm.rb
+@@ -1,6 +1,3 @@
+-dir = File.expand_path(File.dirname(__FILE__))
+-$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
+-
+ require 'thread'
+ 
+ module FSSM
diff --git a/debian/patches/series b/debian/patches/series
index e5d48e4..e024058 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 remove_rubygems_bundler_stuff_from_spec.patch
+remove_load_path_manipulations.patch
+modify_example_rb.patch

-- 
ruby-fssm.git