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.

diff --git a/ChangeLog b/ChangeLog
index 6a9703b5b68b1d9e58ca40a5b7f52d0445388638..eb22296048eea55761ee655ad1c1477a617a38eb 100644 (file)
--- a/ChangeLog
+++ b/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.

diff --git a/debian/changelog b/debian/changelog
index af0be50283fada40a0b9742f55d2d990536f3bc9..cde28d14a025bce81e50329185eba061d293c6be 100644 (file)
--- a/debian/changelog
+++ b/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,

diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index d5c11b752e8e55c2d8c0e0cd322329cae109b293..a0a1ae393d2459a132a554423d039590e37549f9 100755 (executable)
--- a/scripts/controllib.pl
+++ b/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 {

diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index e5387355ecada0119a6f45150ce604e719eb56db..5c8e002941fe5c05843e30f160d949554a303b1d 100755 (executable)
--- a/scripts/dpkg-scanpackages.pl
+++ b/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);