[DRE-commits] [SCM] ruby-ferret.git branch, master, updated. debian/0.11.6-3-25-gf7cc012

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit f7cc0125f1b15f929b4ee2d0d8393e7c188526c2
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Fri Jun 15 10:56:27 2012 +0200

    Run tests with ruby-tests.rb instead of ruby-tests.rake
    
    The loadpath was overriden in tests by Gem2Deb::Rake::TestTask causing
    test failure in non clean environments when a previous version was
    already installed.

diff --git a/debian/control b/debian/control
index 5e74e12..6c6c9a5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Antonio Terceiro <terceiro at debian.org>, Paul van Tilburg <paulvt at debian.org>, Leandro Nunes dos Santos <leandronunes at colivre.coop.br>, Cédric Boutillier <cedric.boutillier at gmail.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.6~), rake, libbz2-dev
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.6~), libbz2-dev
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-ferret.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-ferret.git;a=summary
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
deleted file mode 100644
index c7ea259..0000000
--- a/debian/ruby-tests.rake
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'gem2deb/rake/testtask'
-
-Gem2Deb::Rake::TestTask.new do |t|
-  t.libs << 'test/unit'
-  t.test_files = Dir.glob('test/unit/t[cs]_*.rb') + ['debian/test.rb']
-  t.verbose = true
-end
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
new file mode 100644
index 0000000..a6f1741
--- /dev/null
+++ b/debian/ruby-tests.rb
@@ -0,0 +1,3 @@
+require 'test/unit'
+
+Dir.glob("test/unit/t[cs]*.rb").each { |f| require f }

-- 
ruby-ferret.git