diff options
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | scripts/dpkg-mergechangelogs.pl | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 9410c4976..3866df3e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,8 @@ dpkg (1.16.2) UNRELEASED; urgency=low it assumes all build dependencies must be satisfied on the listed architecture. Closes: #648180 Thanks to Colin Watson for the patch. * Error out if a dpkg database .list file is not a regular file. LP: #369898 + * Fix dpkg-mergechangelogs to not error out on invalid versions. + Closes: #651993 [ Jonathan Nieder ] * Bump po4a version in Build-Depends to 0.41, since earlier versions do diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl index a3ddeec61..1729368c7 100755 --- a/scripts/dpkg-mergechangelogs.pl +++ b/scripts/dpkg-mergechangelogs.pl @@ -179,7 +179,9 @@ sub compare_versions { $a =~ s/~[^~]*$//; $b =~ s/~[^~]*$//; } - return version_compare($a, $b); + $a = Dpkg::Version->new($a); + $b = Dpkg::Version->new($b); + return $a <=> $b; } # Merge changelog entries smartly by merging individually the different |