Bug#784556: gem2deb: should generate Build-Depends and Depends with one item per line

[Antonio Terceiro]

On Mon, May 11, 2015 at 11:06:32PM +0200, Lucas Nussbaum wrote:
> Could you please review the attached patch?
> I'm not sure if we should introduce an option to disable this. But I
> tend to agree with you (= "I can't think of a reason to not want that, ever.")

Let's always do it and see if anyone complains. ;-)

> From d11ee113a49cdaae7c3474887300677855b8ac8f Mon Sep 17 00:00:00 2001
> From: Lucas Nussbaum <lu...@debian.org>
> Date: Mon, 11 May 2015 23:00:59 +0200
> Subject: [PATCH] Run wrap-and-sort after generation from templates
> 
> ---
>  debian/changelog               | 3 +++
>  lib/gem2deb/dh_make_ruby.rb    | 1 +
>  test/unit/dh_make_ruby_test.rb | 6 +++---
>  3 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/debian/changelog b/debian/changelog
> index 4cd68d8..8a75f14 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -8,6 +8,9 @@ gem2deb (0.16) UNRELEASED; urgency=medium
>      Closes: #733171
>    * bin/dh-make-ruby: use '.' (current directory) as default target.
>      Closes: #777747
> +  * dh-make-ruby: run wrap-and-sort after generating boilerplate from
> +    templates. test/unit/dh_make_ruby_test.rb also had to be modified
> +    to robustify the dependencies extractor. Closes: #784556
>  
>   -- Lucas Nussbaum <lu...@debian.org>  Mon, 11 May 2015 21:10:48 +0200
>  
> diff --git a/lib/gem2deb/dh_make_ruby.rb b/lib/gem2deb/dh_make_ruby.rb
> index 156a4a2..97a883e 100644
> --- a/lib/gem2deb/dh_make_ruby.rb
> +++ b/lib/gem2deb/dh_make_ruby.rb
> @@ -281,6 +281,7 @@ module Gem2Deb
>          end
>        end
>        FileUtils.chmod 0755, 'debian/rules'
> +      run('wrap-and-sort')

I would make the call instead at the end of #build_in_directory, like this:

diff --git a/lib/gem2deb/dh_make_ruby.rb b/lib/gem2deb/dh_make_ruby.rb
index 156a4a2..91359a8 100644
--- a/lib/gem2deb/dh_make_ruby.rb
+++ b/lib/gem2deb/dh_make_ruby.rb
@@ -186,9 +186,14 @@ module Gem2Deb
         other_files
         test_suite
         create_debian_boilerplates
+        wrap_and_sort
       end
     end
 
+    def wrap_and_sort
+      run('wrap-and-sort')
+    end
+
     def read_upstream_source_info
       read_metadata('.')
       initialize_binary_package


-- 
Antonio Terceiro <terce...@debian.org>

signature.asc
Description: Digital signature