[DRE-commits] [SCM] ruby-gnome2.git branch, master, updated. debian/1.0.0-1-10-g3982131

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 272e8bada77e4c5dc061bd41e3028ef53d407d93
Merge: 9c549391236d47ac6bec3e005405496e75354e64 91255ce7845109f85034b3333f4fb75f6b908f0d
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Nov 1 19:01:31 2011 -0200

    Merge branch 'upstream'
    
    Conflicts:
    	gtk2/ext/gtk2/rbgtkcellrendererspinner.c
    	gtk2/ext/gtk2/rbgtkspinner.c
    	gtkmozembed/ext/gtkmozembed/extconf.rb
    	gtkmozembed/ext/gtkmozembed/rbgtkmozembed-init.cpp

diff --combined extconf.rb
index ed7fd26,d85f497..c38964b
--- a/extconf.rb
+++ b/extconf.rb
@@@ -16,7 -16,7 +16,7 @@@ priorlibs = ["glib2", "gio2", "gdk_pixb
  #
  # detect sub-directories
  #
- $ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['RUBY_INSTALL_NAME'] + Config::CONFIG['EXEEXT'])
+ $ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['RUBY_INSTALL_NAME'] + RbConfig::CONFIG['EXEEXT'])
  $ruby = arg_config("--ruby", $ruby)
  
  rm = "rm -f"
@@@ -42,9 -42,6 +42,9 @@@ if subdirs.size == 
      subdir[0..$topsrcdir.size] = ""
      File.dirname(subdir)
    end
 +  subdirs.reject! do |subdir|
 +    subdir =~ /gtkmozembed/
 +  end
    priorlibs &= subdirs
    subdirs -= priorlibs
    subdirs = priorlibs + subdirs #Change the order
@@@ -78,10 -75,6 +78,10 @@@ subdirs.each do |subdir
    if ret
      targets << subdir
    else
 +    if $strict
 +        exit(1)
 +    end
 +
      ignore << subdir
    end
  end
@@@ -121,7 -114,6 +121,7 @@@ def run_make_in_sub_dirs(command
  	  echo "FAILED: $$failed";		\\
  	  echo "-----";				\\
  	  echo "Done.";				\\
 +	  test "$$failed" = "NONE";             \\
  	)
      EOS
    end

-- 
ruby-gnome2.git