scripts/dpkg-scanpackages.pl: fix typo in vercmp version cache

scripts/dpkg-shlibdeps.pl: remove statement that was basically a strange no-op
scripts/controllib.pl: give  syntax error for unexpected PGP signature
debian/changelog: updated

diff --git a/ChangeLog b/ChangeLog
index 6d15b73e7e797cec37e83b946c3ab40f31f595d8..d035b9b27ec98c32eda9f4846c17186b693b4d60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Apr 21 02:39:37 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-scanpackages.pl: fix typo in vercmp version cache
+  * scripts/dpkg-shlibdeps.pl: remove statement that was basically
+    a strange no-op
+  * scripts/controllib.pl: give  syntax error for unexpected PGP signature
+  * debian/changelog: updated
+
 Fri Apr 20 19:46:38 CDT 2001 Adam Heath <doogie@debian.org>
 
   * po/pl.po: Remove spurious '%s' in Polish translation
@@ -169,7 +177,7 @@ Fri Mar  2 17:29:02 CET 2001 Wichert Akkerman <wakkerma@debian.org>
     dselect/methparse.cc: rename struct option to dselect_option to prevent
     conflict with getopt.h
   * main/help.c: rework do_script a bit to compile without errors
-  * scripts/dpkg-gencontrol.1: add -n option to specify filename
+  * scripts/dpkg-gencontrol.pl: add -n option to specify filename
   * scripts/dpkg-source.1:
     + document -n option for dpkg-gencontrol
     + fix confusing wording for dpkg-buildpackage -uc option

diff --git a/debian/changelog b/debian/changelog
index 6a1d42a0d1be6b75f17bb924dae4fc9ab38bdcc3..481d08738dcdbefc97a84536a80929faa7ab722c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,9 @@ dpkg (1.9.0) unstable; urgency=low
   * Fix dpkg-statoverride --update for things other then plain files.
     Closes: Bug#84449
   * Fix race with source directory disappearing in dpkg-source.
-    Closes: Bug#82797
+    Closes: Bug#45511
   * Fix manpage for dpkg-gencontrol. Closes: Bug#84625
+  * Add -n option for dpkg-gencontrol to specify a filename. Closes: Bug#75796
   * Use POSIX glob instead of regexp in debian/rules. Closes: Bug#83042,
     #84582
   * fix typo in usage message for dpkg-divert, Closes: Bug#85977
@@ -30,11 +31,11 @@ dpkg (1.9.0) unstable; urgency=low
   * Add ia64 support to dpkg-architecture.
   * Minor script changes, Closes: Bug#87485
   * Stop dpkg-genchanges from complaining about missing packages
-    when doing a source-only build. Closes: Bug#87571
+    when doing a source-only build. Closes: Bug#87571,#15644,#25496
   * Various dpkg-architecture cleanups. Closes: Bug#87505
   * Modify dpkg-architecture to handle gcc versions containing letters.
     Closes: Bug#83083
-  * dpkg-buildpackage updates: Closes: Bug#87572
+  * dpkg-buildpackage updates: Closes: Bug#87572,#85847
     + make -C work properly
     + fix test for gpg secret keyring
     + improve source messages
@@ -45,7 +46,8 @@ dpkg (1.9.0) unstable; urgency=low
   * Fix wording in dpkg-statoverride manpage for --add. Closes: Bug#85080
   * Fix typo in start-stop-daemon manpage. Closes: Bug#88225
   * Add dpkg-checkbuilddeps to check if build dependencies are satisfied
-    and modify dpkg-buildpackage to call it if wanted. Closes: Bug#86453
+    and modify dpkg-buildpackage to call it if wanted.
+    Closes: Bug#86453,#83812,#60717,74372,67896,60717
   * dpkg-parsechangelog can read a changelog from stdin now. Closes: Bug#80142
   * Fix confusing wording for dpkg-buildpackage -uc option in manpage.
     Closes: Bug#83468
@@ -55,9 +57,10 @@ dpkg (1.9.0) unstable; urgency=low
     other OSes as well.
   * Mark last argument in dpkg-scanpackages usage info as optional.
     Closes: Bug#86658
+  * Fix cache in dpkg-scanpackages version comparison. Closes: Bug#90722
   * Fix formatting error in dpkg-source.1. Closes: Bug#82723
   * Change dpkg-gencontrol to fix comma-related syntax errors after
