[DRE-commits] r3411 - in packages-wip/libole-ruby/trunk: . debian debian/patches

[Gunnar Wolf]

Author: gwolf
Date: 2009-04-21 19:27:41 +0000 (Tue, 21 Apr 2009)
New Revision: 3411

Added:
   packages-wip/libole-ruby/trunk/debian/patches/
   packages-wip/libole-ruby/trunk/debian/patches/move_propids_location
   packages-wip/libole-ruby/trunk/debian/patches/series
   packages-wip/libole-ruby/trunk/debian/patches/set_ruby_version_in_bin
Removed:
   packages-wip/libole-ruby/trunk/bin/
Modified:
   packages-wip/libole-ruby/trunk/debian/control
   packages-wip/libole-ruby/trunk/debian/rules
Log:
Moved propids.yaml around to be policy-compliant; patches handled through quilt now.

Modified: packages-wip/libole-ruby/trunk/debian/control
===================================================================
--- packages-wip/libole-ruby/trunk/debian/control	2009-04-21 18:38:03 UTC (rev 3410)
+++ packages-wip/libole-ruby/trunk/debian/control	2009-04-21 19:27:41 UTC (rev 3411)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Gunnar Wolf <gwolf at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: cdbs, debhelper (>= 5), ruby-pkg-tools (>= 0.8)
+Build-Depends: cdbs, debhelper (>= 5), ruby-pkg-tools (>= 0.8), quilt
 Build-Depends-Indep: ruby1.8, rdoc
 Standards-Version: 3.8.1
 

Added: packages-wip/libole-ruby/trunk/debian/patches/move_propids_location
===================================================================
--- packages-wip/libole-ruby/trunk/debian/patches/move_propids_location	                        (rev 0)
+++ packages-wip/libole-ruby/trunk/debian/patches/move_propids_location	2009-04-21 19:27:41 UTC (rev 3411)
@@ -0,0 +1,13 @@
+Index: libole-ruby-1.2.8.2/lib/ole/types/property_set.rb
+===================================================================
+--- libole-ruby-1.2.8.2.orig/lib/ole/types/property_set.rb	2009-04-21 14:20:02.000000000 -0500
++++ libole-ruby-1.2.8.2/lib/ole/types/property_set.rb	2009-04-21 14:21:37.000000000 -0500
+@@ -23,7 +23,7 @@
+ 			}
+ 
+ 			# define a smattering of the property set guids. 
+-			DATA = YAML.load_file(File.dirname(__FILE__) + '/../../../data/propids.yaml').
++			DATA = YAML.load_file('/usr/share/libole-ruby1.8/propids.yaml').
+ 				inject({}) { |hash, (key, value)| hash.update Clsid.parse(key) => value }
+ 
+ 			# create an inverted map of names to guid/key pairs

Added: packages-wip/libole-ruby/trunk/debian/patches/series
===================================================================
--- packages-wip/libole-ruby/trunk/debian/patches/series	                        (rev 0)
+++ packages-wip/libole-ruby/trunk/debian/patches/series	2009-04-21 19:27:41 UTC (rev 3411)
@@ -0,0 +1,2 @@
+move_propids_location
+set_ruby_version_in_bin

Added: packages-wip/libole-ruby/trunk/debian/patches/set_ruby_version_in_bin
===================================================================
--- packages-wip/libole-ruby/trunk/debian/patches/set_ruby_version_in_bin	                        (rev 0)
+++ packages-wip/libole-ruby/trunk/debian/patches/set_ruby_version_in_bin	2009-04-21 19:27:41 UTC (rev 3411)
@@ -0,0 +1,10 @@
+Index: libole-ruby-1.2.8.2/bin/oletool
+===================================================================
+--- libole-ruby-1.2.8.2.orig/bin/oletool	2009-04-21 13:50:06.000000000 -0500
++++ libole-ruby-1.2.8.2/bin/oletool	2009-04-21 13:50:09.000000000 -0500
+@@ -1,4 +1,4 @@
+-#! /usr/bin/ruby
++#! /usr/bin/ruby1.8
+ 
+ require 'optparse'
+ require 'rubygems'

Modified: packages-wip/libole-ruby/trunk/debian/rules
===================================================================
--- packages-wip/libole-ruby/trunk/debian/rules	2009-04-21 18:38:03 UTC (rev 3410)
+++ packages-wip/libole-ruby/trunk/debian/rules	2009-04-21 19:27:41 UTC (rev 3411)
@@ -2,3 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_RUBY_CONFIG_ARGS = --datadir=/usr/share/libole-ruby1.8 --installdirs=std