[DRE-commits] [SCM] gem2deb.git branch, master, updated. debian/0.2.3-48-gae05bb2

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit f18eda66a5ac8374fd2376dde209cac59103d25a
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sun Jul 3 20:41:40 2011 -0700

    Fixing simpleextension_with_name_clash sample

diff --git a/test/sample/simpleextension_with_name_clash/Rakefile b/test/sample/simpleextension_with_name_clash/Rakefile
index 338cda6..58ae3ef 100644
--- a/test/sample/simpleextension_with_name_clash/Rakefile
+++ b/test/sample/simpleextension_with_name_clash/Rakefile
@@ -4,17 +4,17 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.summary = "Simple native extension with .rb/.so name clash used to test dh_ruby"
-  s.name = 'simpleextension_with_name_clash'
+  s.name = 'simpleextension-with-name-clash'
   s.version = '1.2.3'
   s.requirements << 'none'
   s.require_path = 'ext'
-  s.extensions << 'ex'
+  s.extensions << 'ext/extconf.rb'
   #s.autorequire = 'rake'
-  s.files = Dir.glob('{bin,ext}/**/*')
+  s.files = Dir.glob('{lib,ext,test}/**/*')
   s.description = <<EOF
-simpleextension is a simple native extension that is used to test dh_ruby.
+simpleextension_with_name_clash is a simple native extension that is used to test dh_ruby.
 EOF
-  s.test_files = ['test/test_simpleextension.rb']
+  s.test_files = ['test/simpleextension_with_name_clash_test.rb']
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
diff --git a/test/sample/simpleextension_with_name_clash/debian/ruby-tests.rake b/test/sample/simpleextension_with_name_clash/debian/ruby-tests.rake
deleted file mode 100644
index 10bf04e..0000000
--- a/test/sample/simpleextension_with_name_clash/debian/ruby-tests.rake
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'rake/testtask'
-
-Rake::TestTask.new(:default) do |t|
-  t.test_files = 'test/simpleextension_with_name_clash_test.rb'
-end
diff --git a/test/sample/simpleextension_in_root/pkg/simpleextension_in_root-1.2.3.gem b/test/sample/simpleextension_with_name_clash/pkg/simpleextension-with-name-clash-1.2.3.gem
similarity index 53%
copy from test/sample/simpleextension_in_root/pkg/simpleextension_in_root-1.2.3.gem
copy to test/sample/simpleextension_with_name_clash/pkg/simpleextension-with-name-clash-1.2.3.gem
index e7b5139..357cca8 100644
Binary files a/test/sample/simpleextension_in_root/pkg/simpleextension_in_root-1.2.3.gem and b/test/sample/simpleextension_with_name_clash/pkg/simpleextension-with-name-clash-1.2.3.gem differ

-- 
gem2deb.git