The branch, master has been updated
via fb99f579d58d360b85942d81f069a028f78f3344 (commit)
via 81499f41451871a02d01b9c47cb61800578358bf (commit)
from 3b340a1f26e5f85e95b30d9463ca13b5091e7191 (commit)
- Shortlog ------------------------------------------------------------
fb99f57 dpkg-source: Don't use any substvarsfile by default
81499f4 dpkg-genchanges: Reinstate support of the ${Format} substvar
Summary of changes:
ChangeLog | 5 +++++
man/ChangeLog | 4 ++++
man/dpkg-source.1 | 3 +--
scripts/dpkg-genchanges.pl | 3 ++-
scripts/dpkg-source.pl | 2 +-
5 files changed, 13 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit fb99f579d58d360b85942d81f069a028f78f3344
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Thu Jan 17 09:08:48 2008 +0100
dpkg-source: Don't use any substvarsfile by default
* scripts/dpkg-source.pl: Revert to the old behaviour of not using any
substvars file.
* man/dpkg-source.1: Fix the default value of the -T option.
diff --git a/man/ChangeLog b/man/ChangeLog
index 9e29219..8fd69a2 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-17 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * dpkg-source.1: Fix default value of -T parameter.
+
2008-01-13 Frank Lichtenheld <[EMAIL PROTECTED]>
* dpkg-parsechangelog.1: Document the new
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index 1b06d1b..d1613b9 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -93,8 +93,7 @@ See \fBdeb\-substvars\fP(5) for a discussion of output
substitution.
.BI \-T substvarsfile
Read substitution variables in
.IR substvarsfile ;
-the default is
-.BR debian/substvars .
+the default is to not read any file.
.TP
.BI \-D field = value
Override or add an output control file field.
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 8c956b0..92e82bd 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -25,7 +25,7 @@ my %notfileobject;
my $fn;
my $ur;
-my $varlistfile = "debian/substvars";
+my $varlistfile;
my $controlfile;
my $changelogfile;
my $changelogformat;
commit 81499f41451871a02d01b9c47cb61800578358bf
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Thu Jan 17 09:01:37 2008 +0100
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 74c226a..acc6ee1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-17 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-genchanges.pl: Reinstate support of the ${Format}
+ substvars.
+
2008-01-17 Samuel Thibault <[EMAIL PROTECTED]>,
Guillem Jover <[EMAIL PROTECTED]>
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index f6ada09..e88092f 100755
--- 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`);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
