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

Laurent Arnoud laurent at spkdev.net
Mon Mar 14 10:37:12 UTC 2011


The following commit has been merged in the master branch:
commit 5f05789460e2e50d5e9b5050e6e4e9e11b86f45b
Author: Laurent Arnoud <laurent at spkdev.net>
Date:   Sun Mar 13 19:34:20 2011 +0100

    put a new line when no long_description
    
    the build will fail with multiple Package list (yajl-ruby)
    
    Signed-off-by: Laurent Arnoud <laurent at spkdev.net>

diff --git a/lib/gem2deb/dh_make_ruby.rb b/lib/gem2deb/dh_make_ruby.rb
index ee7ce0f..f4a27a9 100644
--- a/lib/gem2deb/dh_make_ruby.rb
+++ b/lib/gem2deb/dh_make_ruby.rb
@@ -380,7 +380,11 @@ Depends: <%= package.dependencies.join(', ') %>
 # <%= package.gem_dependencies.join(', ') %>
 <% end %>
 Description: <%= short_description ? short_description : 'FIXME' %>
-<%= long_description ? long_description.lines.map { |line| ' ' + (line.strip.empty? ? '.' : line.strip) }.join("\n") + "\n" : ' <insert long description, indented with spaces>' %>
+<% if long_description %>
+<%= long_description.lines.map { |line| ' ' + (line.strip.empty? ? '.' : line.strip) }.join("\n") + "\n" %>
+<% else %>
+<%= " <insert long description, indented with spaces>\n" %>
+<% end %>
 <% end %>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> debian/rules
 #!/usr/bin/make -f

-- 
gem2deb.git



More information about the Pkg-ruby-extras-commits mailing list