Просмотр исходного кода

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

Guillem Jover лет назад: 20
Родитель
Сommit
d791c7a0bc
5 измененных файлов с 14 добавлено и 2 удалено
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 2 1
      man/C/dpkg-source.1
  4. 5 0
      man/ChangeLog
  5. 0 1
      scripts/controllib.pl

+ 5 - 0
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

+ 2 - 0
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).

+ 2 - 1
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

+ 5 - 0
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.

+ 0 - 1
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 {