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

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit c02a545d3678e7925c267beb355ab233a7299f85
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sat Jul 2 01:09:40 2011 -0700

    Reproducing the problem of #632071 in the tests

diff --git a/debian/changelog b/debian/changelog
index 65adf1a..0730706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ 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.
 
- -- Antonio Terceiro <terceiro at softwarelivre.org>  Sat, 02 Jul 2011 01:03:18 -0700
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Sat, 02 Jul 2011 01:08:38 -0700
 
 ruby-cairo (1.10.0-2) unstable; urgency=low
 
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 003679d..74fca65 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -4,8 +4,8 @@ require 'rbconfig'
 
 Rake::TestTask.new do |t|
   t.libs = []
-  t.libs << File.join('debian/ruby-cairo', Config::CONFIG['vendordir'])
   t.libs << File.join('debian/ruby-cairo', Config::CONFIG['vendorarchdir'])
+  t.libs << File.join('debian/ruby-cairo', Config::CONFIG['vendordir'])
   t.libs << "test"
   t.test_files = FileList['test/test_*.rb'].reject do |test|
     test =~ %r{^test/test_(xml|tee|script)}

-- 
ruby-cairo.git