[DRE-commits] [SCM] ruby-commandline.git branch, master, updated. upstream/0.7.10-8-g372fa7c

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 0623defbd3f4923ddf07c4ab465b9c02a00f7a3e
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sat Oct 15 17:20:43 2011 +0200

    remove copy of open4.rb and depend on ruby-open4

diff --git a/debian/control b/debian/control
index 893d393..9becad1 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ XS-Ruby-Versions: all
 Package: ruby-commandline
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-open4
 Replaces: libcommandline-ruby (<< 0.7.10-11~), libcommandline-ruby1.8 (<< 0.7.10-11~)
 Breaks: libcommandline-ruby (<< 0.7.10-11~), libcommandline-ruby1.8 (<< 0.7.10-11~)
 Provides: libcommandline-ruby, libcommandline-ruby1.8
diff --git a/debian/rules b/debian/rules
index 14cb7fa..4518d81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,11 @@ override_dh_auto_build:
 	rdoc --all --inline-source --diagram --fileboxes --line-numbers --fmt=html \
 	       -o build-doc/rdoc lib
 
+#remove bundled copy of open4
+override_dh_auto_install:
+	dh_auto_install
+	rm -f debian/ruby-commandline/usr/lib/ruby/vendor_ruby/open4.rb
+
 #remove built documentation
 override_dh_auto_clean:
 	dh_auto_clean

-- 
ruby-commandline.git