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

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit b9225e5c55f201b308f5fecd197465c859139f05
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Wed Jul 27 16:22:01 2011 +0900

    Update debian/changelog
    
     * Fix FTBFS: (Closes: #634449)
       - debian/patches/move_propids_location: fix filepath
       - debian/rules: running "dh_install data/*" before dh_ruby --install
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/changelog b/debian/changelog
index 00c3e70..033ae98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-ole (1.2.11.1-5) unstable; urgency=low
+
+  * Fix FTBFS: (Closes: #634449)
+    - debian/patches/move_propids_location: fix filepath
+    - debian/rules: running "dh_install data/*" before dh_ruby --install
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>  Wed, 27 Jul 2011 16:17:40 +0900
+
 ruby-ole (1.2.11.1-4) unstable; urgency=low
 
   * Repackaged with the gem2deb packaging infrastructure
diff --git a/debian/patches/move_propids_location b/debian/patches/move_propids_location
index b486484..cb60ff1 100644
--- a/debian/patches/move_propids_location
+++ b/debian/patches/move_propids_location
@@ -8,13 +8,14 @@ Forwarded: not-needed
 Author: Gunnar Wolf <gwolf at debian.org>
 --- ruby-ole.orig/lib/ole/types/property_set.rb
 +++ ruby-ole/lib/ole/types/property_set.rb
-@@ -24,7 +24,12 @@
+@@ -24,7 +24,13 @@
  			}
  
  			# 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'
++                                    File.dirname(__FILE__) + '/../../../../../share/ruby-ole/data/propids.yaml',
++                                    File.dirname(__FILE__) + '/../../../data/propids.yaml'
 +                                  ].select { |filepath|
 +                                 File.exists?(filepath) }.first
 +                        raise Exception, 'propids.yaml file could not be found' if propids.nil?
diff --git a/lib/ole/types/property_set.rb b/lib/ole/types/property_set.rb
index 78b0d1c..e619388 100644
--- a/lib/ole/types/property_set.rb
+++ b/lib/ole/types/property_set.rb
@@ -25,7 +25,8 @@ module Ole
 
 			# define a smattering of the property set guids. 
                         propids = [ '/usr/share/ruby-ole/propids.yaml',
-                                    File.dirname(__FILE__) + '/../../../../../share/ruby-ole/data/propids.yaml'
+                                    File.dirname(__FILE__) + '/../../../../../share/ruby-ole/data/propids.yaml',
+                                    File.dirname(__FILE__) + '/../../../data/propids.yaml'
                                   ].select { |filepath|
                                  File.exists?(filepath) }.first
                         raise Exception, 'propids.yaml file could not be found' if propids.nil?

-- 
ruby-ole.git