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

[Micah Anderson]

Author: micah
Date: 2010-03-05 22:47:46 +0000 (Fri, 05 Mar 2010)
New Revision: 4888

Added:
   trunk/libffi-ruby/debian/post-install.rb
Modified:
   trunk/libffi-ruby/debian/changelog
   trunk/libffi-ruby/debian/control
   trunk/libffi-ruby/debian/rules
Log:
switch to ruby1.9 until upstream can do 1.9.1; generate missing types.conf during the package build

Modified: trunk/libffi-ruby/debian/changelog
===================================================================
--- trunk/libffi-ruby/debian/changelog	2010-03-05 19:08:21 UTC (rev 4887)
+++ trunk/libffi-ruby/debian/changelog	2010-03-05 22:47:46 UTC (rev 4888)
@@ -1,3 +1,10 @@
+libffi-ruby (0.6.2debian-2) unstable; urgency=low
+
+  * Generate missing types.conf during the package build
+  * Seems to only support ruby 1.9 for now, so switch away from 1.9.1
+
+ -- Micah Anderson <micah at debian.org>  Fri, 05 Mar 2010 01:01:30 -0500
+
 libffi-ruby (0.6.2debian-1) unstable; urgency=low
 
   * Repack upstream source to remove embedded libffi

Modified: trunk/libffi-ruby/debian/control
===================================================================
--- trunk/libffi-ruby/debian/control	2010-03-05 19:08:21 UTC (rev 4887)
+++ trunk/libffi-ruby/debian/control	2010-03-05 22:47:46 UTC (rev 4888)
@@ -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.1, ruby1.9.1-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
 Standards-Version: 3.8.4
 Homepage: http://github.com/ffi/ffi
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libffi-ruby/
@@ -35,9 +35,9 @@
  This package is built for Ruby 1.8.
 
 
-Package: libffi-ruby1.9.1
+Package: libffi-ruby1.9
 Architecture: any
-Depends: ruby1.9.1, ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby1.9, ${shlibs:Depends}, ${misc:Depends}
 Description: load dynamic libraries, bind functions from within ruby code
  Ruby-FFI is a ruby extension for programmatically loading dynamic
  libraries, binding functions within them, and calling those functions
@@ -45,4 +45,4 @@
  on Ruby and JRuby. Discover why should you write your next extension
  using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].
  .
- This package is built for Ruby 1.9.1.
+ This package is built for Ruby 1.9.

Added: trunk/libffi-ruby/debian/post-install.rb
===================================================================
--- trunk/libffi-ruby/debian/post-install.rb	                        (rev 0)
+++ trunk/libffi-ruby/debian/post-install.rb	2010-03-05 22:47:46 UTC (rev 4888)
@@ -0,0 +1,20 @@
+require "fileutils"
+# Load the fresh installed ffi release
+
+if RUBY_VERSION == '1.8.7'
+  $:.unshift "./debian/libffi-ruby1.8/usr/lib/ruby/"
+  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"
+  
+  File.open(File.join('./debian/libffi-ruby1.8/usr/lib/ruby/1.8/ffi', 'types.conf'),'w') do |f|
+    f.puts FFI::TypesGenerator.generate
+  end
+else
+  $:.unshift "./debian/libffi-ruby#{RUBY_VERSION}/usr/lib/ruby/"
+  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"
+
+  File.open(File.join('./debian/libffi-ruby#{RUBY_VERSION}/usr/lib/ruby/#{RUBY_VERSION}/ffi', 'types.conf'),'w') do |f|
+    f.puts FFI::TypesGenerator.generate
+  end
+end

Modified: trunk/libffi-ruby/debian/rules
===================================================================
--- trunk/libffi-ruby/debian/rules	2010-03-05 19:08:21 UTC (rev 4887)
+++ trunk/libffi-ruby/debian/rules	2010-03-05 22:47:46 UTC (rev 4888)
@@ -3,4 +3,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
+binary-post-install/libffi-ruby1.8::
+	/usr/bin/ruby1.8 $(CURDIR)/debian/post-install.rb
 
+binary-post-install/libffi-ruby1.9.1::
+	/usr/bin/ruby1.9.1 $(CURDIR)/debian/post-install.rb