[DRE-commits] [SCM] ruby-ole.git branch, master, updated. upstream/1.2.11.1-3-g6ce1ee3

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 6ce1ee33b02d95fcc57232ac8b33dcb7aad08898
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Jul 26 17:13:26 2011 +0900

    Fix FTBFS: 634449
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/patches/move_propids_location b/debian/patches/move_propids_location
index 41e4444..b486484 100644
--- a/debian/patches/move_propids_location
+++ b/debian/patches/move_propids_location
@@ -6,17 +6,15 @@ Description: Hard-code the position of the `propids.yaml' file, as it
 Origin: vendor
 Forwarded: not-needed
 Author: Gunnar Wolf <gwolf at debian.org>
-Index: ruby-ole-1.2.11.1/lib/ole/types/property_set.rb
-===================================================================
---- ruby-ole-1.2.11.1.orig/lib/ole/types/property_set.rb	2011-05-16 10:40:04.000000000 -0500
-+++ ruby-ole-1.2.11.1/lib/ole/types/property_set.rb	2011-05-16 10:51:37.000000000 -0500
+--- ruby-ole.orig/lib/ole/types/property_set.rb
++++ ruby-ole/lib/ole/types/property_set.rb
 @@ -24,7 +24,12 @@
  			}
  
  			# define a smattering of the property set guids. 
 -			DATA = YAML.load_file(File.dirname(__FILE__) + '/../../../data/propids.yaml').
 +                        propids = [ '/usr/share/ruby-ole/propids.yaml',
-+                                    File.dirname(__FILE__) + '/../../../data/propids.yaml'
++                                    File.dirname(__FILE__) + '/../../../../../share/ruby-ole/data/propids.yaml'
 +                                  ].select { |filepath|
 +                                 File.exists?(filepath) }.first
 +                        raise Exception, 'propids.yaml file could not be found' if propids.nil?
diff --git a/debian/ruby-ole.install b/debian/ruby-ole.install
deleted file mode 100644
index 907844b..0000000
--- a/debian/ruby-ole.install
+++ /dev/null
@@ -1 +0,0 @@
-data/* /usr/share/ruby-ole/
diff --git a/debian/rules b/debian/rules
index bb585b9..0da7e6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,9 @@ BUILDDIR=./debian/ruby-ole
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
-override_dh_install:
-	dh_install
+override_dh_auto_install:
+	dh_install data usr/share/ruby-ole/
+	dh_auto_install
 	# Provided binary `oletool' should rather be shipped as an
 	# example
 	mkdir -p $(BUILDDIR)/usr/share/doc/ruby-ole/examples/
diff --git a/lib/ole/types/property_set.rb b/lib/ole/types/property_set.rb
index ce8662d..78b0d1c 100644
--- a/lib/ole/types/property_set.rb
+++ b/lib/ole/types/property_set.rb
@@ -24,7 +24,12 @@ module Ole
 			}
 
 			# define a smattering of the property set guids. 
-			DATA = YAML.load_file(File.dirname(__FILE__) + '/../../../data/propids.yaml').
+                        propids = [ '/usr/share/ruby-ole/propids.yaml',
+                                    File.dirname(__FILE__) + '/../../../../../share/ruby-ole/data/propids.yaml'
+                                  ].select { |filepath|
+                                 File.exists?(filepath) }.first
+                        raise Exception, 'propids.yaml file could not be found' if propids.nil?
+                        DATA = YAML.load_file(propids).
 				inject({}) { |hash, (key, value)| hash.update Clsid.parse(key) => value }
 
 			# create an inverted map of names to guid/key pairs

-- 
ruby-ole.git