Author: guillem
Date: 2006-05-04 05:54:31 +0000 (Thu, 04 May 2006)
New Revision: 274

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


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2006-05-04 05:27:03 UTC (rev 273)
+++ trunk/ChangeLog     2006-05-04 05:54:31 UTC (rev 274)
@@ -1,3 +1,8 @@
+2006-05-04  Guillem Jover  <[EMAIL PROTECTED]>
+
+       * 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  <[EMAIL PROTECTED]>,
            Guillem Jover  <[EMAIL PROTECTED]>
 

Modified: trunk/scripts/dpkg-genchanges.pl
===================================================================
--- trunk/scripts/dpkg-genchanges.pl    2006-05-04 05:27:03 UTC (rev 273)
+++ trunk/scripts/dpkg-genchanges.pl    2006-05-04 05:54:31 UTC (rev 274)
@@ -269,7 +269,7 @@
     $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 @@
     }
     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";


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to