Do not strip the epoch from the source:Upstream-Version substvar.

Closes: #366351

diff --git a/ChangeLog b/ChangeLog
index 4d77aad01ae860a2782b5ca7b02cffb3614c6e50..97f28d60fb38917111f513015848ba2dc363d3a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-23  Guillem Jover  <guillem@debian.org>
+
+       * scripts/controllib.pl (parsechangelog): Do not strip the epoch from
+       the source:Upstream-Version substvar.
+
 2006-05-23  Guillem Jover  <guillem@debian.org>
 
        * scripts/controllib.pl (usageerr): Use usage instead of

diff --git a/debian/changelog b/debian/changelog
index a52cc53e2ad7facb3648843e81fc14eefed6d8ce..d13788fb685602c786405fa02edddd77abb4b3d6 100644 (file)
--- 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 429e669dd757aeaca9297b65639ea886209d977a..197984dbebb2b980860d410a37767c9c78e43aa6 100644 (file)
--- 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 fc34b5283acfe09554fbeb502dafe4adebd1cd1b..7d75aa8cb5c181ba1828f84c8991529da5d80fc1 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-23  Guillem Jover  <guillem@debian.org>
+
+       * C/dpkg-source.1: Document that the source:Upstream-Version substvar
+       can have an epoch.
+
 2006-05-23  Guillem Jover  <guillem@debian.org>
 
        * C/dpkg-source.1: Add '--help' and '--version' options.

diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index 6869008d76d77114a85a9c09569e23d7595f35f7..11e90207f153ee3cbae61f209b9bea56694c8626 100755 (executable)
--- 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 {