The following commit has been merged in the master branch:
commit e6c2713bd4d59a88d1ae5234a4224416e0e9fa08
Author: Guillem Jover <[email protected]>
Date:   Wed Jul 1 10:09:46 2009 +0200

    dpkg-scanpackages: Do not remap obsolete fields
    
    Those fields have been remappedd already by “dpkg-deb -I”.

diff --git a/debian/changelog b/debian/changelog
index 905344d..18e5885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dpkg (1.15.4) UNRELEASED; urgency=low
     as they have been handled already by “dpkg-deb -I”.
   * Switch dpkg-scansources to use Dpkg::Cdata instead of duplicating the
     .dsc parsing code. As a side effect it now handles properly bogus files.
+  * Do not remap obsolete fields in dpkg-scanpackages as they have been
+    handled already by “dpkg-deb -I”.
 
   [ Updated dpkg translations ]
   * French (Christian Perrier).
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index d2e0803..a257082 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -22,12 +22,6 @@ my @spuriousover;
 my %packages;
 my %overridden;
 
-my %kmap= (optional         => 'suggests',
-          recommended      => 'recommends',
-          class            => 'priority',
-          package_revision => 'revision',
-         );
-
 my @sums;
 foreach (@check_supported) {
     my $copy = uc($_);
@@ -188,7 +182,6 @@ FILE:
        my $temp = $control;
        while ($temp =~ s/^\n*(\S+):[ \t]*(.*(\n[ \t].*)*)\n//) {
            my ($key,$value)= (lc $1,$2);
-           if (defined($kmap{$key})) { $key= $kmap{$key}; }
            if (defined($field_case{$key})) { $key= $field_case{$key}; }
            $value =~ s/\s+$//;
            $tv{$key}= $value;

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to