[DRE-commits] [SCM] ruby-cairo.git branch, master, updated. debian/1.10.0-2-4-ge6a8fe8

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit e6a8fe87bddd32fe1ce13be4d6b5e3da523cff2d
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sun Jul 3 17:10:55 2011 -0700

    Trust gem2deb's test runner to set the $LOAD_PATH
    
    This new testrunner will be released with gem2deb 0.2.6

diff --git a/debian/changelog b/debian/changelog
index 0730706..05570b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ ruby-cairo (1.10.0-3) UNRELEASED; urgency=low
 
   * Reverted patch to fix name clash between cairo.rb and cairo.so. See
     discussion with upstream at https://github.com/rcairo/rcairo/issues/5
-  * debian/ruby-tests.rake: inverted order of directories in library path to
-    reproduce the problem in #632071.
+  * debian/ruby-tests.rake: removed explicit library paths to expose the
+    problem in #632071 with the help of gem2deb's enhanced test runner.
+    + Build-Depend on gem2deb >= 0.2.6 for that
 
  -- Antonio Terceiro <terceiro at softwarelivre.org>  Sat, 02 Jul 2011 01:08:38 -0700
 
diff --git a/debian/control b/debian/control
index f42a696..8b2fd74 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: Paul van Tilburg <paulvt at debian.org>, Antonio Terceiro <terceiro at softwarelivre.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.4~), ruby-pkg-config, libcairo2-dev (>= 1.6.0), rake
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.6~), ruby-pkg-config, libcairo2-dev (>= 1.6.0), rake
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-cairo.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-cairo.git;a=summary
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 74fca65..bc2c0be 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -3,10 +3,7 @@ require 'rake/testtask'
 require 'rbconfig'
 
 Rake::TestTask.new do |t|
-  t.libs = []
-  t.libs << File.join('debian/ruby-cairo', Config::CONFIG['vendorarchdir'])
-  t.libs << File.join('debian/ruby-cairo', Config::CONFIG['vendordir'])
-  t.libs << "test"
+  t.libs = ["test"]
   t.test_files = FileList['test/test_*.rb'].reject do |test|
     test =~ %r{^test/test_(xml|tee|script)}
   end

-- 
ruby-cairo.git