-    processing substvars
+    processing substvars. Closes: Bug#92908
   * Verify package signatures if debsig-verify is installed
   * Handle window resize in dselect main menu. Closes: Bug#93559
   * Initialize all parts of the package record.  This should fix several
@@ -69,6 +72,11 @@ dpkg (1.9.0) unstable; urgency=low
   * Add a --retry option to start-stop-daemon. Closes: Bug#75139
   * Fix regeps to extract Closes magic from a changelog so the #
     is really optional. Closes: Bug#94474
+  * Remove useless statement from dpkg-shlibdeps. Closes: Bug#90516
+  * Make the debian changelog parser identify itself with $progname.
+    Closes: Bug#89409
+  * Give a syntax error when we get an unexpected PGP signature in control
+    files. Closes: Bug#75562
 
  -- Wichert Akkerman <wakkerma@debian.org>  Sat, 13 Jan 2001 08:52:11 -0500
 
@@ -207,7 +215,7 @@ dpkg (1.7.0) unstable; urgency=low
   * HURD updates, Closes: Bug#57753,#57754,#57755
   * dpkg-architecture: -q should not imply -f, Closes: Bug#57761
   * add dpkg:UpstreamVersion and dpkg:Version substvars in dpkg-genchanges
-    and dpkg-gencontrol.  Closes: Bug#62069
+    and dpkg-gencontrol.  Closes: Bug#62069,#64774
   * dpkg-genchanges: add new Changed-By field to .changes with the last
     person who made a change, and modify the Maintainer-field to be the
     actual maintainer. Update the format-version to 1.7 to reflect this.

diff --git a/scripts/cl-debian.pl b/scripts/cl-debian.pl
index f02899eba0d3bd1d4cbe27c82b2ac99d0f83b7b3..6db55d64302816bbbb3cda13835c23dddbfe03ac 100755 (executable)
--- a/scripts/cl-debian.pl
+++ b/scripts/cl-debian.pl
@@ -21,11 +21,11 @@ $since='';
 
 sub usageversion {
     print STDERR
-"Debian parsechangelog/dpkg $version.  Copyright (C) 1996
+"Debian $progname $version.  Copyright (C) 1996
 Ian Jackson.  This is free software; see the GNU General Public Licence
 version 2 or later for copying conditions.  There is NO warranty.
 
-Usage: parsechangelog/dpkg [-v<versionsince>] | -h
+Usage: $progname [-v<versionsince>] | -h
 ";
 }
 

diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index b034e10d2a8d21491897203b36ce614707e112d1..19084f400ac655d852b782ed2b5d61ae5e6ed4be 100755 (executable)
--- a/scripts/controllib.pl
+++ b/scripts/controllib.pl
@@ -189,6 +189,7 @@ sub parsecdata {
             length($cf) || &syntax("continued value line not in field");
             $fi{"$source$index $cf"}.= "\n$_";
         } elsif (m/^-----BEGIN PGP/ && $many<0) {
+            $many == -2 && syntax("expected blank line before PGP signature");
             while (<CDATA>) { last if m/^$/; }
             $many= -2;
         } elsif (m/^$/) {

diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 6180171bf77a5e38f9afd46d6f2d066e855ea814..86f279ba6976b33352692dee3ad677f965d5989e 100755 (executable)
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -37,9 +37,9 @@ $#ARGV == 1 || $#ARGV == 2
 
 sub vercmp {
        ($a,$b)=@_;
-       return $vercache{$a,$b} if defined($varcache{$a,$b});
+       return $vercache{$a,$b} if defined($vercache{$a,$b});
        system("dpkg --compare-versions $a le $b");
-       $varcache{$a,$a}=$?;
+       $vercache{$a,$a}=$?;
        return $?;
 }
 

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index a0f90a403dbf2220c2f3cb89c9a98a2ffd75dfe8..6cb61f21cfc09f4fc88c8f52b45f287e7a2b68d2 100755 (executable)
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -262,7 +262,6 @@ sub scanshlibsfile {
 }
 
 if (!$stdout) {
-    $varlistfile="./$varlistfile" if $fileslistfile =~ m/^\s/;
     open(Y,"> $varlistfile.new") ||
         syserr("open new substvars file \`$varlistfile.new'");
     chown(@fowner, "$varlistfile.new") ||