Explorar o código

new upload mechanism

Guy Maor %!s(int64=27) %!d(string=hai) anos
pai
achega
bb17f303ae
Modificáronse 3 ficheiros con 11 adicións e 4 borrados
  1. 7 1
      scripts/cl-debian.pl
  2. 1 1
      scripts/controllib.pl
  3. 3 2
      scripts/dpkg-genchanges.pl

+ 7 - 1
scripts/cl-debian.pl

@@ -42,7 +42,8 @@ while (@ARGV) {
 
 %mapkv=(); # for future use
 $i=100;grep($fieldimps{$_}=$i--,
-          qw(Source Version Distribution Urgency Maintainer Date Changes));
+          qw(Source Version Distribution Urgency Maintainer Date Closes
+	     Changes));
 $i=1;grep($urgencies{$_}=$i++,
           qw(low medium routine high urgent emergency));
 
@@ -137,6 +138,11 @@ $expect eq 'next heading or eof' || die "found eof where expected $expect";
 $f{'Changes'} =~ s/\n$//;
 $f{'Changes'} =~ s/^/\n/;
 
+while ($f{'Changes'} =~ /closes:\s*(?:bug)?\#\d+(?:,\s*(?:bug)?\#\d+)*/ig) {
+  push(@closes, $& =~ /\#(\d+)/g);
+}
+$f{'Closes'} = join(' ',sort { $a <=> $b} @closes);
+
 &outputclose(0);
 
 sub clerror { &error("$_[0], at changelog line $."); }

+ 1 - 1
scripts/controllib.pl

@@ -3,7 +3,7 @@ $parsechangelog= 'dpkg-parsechangelog';
 
 grep($capit{lc $_}=$_, qw(Pre-Depends Standards-Version Installed-Size));
 
-$substvar{'Format'}= 1.5;
+$substvar{'Format'}= 1.6;
 $substvar{'Newline'}= "\n";
 $substvar{'Space'}= " ";
 $substvar{'Tab'}= "\t";

+ 3 - 2
scripts/dpkg-genchanges.pl

@@ -49,7 +49,8 @@ Options:  -b                     binary-only build - no source files
 
 $i=100;grep($fieldimps{$_}=$i--,
           qw(Format Date Source Binary Architecture Version
-             Distribution Urgency Maintainer Description Changes Files));
+             Distribution Urgency Maintainer Description Closes Changes
+	     Files));
 
 while (@ARGV) {
     $_=shift(@ARGV);
@@ -172,7 +173,7 @@ for $_ (keys %fi) {
 #print STDERR "L key >$_< value >$v<\n";
         if (m/^Source$/) {
             &setsourcepackage;
-        } elsif (m/^(Version|Maintainer|Changes|Urgency|Distribution|Date)$/) {
+        } elsif (m/^(Version|Maintainer|Changes|Urgency|Distribution|Date|Closes)$/) {
             $f{$_}= $v;
         } elsif (s/^X[BS]*C[BS]*-//i) {
             $f{$_}= $v;