The following commit has been merged in the master branch:
commit 2cb257105366f933a3b9e5ea2647033da12b07f3
Author: Guillem Jover <[email protected]>
Date: Sun Oct 14 12:55:20 2012 +0200
Dpkg::Source::Patch: Sort files inside new diff lexicographically
The files inside the diff were being sorted correctly for existing
patches, but not for new ones.
Closes: #689193
diff --git a/debian/changelog b/debian/changelog
index da49b73..52136d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -108,6 +108,8 @@ dpkg (1.17.0) UNRELEASED; urgency=low
Closes: #681371
* Document that «dpkg-parsechangelog -l-» can be used to read from stdin.
* Support parsing compressed changelog files transparently. Closes: #684196
+ * Sort files inside new diffs generated by dpkg-source lexicographically.
+ Closes: #689193
[ Updated programs translations ]
* Fix typo in Spanish translation of update-alternatives.
diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm
index 52445c5..1d7dfd9 100644
--- a/scripts/Dpkg/Source/Patch.pm
+++ b/scripts/Dpkg/Source/Patch.pm
@@ -257,6 +257,8 @@ sub add_diff_directory {
}
@diff_files = sort { $patchorder{$a->[0]} <=> $patchorder{$b->[0]} }
@diff_files;
+ } else {
+ @diff_files = sort { $a->[0] cmp $b->[0] } @diff_files;
}
foreach my $diff_file (@diff_files) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
