diff options
| author | Guillem Jover <guillem@debian.org> | 2019-09-28 23:02:07 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2019-10-30 22:02:45 +0100 |
| commit | d178013236e0617e40e4287ff6ddbf66370d58c6 (patch) | |
| tree | 8f1ffce10094dc94173c80d90db944f17a5bd9f9 /scripts/dpkg-mergechangelogs.pl | |
| parent | 73888d612ad370e8147ddb503bf2e5f2ad80c7b6 (diff) | |
| download | dpkg-d178013236e0617e40e4287ff6ddbf66370d58c6.tar.gz | |
scripts: Match ~deb also as a backport marker in versions
Closes: #934980
Diffstat (limited to 'scripts/dpkg-mergechangelogs.pl')
| -rwxr-xr-x | scripts/dpkg-mergechangelogs.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl index 1e9b44f5f..6216edabb 100755 --- a/scripts/dpkg-mergechangelogs.pl +++ b/scripts/dpkg-mergechangelogs.pl @@ -183,8 +183,8 @@ sub compare_versions { $a = $a->get_version() if ref($a) and $a->isa('Dpkg::Changelog::Entry'); $b = $b->get_version() if ref($b) and $b->isa('Dpkg::Changelog::Entry'); # Backports are not real prereleases. - $a =~ s/~(bpo)/+$1/; - $b =~ s/~(bpo)/+$1/; + $a =~ s/~(bpo|deb)/+$1/; + $b =~ s/~(bpo|deb)/+$1/; if ($merge_prereleases) { $a =~ s/~[^~]*$//; $b =~ s/~[^~]*$//; |