Browse Source

Couple of patches from Tollef ... Correct case of Origin and Bugs fields
in dpkg-scanpackages output and fix the unknown() function of controllib.pl
to output the correct field name.

Scott James Remnant 22 years ago
parent
commit
7a6decdee6
4 changed files with 20 additions and 2 deletions
  1. 10 0
      ChangeLog
  2. 4 0
      debian/changelog
  3. 3 1
      scripts/controllib.pl
  4. 3 1
      scripts/dpkg-scanpackages.pl

+ 10 - 0
ChangeLog

@@ -1,3 +1,13 @@
+Sun May  2 10:22:25 CEST 2004 Tollef Fog Heen <tfheen@debian.org>
+
+  * scripts/dpkg-scanpackages.pl: Give proper case for Origin and
+    Bugs.
+
+Sun May  2 10:04:25 CEST 2004 Tollef Fog Heen <tfheen@debian.org>
+
+  * scripts/controllib.pl: Fix unknown() so it actually manages to pick
+    out the correct field name.
+
 Fri Apr 30 11:20:13 CEST 2004 Jordi Mallach <jordi@debian.org
 
   * po/ca.po: Update Catalan translation.

+ 4 - 0
debian/changelog

@@ -6,6 +6,10 @@ dpkg (1.10.22) unstable; urgency=low
     so we include Spanish, Russian and Brazilian Portugese.  Closes: #245994.
   * Correct dpkg manpage to refer to --force-remove-reinstreq instead of
     non-existant --force-reinstreq option.  Closes: #232831.
+  * Fix dpkg-source (actually controllib.pl) to output the field name
+    properly again.  Closes: #246595.
+  * Make dpkg-scanpackages output Origin and Bugs fields with proper
+    casing.  Closes: #154422.
   * Updated Translations:
     - Catalan (Jordi Mallach).
     - Spanish manpages (Ruben Porras).  Closes: #246158, #246159, #246160,

+ 3 - 1
scripts/controllib.pl

@@ -302,7 +302,9 @@ sub parsecdata {
 }
 
 sub unknown {
-    &warn("unknown information field " . $fi{"o:$_"} . " in input data in $_[0]");
+    my $field = $_;
+    my $key = (grep { /^o:C\d+ $field/ } keys %fi)[0];
+    &warn("unknown information field " . $f{"$key"} . " in input data in $_[0]");
 }
 
 sub syntax {

+ 3 - 1
scripts/dpkg-scanpackages.pl

@@ -26,7 +26,9 @@ $version= '1.2.6'; # This line modified by Makefile
             'Size',
 	    'Installed-Size',
             'MD5sum',
-            'Description');
+            'Description',
+            'Origin',
+            'Bugs');
 
 $written=0;
 $i=100; grep($pri{$_}=$i--,@fieldpri);