[DRE-commits] [SCM] ruby-hpricot.git branch, master, updated. debian/0.8.6-2-2-gb4d6f78

[Tollef Fog Heen]

The following commit has been merged in the master branch:
commit 0b1d31b41c0d29dc56f3b17b1f62a56eb2a43140
Author: Tollef Fog Heen <tfheen at debian.org>
Date:   Sat Jun 30 20:58:50 2012 +0200

    Stop shipping fast_xs and depend on it instead.  Closes: 679606

diff --git a/debian/changelog b/debian/changelog
index 3e8b923..a306ae9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-hpricot (0.8.6-3) UNRELEASED; urgency=low
+
+  * Stop shipping fast_xs and depend on it instead.  Closes: 679606
+
+ -- Tollef Fog Heen <tfheen at debian.org>  Sat, 30 Jun 2012 20:58:04 +0200
+
 ruby-hpricot (0.8.6-2) unstable; urgency=low
 
   * Bump build dependency on gem2deb to >= 0.3.0~
diff --git a/debian/control b/debian/control
index 5eb3e1c..f7c6340 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: Ryan Niebur <ryan at debian.org>, Micah Anderson <micah at debian.org>, Cédric Boutillier <cedric.boutillier at gmail.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-fast-xs
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-hpricot.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-hpricot.git;a=summary
@@ -14,7 +14,7 @@ XS-Ruby-Versions: all
 Package: ruby-hpricot
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-fast-xs
 Description: fast, enjoyable HTML parser
  Hpricot is a fast, flexible HTML parser written in C.  It's designed to be
  very accomodating (like Tanaka Akira's HTree) and to have a very helpful
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index 1631e59..6f62f33 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1,2 +1,3 @@
 $: << 'test'
+system("find -name fast_xs.so -delete")
 Dir['test/test*.rb'].each { |f| require f }

-- 
ruby-hpricot.git