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 9e292196875ec6def71b01e3e1d62a5144c5aa35..8fd69a2042ec949062e6cc75375f4b9f3d58c443 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-17  Raphael Hertzog  <hertzog@debian.org>
+
+       * dpkg-source.1: Fix default value of -T parameter.
+
 2008-01-13  Frank Lichtenheld  <djpig@debian.org>
 
        * dpkg-parsechangelog.1: Document the new

diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index 1b06d1b26efb9e842ef37bd2b500b5ee9ceb6408..d1613b9ea5a9e3ce1ca7c1c79f5f17f2c3ef8a43 100644 (file)
--- 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 8c956b097c4a316ea078831522174d1da2297f56..92e82bd4847c7b5fde39b50e1f3c8bebdb6db2af 100755 (executable)
--- 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;