[DRE-commits] [SCM] ruby-bluecloth.git branch, master, updated. upstream/2.1.0-19-g89f968f

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 89f968f8f72fd982e3c818fcd62f3d7626026713
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Fri Aug 19 13:40:33 2011 +0200

    enable test suite for ruby1.8. Build-depends on libtidy-ruby1.8

diff --git a/debian/control b/debian/control
index c4be933..3aa9d07 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: Arnaud Cornet <arnaud.cornet at gmail.com>, Paul van Tilburg <paulvt at debian.org>, Cédric Boutillier <cedric.boutillier at gmail.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.6~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.6~), libtidy-ruby1.8 (>= 1.1.2)
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-bluecloth.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-bluecloth.git;a=summary
@@ -15,6 +15,7 @@ Package: ruby-bluecloth
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Suggests: libtidy-ruby
 Replaces: libbluecloth-ruby (<< 2.1.0-1~), libbluecloth-ruby1.8 (<< 2.1.0-1~)
 Breaks: libbluecloth-ruby (<< 2.1.0-1~), libbluecloth-ruby1.8 (<< 2.1.0-1~)
 Provides: libbluecloth-ruby, libbluecloth-ruby1.8
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index eac5ce6..200d0d8 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -4,7 +4,7 @@
 # a good idea to define it here so the package gets tested at build time.
 # Examples:
 # $: << 'lib' << '.'
-# Dir['{spec,test}/**/*.rb'].each { |f| require f }
+Dir['{spec,test}/**/*.rb'].each { |f| require f }
 #
 # require 'test/ts_foo.rb'
 #
diff --git a/debian/rules b/debian/rules
index 647adce..04dacc0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@
 # Uncomment to ignore some test failures (but the tests will run anyway).
 # Valid values:
 #export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
+export DH_RUBY_IGNORE_TESTS=ruby1.9.1
 #
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec

-- 
ruby-bluecloth.git