[DRE-commits] r4902 - trunk/libffi-ruby/debian

[Micah Anderson]

Author: micah
Date: 2010-03-06 18:04:03 +0000 (Sat, 06 Mar 2010)
New Revision: 4902

Added:
   trunk/libffi-ruby/debian/patches/
Modified:
   trunk/libffi-ruby/debian/changelog
   trunk/libffi-ruby/debian/control
   trunk/libffi-ruby/debian/post-install.rb
   trunk/libffi-ruby/debian/rules
Log:
fix ruby path in types.conf generation

Modified: trunk/libffi-ruby/debian/changelog
===================================================================
--- trunk/libffi-ruby/debian/changelog	2010-03-06 01:10:26 UTC (rev 4901)
+++ trunk/libffi-ruby/debian/changelog	2010-03-06 18:04:03 UTC (rev 4902)
@@ -1,3 +1,9 @@
+libffi-ruby (0.6.2debian-3) unstable; urgency=low
+
+  * Fix ruby path in types.conf generation
+
+ -- Micah Anderson <micah at debian.org>  Sat, 06 Mar 2010 12:04:55 -0500
+
 libffi-ruby (0.6.2debian-2) unstable; urgency=low
 
   * Generate missing types.conf during the package build

Modified: trunk/libffi-ruby/debian/control
===================================================================
--- trunk/libffi-ruby/debian/control	2010-03-06 01:10:26 UTC (rev 4901)
+++ trunk/libffi-ruby/debian/control	2010-03-06 18:04:03 UTC (rev 4902)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Micah Anderson <micah at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), cdbs, ruby-pkg-tools (>= 0.8), libsetup-ruby1.8, libffi-dev, ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev
+Build-Depends: debhelper (>= 7), cdbs, ruby-pkg-tools (>= 0.8), libsetup-ruby1.8, libffi-dev, ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev, quilt
 Standards-Version: 3.8.4
 Homepage: http://github.com/ffi/ffi
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libffi-ruby/

Modified: trunk/libffi-ruby/debian/post-install.rb
===================================================================
--- trunk/libffi-ruby/debian/post-install.rb	2010-03-06 01:10:26 UTC (rev 4901)
+++ trunk/libffi-ruby/debian/post-install.rb	2010-03-06 18:04:03 UTC (rev 4902)
@@ -3,6 +3,8 @@
 
 if RUBY_VERSION == '1.8.7'
   $:.unshift "./debian/libffi-ruby1.8/usr/lib/ruby/"
+  $:.unshift "./debian/libffi-ruby1.8/usr/lib/ruby/1.8/"
+  $:.unshift "./debian/libffi-ruby1.8/usr/lib/ruby/1.8/ffi/"
   require "./debian/libffi-ruby1.8/usr/lib/ruby/1.8/ffi.rb"
   require "./debian/libffi-ruby1.8/usr/lib/ruby/1.8/ffi/tools/types_generator"
   
@@ -11,6 +13,8 @@
   end
 else
   $:.unshift "./debian/libffi-ruby#{RUBY_VERSION}/usr/lib/ruby/"
+  $:.unshift "./debian/libffi-ruby#{RUBY_VERSION}/usr/lib/ruby/1.8/"
+  $:.unshift "./debian/libffi-ruby#{RUBY_VERSION}/usr/lib/ruby/1.8/ffi"
   require "./debian/libffi-ruby#{RUBY_VERSION}/usr/lib/ruby/#{RUBY_VERSION}/ffi.rb"
   require "./debian/libffi-ruby#{RUBY_VERSION}/usr/lib/ruby/#{RUBY_VERSION}/ffi/tools/types_generator"
 

Modified: trunk/libffi-ruby/debian/rules
===================================================================
--- trunk/libffi-ruby/debian/rules	2010-03-06 01:10:26 UTC (rev 4901)
+++ trunk/libffi-ruby/debian/rules	2010-03-06 18:04:03 UTC (rev 4902)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
 binary-post-install/libffi-ruby1.8::