Reorder a bit fields in output files.

1 files changed, 6 insertions, 24 deletions

diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 3dbb12b83..5be21b2aa 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -12,9 +12,12 @@ my $dpkglibdir= "."; # This line modified by Makefile
 ($0) = $0 =~ m:.*/(.+):;
 
 push(@INC,$dpkglibdir);
+require 'controllib.pl';
 require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
+our @pkg_dep_fields;
+
 my (@samemaint, @changedmaint);
 my %packages;
 my %overridden;
@@ -25,30 +28,9 @@ my %kmap= (optional         => 'suggests',
 	   package_revision => 'revision',
 	  );
 
-my @fieldpri= ('Package',
-	       'Source',
-	       'Version',
-	       'Priority',
-	       'Section',
-	       'Essential',
-	       'Maintainer',
-	       'Pre-Depends',
-	       'Depends',
-	       'Recommends',
-	       'Suggests',
-	       'Conflicts',
-	       'Provides',
-	       'Replaces',
-	       'Enhances',
-	       'Architecture',
-	       'Filename',
-	       'Size',
-	       'Installed-Size',
-	       'MD5sum',
-	       'Description',
-	       'Origin',
-	       'Bugs'
-	      );
+my @fieldpri = (qw(Package Source Version Architecture Essential Origin Bugs
+                   Maintainer Installed-Size), @pkg_dep_fields, qw(Filename
+                   Size MD5sum Section Priority Description));
 
 # This maps the fields into the proper case
 my %field_case;