This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=73888d612ad370e8147ddb503bf2e5f2ad80c7b6 commit 73888d612ad370e8147ddb503bf2e5f2ad80c7b6 Author: Guillem Jover <[email protected]> AuthorDate: Thu Aug 29 02:22:21 2019 +0200 scripts: Remove support for ~vola versioning This was part of the volatile.debian.org archive, which was decommissioned some time ago. Ref: https://lists.debian.org/debian-volatile-announce/2012/msg00000.html --- debian/changelog | 2 ++ scripts/dpkg-genchanges.pl | 4 ++-- scripts/dpkg-mergechangelogs.pl | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index d42410ce0..6964f2a49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium * libdpkg: Clarify lock contender error message. Print the PID of the lock contender, and add a warning explaining that removing the lock file is never the correct solution. + * dpkg-genchanges, dpkg-mergechangelogs: Remove support for ~vola + versioning, as volatile.debian.org was decommissioned some time ago. * Perl modules: - Dpkg::Source::Package: Verify original tarball signatures at build time. - Dpkg::BuildFlags: Add new unset() method. diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl index 8def2f98f..4391b8a4c 100755 --- a/scripts/dpkg-genchanges.pl +++ b/scripts/dpkg-genchanges.pl @@ -221,8 +221,8 @@ if (defined($prev_changelog) and { warning(g_('the current version (%s) is earlier than the previous one (%s)'), $changelog->{'Version'}, $prev_changelog->{'Version'}) - # ~bpo and ~vola are backports and have lower version number by definition - unless $changelog->{'Version'} =~ /~(?:bpo|vola)/; + # ~bpo are backports and have lower version number by definition. + unless $changelog->{'Version'} =~ /~bpo/; } # Scan control info of source package diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl index 0f4d85165..1e9b44f5f 100755 --- a/scripts/dpkg-mergechangelogs.pl +++ b/scripts/dpkg-mergechangelogs.pl @@ -173,7 +173,7 @@ sub get_items_to_merge { } # Compares the versions taking into account some oddities like the fact -# that we want backport/volatile versions to sort higher than the version +# that we want backport versions to sort higher than the version # on which they are based. sub compare_versions { my ($a, $b) = @_; @@ -182,9 +182,9 @@ sub compare_versions { return -1 if not defined $a; $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'); - # Backport and volatile are not real prereleases - $a =~ s/~(bpo|vola)/+$1/; - $b =~ s/~(bpo|vola)/+$1/; + # Backports are not real prereleases. + $a =~ s/~(bpo)/+$1/; + $b =~ s/~(bpo)/+$1/; if ($merge_prereleases) { $a =~ s/~[^~]*$//; $b =~ s/~[^~]*$//; -- Dpkg.Org's dpkg
