dpkg-genchanges: Reinstate support of the ${Format} substvar

* scripts/dpkg-genchanges.pl: As documented by deb-substvars(5), one can
use the ${Format} substvar to override the format of the .changes file.

diff --git a/ChangeLog b/ChangeLog
index 74c226a97d38454d54cd6601be813c590d2d820a..acc6ee1bfaa4f834417c788e57d3a5dcc27ccf5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-17  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/dpkg-genchanges.pl: Reinstate support of the ${Format}
+       substvars.
+
 2008-01-17  Samuel Thibault  <samuel.thibault@ens-lyon.org>,
             Guillem Jover  <guillem@debian.org>
 

diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index f6ada091b9139ff12406599fa4bcf0a7b9af21b0..e88092f66ee82f669c42de929d763d69576874fc 100755 (executable)
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -64,6 +64,7 @@ my $forcechangedby;
 my $since;
 
 my $substvars = Dpkg::Substvars->new();
+$substvars->set("Format", $changes_format);
 
 use constant SOURCE     => 1;
 use constant ARCH_DEP   => 2;
@@ -411,7 +412,7 @@ if (!is_binaryonly) {
 print(STDERR "$progname: $origsrcmsg\n") ||
     &syserr(_g("write original source message")) unless $quiet;
 
-$fields->{'Format'} = $changes_format;
+$fields->{'Format'} = '${Format}'; # Use value stored in substvars
 
 if (!defined($fields->{'Date'})) {
     chomp(my $date822 = `date -R`);