[Reproducible-commits] [dpkg] 24/40: dpkg-scansources: Sort output by package name and version

[Jérémy Bobbio]

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

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit d4ffe3118cc8132910e80bb90999032523c90212
Author: Maximilian Schwerin <maximilian.schwerin at tigris.de>
Date:   Wed May 20 09:56:42 2015 +0200

    dpkg-scansources: Sort output by package name and version
    
    This is useful if multiple versions of the same package are kept
    together in the same repository.
    
    [guillem at debian.org:
     - Minor code formatting fix. ]
    
    Signed-off-by: Guillem Jover <guillem at debian.org>
---
 debian/changelog            | 2 ++
 scripts/dpkg-scansources.pl | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f73be60..ab13eae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ dpkg (1.18.1) UNRELEASED; urgency=low
   * Fix build failure on FreeBSD by actually using libmd if available.
   * Sort dpkg-scanpackages output by package name and version.
     Thanks to Maximilian Schwerin <maximilian.schwerin at tigris.de>.
+  * Sort dpkg-scansources output by package name and version.
+    Thanks to Maximilian Schwerin <maximilian.schwerin at tigris.de>.
   * Perl modules:
     - Add missing strict and warnings pragmas for submodules.
     - Use non-destructive substitutions inside map.
diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl
index 0ae6170..a823ab4 100755
--- a/scripts/dpkg-scansources.pl
+++ b/scripts/dpkg-scansources.pl
@@ -321,7 +321,9 @@ while (<$find_fh>) {
 close $find_fh or syserr(g_('error closing %s (%s)'), 'find', $!);
 
 if (not $no_sort) {
-    @sources = sort { $a->{Package} cmp $b->{Package} } @sources;
+    @sources = sort {
+        $a->{Package} . $a->{Version} cmp $b->{Package} . $b->{Version}
+    } @sources;
 }
 foreach my $dsc (@sources) {
     $dsc->output(\*STDOUT);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git