Make %fieldimps private to controllib.pl

diff --git a/ChangeLog b/ChangeLog
index c6fd9b8ad678f51b95a966adac4bea004ab8105e..3f5a792dd4ff0924ea75ab99b669dc023bb1d7bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-06  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-genchanges.pl (%fieldimps): Remove unused variable.
+       * scripts/dpkg-gencontrol.pl (%fieldimps): Likewise.
+       * scripts/dpkg-source.pl (%fieldimps): Likewise.
+       * scripts/controllib.pl (%fieldimps): Switch from 'our' to 'my'.
+
 2007-09-06  Guillem Jover  <guillem@debian.org>
 
        * scripts/822-date.pl: Add $dpkglib into @INC, needed by the

diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index a94ff2bfbe59eae2f277728068ce6ab53012180f..1b7c52d9f2eeef44a5d0617cf99f38abea3533d3 100755 (executable)
--- a/scripts/controllib.pl
+++ b/scripts/controllib.pl
@@ -15,7 +15,6 @@ our %f;             # - fields ???
 our %fi;            # - map of fields values. keys are of the form "S# key"
                     #   where S is source (L is changelog, C is control)
                     #   and # is an index
-our %fieldimps;
 our %p2i;           # - map from datafile+packagename to index in controlfile
                     #   (used if multiple packages can be listed). Key is
                     #   "S key" where S is the source and key is the packagename
@@ -340,6 +339,8 @@ sub substvars {
     return $v;
 }
 
+my %fieldimps;
+
 sub set_field_importance(@)
 {
     my @fields = @_;

diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 93e36aa3402e151a91162a685227756632ab3ee1..1709c66a927f42c5ca8a8fac914f7d97ee6aaadf 100755 (executable)
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -13,7 +13,6 @@ require 'controllib.pl';
 
 our (%f, %fi);
 our %p2i;
-our %fieldimps;
 our %substvar;
 our $sourcepackage;
 our $host_arch;

diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index c75633873a795feac8e2ba8cb4942742986361b4..12ea429cec1c3d27094ec0365198acec6ac831b3 100755 (executable)
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -13,7 +13,6 @@ require 'controllib.pl';
 
 our %substvar;
 our (%f, %fi);
-our %fieldimps;
 our %p2i;
 our @pkg_dep_fields;
 our $sourcepackage;

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 70b4682cc262be82f2c24daa9d6eb8f26d602650..5c16bc4ae37772ca8ba2236e810970d43de76e5d 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -66,7 +66,7 @@ use Cwd;
 push (@INC, $dpkglibdir);
 require 'controllib.pl';
 
-our (%f, %fi, %fieldimps);
+our (%f, %fi);
 our $sourcepackage;
 our $warnable_error;
 our $quiet_warnings;