* scripts/controllib.pl: Move substvar initializations to ...

	(init_substvars): ... here.

diff --git a/ChangeLog b/ChangeLog
index 0d17ebd8830dcb7703b6189d2850e8d266ca0edb..8894f9fda55317785f60966a3ac274d40634887d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-24  Guillem Jover  <guillem@debian.org>
+
+       * scripts/controllib.pl: Move substvar initializations to ...
+       (init_substvars): ... here.
+
 2007-01-24  Frank Lichtenheld  <djpig@debian.org>
 
        * scripts/822-date.pl: Convert the script to be a simple wrapper

diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index a3be7a27161006695742b8ba0048230e609015a6..3c998f0fd5b3798b9ae498b6e840d7474c35d27c 100755 (executable)
--- a/scripts/controllib.pl
+++ b/scripts/controllib.pl
@@ -25,10 +25,6 @@ $parsechangelog= 'dpkg-parsechangelog';
 @src_dep_fields = qw(Build-Depends Build-Depends-Indep
                      Build-Conflicts Build-Conflicts-Indep);
 
-$substvar{'Format'}= 1.7;
-$substvar{'Newline'}= "\n";
-$substvar{'Space'}= " ";
-$substvar{'Tab'}= "\t";
 $maxsubsts=50;
 $warnable_error= 1;
 $quiet_warnings = 0;
@@ -319,6 +315,11 @@ sub parsechangelog {
 
 sub init_substvars
 {
+    $substvar{'Format'} = 1.7;
+    $substvar{'Newline'} = "\n";
+    $substvar{'Space'} = " ";
+    $substvar{'Tab'} = "\t";
+
     # XXX: Source-Version is now deprecated, remove in the future.
     $substvar{'Source-Version'}= $fi{"L Version"};
     $substvar{'binary:Version'} = $fi{"L Version"};