summaryrefslogtreecommitdiff
path: root/scripts/dpkg-mergechangelogs.pl
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/dpkg-mergechangelogs.pl')
-rwxr-xr-xscripts/dpkg-mergechangelogs.pl4
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/~[^~]*$//;