[DRE-commits] [SCM] ruby-bacon.git branch, master, updated. debian/1.1.0-2-11-g17ee4e2

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit e9303945339a8e2a5064e7c6d2c64c780c189a17
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jun 19 18:39:14 2013 +0200

    do not install autotest files; remove conflict with ruby-rspec-core

diff --git a/debian/control b/debian/control
index f468cd4..1ca5e1b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Package: ruby-bacon
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Conflicts: ruby-rspec-core
 Description: Small RSpec clone
  Bacon is a small RSpec clone weighing less than 350 line of code, but
  nevertheless providing all essential features.
diff --git a/debian/rules b/debian/rules
index a5e7dc8..36d26e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,7 @@
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_install:
+	dh_auto_install
+	rm -rf debian/ruby-bacon/usr/lib/ruby/vendor_ruby/autotest/

-- 
ruby-bacon.git