[DRE-commits] [SCM] gem2deb.git branch, master, updated. e54f196cd9435c5147d4b83469a2be5cf12303b1

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 5107b27ce7653880dedecb1e99fc3f583347444c
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Wed Mar 23 16:10:41 2011 +0100

    Add a dh7 sequence.

diff --git a/debhelper7/ruby.pm b/debhelper7/buildsystem/ruby.pm
similarity index 100%
rename from debhelper7/ruby.pm
rename to debhelper7/buildsystem/ruby.pm
diff --git a/debhelper7/sequence/ruby.pm b/debhelper7/sequence/ruby.pm
new file mode 100644
index 0000000..57524d1
--- /dev/null
+++ b/debhelper7/sequence/ruby.pm
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+# debhelper sequence file for ruby
+
+use warnings;
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+#insert_after("dh_perl", "dh_python2");
+#remove_command("dh_pycentral");
+#remove_command("dh_pysupport");
+
+1
diff --git a/debian/changelog b/debian/changelog
index a10ac5a..a2c3a66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ gem2deb (0.1.1) experimental; urgency=low
   * Generate a better debian/copyright template.
   * Support DEB_BUILD_OPTIONS=nocheck.
   * Put everything in the same binary package.
+  * Add a dh7 sequence.
 
- -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Wed, 23 Mar 2011 16:06:45 +0100
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Wed, 23 Mar 2011 16:09:53 +0100
 
 gem2deb (0.1.0) experimental; urgency=low
 
diff --git a/debian/gem2deb.install b/debian/gem2deb.install
index f5df652..b853bb3 100644
--- a/debian/gem2deb.install
+++ b/debian/gem2deb.install
@@ -1,3 +1,4 @@
 bin/* /usr/bin/
 lib/* /usr/lib/ruby/vendor_ruby/
-debhelper7/ruby.pm /usr/share/perl5/Debian/Debhelper/Buildsystem/
+debhelper7/buildsystem/ruby.pm /usr/share/perl5/Debian/Debhelper/Buildsystem/
+debhelper7/sequence/ruby.pm /usr/share/perl5/Debian/Debhelper/Sequence/
diff --git a/lib/gem2deb/dh_make_ruby.rb b/lib/gem2deb/dh_make_ruby.rb
index 543ebe9..22f9d82 100644
--- a/lib/gem2deb/dh_make_ruby.rb
+++ b/lib/gem2deb/dh_make_ruby.rb
@@ -400,7 +400,7 @@ Description: <%= short_description ? short_description : 'FIXME' %>
 #export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
 
 %:
-	dh $@ --buildsystem=ruby
+	dh $@ --buildsystem=ruby --with ruby
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> debian/compat
 7
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> debian/copyright

-- 
gem2deb.git