From d791c7a0bce160bcc7d2997cae6f24aef5cc69b8 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 23 May 2006 04:38:50 +0000 Subject: [PATCH] Do not strip the epoch from the source:Upstream-Version substvar. Closes: #366351 --- ChangeLog | 5 +++++ debian/changelog | 2 ++ man/C/dpkg-source.1 | 3 ++- man/ChangeLog | 5 +++++ scripts/controllib.pl | 1 - 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d77aad0..97f28d60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-23 Guillem Jover + + * scripts/controllib.pl (parsechangelog): Do not strip the epoch from + the source:Upstream-Version substvar. + 2006-05-23 Guillem Jover * scripts/controllib.pl (usageerr): Use usage instead of diff --git a/debian/changelog b/debian/changelog index a52cc53e..d13788fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,8 @@ dpkg (1.13.20~) UNRELEASED; urgency=low * Standarize scripts usage output format and at the same time make the strings easier for the translators. Add '--help' and '--version' for most of the scripts. Print the usage and version to stdout. + * Do not strip the epoch from the source:Upstream-Version substvar. + Closes: #366351 [ Updated dpkg Translations ] * Portuguese (Miguel Figueiredo). diff --git a/man/C/dpkg-source.1 b/man/C/dpkg-source.1 index 429e669d..197984db 100644 --- a/man/C/dpkg-source.1 +++ b/man/C/dpkg-source.1 @@ -722,7 +722,8 @@ The current build architecture (from The source package version. .TP .B source:Upstream\-Version -The upstream source package version. +The upstream source package version, including the Debian version epoch if +any. .TP .B binary:Version The binary package version (which may differ from source:Version in a binNMU diff --git a/man/ChangeLog b/man/ChangeLog index fc34b528..7d75aa8c 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,8 @@ +2006-05-23 Guillem Jover + + * C/dpkg-source.1: Document that the source:Upstream-Version substvar + can have an epoch. + 2006-05-23 Guillem Jover * C/dpkg-source.1: Add '--help' and '--version' options. diff --git a/scripts/controllib.pl b/scripts/controllib.pl index 6869008d..11e90207 100755 --- a/scripts/controllib.pl +++ b/scripts/controllib.pl @@ -312,7 +312,6 @@ sub parsechangelog { $substvar{'source:Version'} =~ s/\+b[0-9]+$//; $substvar{'source:Upstream-Version'} = $fi{"L Version"}; $substvar{'source:Upstream-Version'} =~ s/-[^-]*$//; - $substvar{'source:Upstream-Version'} =~ s/^[0-9]+://; } sub checkpackagename { -- 2.39.5