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

* scripts/dpkg-genchanges.pl: Do not use $version to refer to the
source package version, as it denotes the dpkg version.

Guillem Jover лет назад: 20
Родитель
Сommit
877cacb1ca
2 измененных файлов с 7 добавлено и 2 удалено
  1. 5 0
      ChangeLog
  2. 2 2
      scripts/dpkg-genchanges.pl

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2006-05-04  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-genchanges.pl: Do not use $version to refer to the
+	source package version, as it denotes the dpkg version.
+
 2006-05-04  Nicolas François  <nicolas.francois@centraliens.net>,
 	    Guillem Jover  <guillem@debian.org>
 

+ 2 - 2
scripts/dpkg-genchanges.pl

@@ -269,7 +269,7 @@ if (!$binaryonly) {
     $pri= $sourcedefault{'Priority'};
     if (!length($pri)) { $pri='-'; &warn("missing Priority for source files"); }
 
-    ($sversion = $version) =~ s/^\d+://;
+    ($sversion = $substvar{'source:Version'}) =~ s/^\d+://;
     $dsc= "$uploadfilesdir/${sourcepackage}_${sversion}.dsc";
     open(CDATA,"< $dsc") || &error("cannot open .dsc file $dsc: $!");
     push(@sourcefiles,"${sourcepackage}_${sversion}.dsc");
@@ -285,7 +285,7 @@ if (!$binaryonly) {
     }
     for $f (@sourcefiles) { $f2sec{$f}= $sec; $f2pri{$f}= $pri; }
     
-    if (($sourcestyle =~ m/i/ && $version !~ m/-(0|1|0\.1)$/ ||
+    if (($sourcestyle =~ m/i/ && $sversion !~ m/-(0|1|0\.1)$/ ||
          $sourcestyle =~ m/d/) &&
         grep(m/\.diff\.gz$/,@sourcefiles)) {
         $origsrcmsg= "not including original source code in upload";