[libmodule-build-perl] 03/05: Export patches with git-debcherry

[Niko Tyni]

This is an automated email from the git hooks/post-receive script.

ntyni pushed a commit to branch master
in repository libmodule-build-perl.

commit bed30ff6ba7e7438625b9e3643d20abd40db8e31
Author: Niko Tyni <ntyni at debian.org>
Date:   Mon Sep 14 19:55:30 2015 +0300

    Export patches with git-debcherry
    
    Gbp-Dch: ignore
---
 ...cess-file-lists-generated-by-rscan_dir-to-sort.patch} | 16 ++++++++--------
 debian/patches/series                                    |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0002-Sort-file-lists-generated-by-rscan_dir.patch b/debian/patches/0003-Preprocess-file-lists-generated-by-rscan_dir-to-sort.patch
similarity index 60%
rename from debian/patches/0002-Sort-file-lists-generated-by-rscan_dir.patch
rename to debian/patches/0003-Preprocess-file-lists-generated-by-rscan_dir-to-sort.patch
index a7e3b6d..15aad86 100644
--- a/debian/patches/0002-Sort-file-lists-generated-by-rscan_dir.patch
+++ b/debian/patches/0003-Preprocess-file-lists-generated-by-rscan_dir-to-sort.patch
@@ -1,6 +1,6 @@
 From: Niko Tyni <ntyni at debian.org>
 Date: Tue, 1 Sep 2015 22:05:27 +0300
-Subject: [PATCH] Sort file lists generated by rscan_dir()
+Subject: [PATCH] Preprocess file lists generated by rscan_dir() to sort them
 
 The rscan_dir() function traverses a directory with File::Find,
 which returns files in readdir() order. This order is nondeterministic
@@ -11,8 +11,8 @@ The lists are used, among other things, to find C files to compile
 The linking order affects the generated binary, essentially rendering
 it nondeterministic and breaking reproducibility.
 
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=106813
-Patch-Name: 0002-Sort-file-lists-generated-by-rscan_dir.patch
+Bug-Debian: https://bugs.debian.org/797709
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=106813
 ---
 
  lib/Module/Build/Base.pm | 2 +-
@@ -21,12 +21,12 @@ Patch-Name: 0002-Sort-file-lists-generated-by-rscan_dir.patch
 diff --git a/lib/Module/Build/Base.pm b/lib/Module/Build/Base.pm
 --- a/lib/Module/Build/Base.pm
 +++ b/lib/Module/Build/Base.pm
-@@ -5255,7 +5255,7 @@ sub rscan_dir {
+@@ -5254,7 +5254,7 @@ sub rscan_dir {
+              ref($pattern) eq 'CODE' ? sub {push @result, $File::Find::name if $pattern->()} :
               die "Unknown pattern type";
  
-   File::Find::find({wanted => $subr, no_chdir => 1}, $dir);
--  return \@result;
-+  return [ sort @result ];
+-  File::Find::find({wanted => $subr, no_chdir => 1}, $dir);
++  File::Find::find({wanted => $subr, no_chdir => 1, preprocess => sub { sort @_ }}, $dir);
+   return \@result;
  }
  
- sub delete_filetree {
diff --git a/debian/patches/series b/debian/patches/series
index 01dacf7..ff0208f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 # exported from git by git-debcherry
 man-ext
 0001-Allow-loading-from-system-path-when-running-under-au.patch
-0002-Sort-file-lists-generated-by-rscan_dir.patch
+0003-Preprocess-file-lists-generated-by-rscan_dir-to-sort.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmodule-build-perl.git