From 89cad9d89bed7ba73437b7c241403376c8ac7199 Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Sat, 21 Apr 2001 01:19:34 +0000 Subject: [PATCH] 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 --- ChangeLog | 10 +++++++++- debian/changelog | 20 ++++++++++++++------ scripts/cl-debian.pl | 4 ++-- scripts/controllib.pl | 1 + scripts/dpkg-scanpackages.pl | 4 ++-- scripts/dpkg-shlibdeps.pl | 1 - 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d15b73e..d035b9b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sat Apr 21 02:39:37 CEST 2001 Wichert Akkerman + + * 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 * po/pl.po: Remove spurious '%s' in Polish translation @@ -169,7 +177,7 @@ Fri Mar 2 17:29:02 CET 2001 Wichert Akkerman 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 6a1d42a0..481d0873 100644 --- 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 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 f02899eb..6db55d64 100755 --- 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] | -h +Usage: $progname [-v] | -h "; } diff --git a/scripts/controllib.pl b/scripts/controllib.pl index b034e10d..19084f40 100755 --- 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 () { last if m/^$/; } $many= -2; } elsif (m/^$/) { diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl index 6180171b..86f279ba 100755 --- 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 a0f90a40..6cb61f21 100755 --- 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") || -- 2.39.5