[DRE-commits] [SCM] gem2deb.git branch, master, updated. 006f36dfa0c064d2712f58af3e028ca6bdc1ee0f

Vincent Fourmond fourmond at debian.org
Wed May 11 16:03:25 UTC 2011


The following commit has been merged in the master branch:
commit 006f36dfa0c064d2712f58af3e028ca6bdc1ee0f
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Wed May 11 17:45:21 2011 +0200

    Squash remaining setup.rb bugs

diff --git a/lib/gem2deb/dh_ruby.rb b/lib/gem2deb/dh_ruby.rb
index fe5fd18..0102c81 100644
--- a/lib/gem2deb/dh_ruby.rb
+++ b/lib/gem2deb/dh_ruby.rb
@@ -160,8 +160,8 @@ module Gem2Deb
     # Here comes the code for installation specific to the traditional
     # installation scheme.
     def setuprb_install(package, supported_versions)
-      for rubyver in supported_version
-        ruby = SUPPORTED_VERSIONS[rubyver]
+      for rubyver in supported_versions
+        ruby = SUPPORTED_RUBY_VERSIONS[rubyver]
         siteruby = destdir(package, :libdir, rubyver)
         bindir = destdir(package, :bindir, rubyver)
         archdir = destdir(package, :archdir, rubyver)
@@ -169,13 +169,16 @@ module Gem2Deb
 
         # First configure
         spawn("#{ruby} setup.rb config --prefix=#{prefix} --bindir=#{bindir} --siteruby=#{siteruby} --siterubyver=#{siteruby} --siterubyverarch=#{archdir}")
-        
-        # then clean (to make sure old things are removed)
-        spawn("#{ruby} setup.rb clean")
 
-        # And install. We risk installing twice to the same target,
-        # but that doesn't matter much.
+        # Then setup
+        spawn("#{ruby} setup.rb setup")
+
+        # Then install
         spawn("#{ruby} setup.rb install")
+
+        # Then clean
+        spawn("#{ruby} setup.rb clean")
+        
       end
     end
 

-- 
gem2deb.git



More information about the Pkg-ruby-extras-commits mailing list