Merge branch 'master' of git://git.debian.org/git/dpkg/dpkg into sourcev3

ChangeLog

@@ -1,3 +1,52 @@
+2007-10-11  Guillem Jover  <guillem@debian.org>
+
+	* scripts/controllib.pl ($warnable_error, $quiet_warnings): Remove
+	variable declarations.
+	(failure, syserr, error, internerr, warning, warnerror)
+	(subprocerr): Remove functions.
+	(unknown, usageerr): Move functions to ...
+	* scripts/Dpkg/ErrorHandling.pm: ... here.
+	(usageerr): Call usage from main::.
+	(@EXPORT_OK): Add usageerr and unknown.
+
+	* scripts/822-date.pl: Use Dpkg::ErrorHandling.
+	* scripts/changelog/debian.pl: Likewise.
+	* scripts/controllib.pl: Likewise.
+	* scripts/dpkg-architecture.pl: Likewise.
+	* scripts/dpkg-buildpackage.pl: Likewise.
+	* scripts/dpkg-checkbuilddeps.pl: Likewise.
+	* scripts/dpkg-distaddfile.pl: Likewise.
+	* scripts/dpkg-genchanges.pl: Likewise.
+	* scripts/dpkg-gencontrol.pl: Likewise.
+	* scripts/dpkg-gensymbols.pl: Likewise.
+	* scripts/dpkg-parsechangelog.pl: Likewise.
+	* scripts/dpkg-shlibdeps.pl: Likewise.
+	* scripts/dpkg-source.pl: Likewise.
+
+	* scripts/dpkg-buildpackage.pl ($warnable_error): Import from
+	Dpkg::ErrorHandling instead of declaring as our.
+	* scripts/dpkg-source.pl ($warnable_error, $quiet_warnings): Likewise.
+
+	* scripts/822-date.pl: Do not require controllib.pl anymore.
+	* scripts/dpkg-parsechangelog.pl: Likewise.
+	* scripts/dpkg-shlibdeps.pl: Likewise.
+
+2007-10-10  Guillem Jover  <guillem@debian.org>
+
+	* scripts/Dpkg/ErrorHandling.pm: Use Dpkg.
+	($progname): Do not set nor declare it.
+
+2007-10-10  Guillem Jover  <guillem@debian.org>
+
+	* scripts/Dpkg/ErrorHandling.pm ($warnable_error): Set to 1 to match
+	controllib.pl.
+
+2007-10-10  Guillem Jover  <guillem@debian.org>
+
+	* m4/arch.m4(_DPKG_ARCHITECTURE): Set PERL5LIB when calling
+	dpkg-architecture.pl to use the shipped perl modules instead of
+	the system ones.
+
 2007-10-09  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-gensymbols.pl: Use new Dpkg module. Do not declare

debian/changelog

@@ -35,6 +35,12 @@ dpkg (1.14.8) UNRELEASED; urgency=low
   * Allow to use other compressions than gzip on dpkg-source -b
     (NOTE: this will result in a Format: 2.0 source package!).
     Closes: #382673
+  * Various small fixes to the manpages suggested by Helge Kreutzmann.
+    Closes: #445858
+
+  [ Guillem Jover ]
+  * Use shipped perl modules when calling perl programs at build time.
+  * Switch perl programs to use the new Dpkg/ErrorHandling module.
 
   [ Updated dpkg translations ]
   * Polish (Robert Luberda).

m4/arch.m4

@@ -4,7 +4,8 @@
 # the target architecture, to avoid duplicating its logic.
 AC_DEFUN([_DPKG_ARCHITECTURE], [
 AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
-$2="`cd $srcdir/scripts; ./dpkg-architecture.pl -t$target -q$1 2>/dev/null`"
+$2="`cd $srcdir/scripts; \
+     PERL5LIB=$(pwd) ./dpkg-architecture.pl -t$target -q$1 2>/dev/null`"
 ])# _DPKG_ARCHITECURE
 
 # DPKG_CPU_TYPE

man/ChangeLog

@@ -1,3 +1,8 @@
+2007-10-11  Frank Lichtenheld  <djpig@debian.org>
+
+	* po/dpkg-man.pot: Regenerated.
+	* po/*.po: Merged with dpkg-man.pot.
+
 2007-10-09  Frank Lichtenheld  <djpig@debian.org>
 
 	* dpkg-source.1: -W is the default for quite

man/deb-symbols.5

@@ -18,7 +18,7 @@ in these files is:
  <symbol> <mininal version>[ <id of dependency template> ]
 .P
 The \fIlibrary soname\fR is exactly the value of the SONAME field
-as exported by \fBobjdump\fR. A \fIdependency template\fR is a
+as exported by \fBobjdump\fR(1). A \fIdependency template\fR is a
 dependency where \fI#MINVER#\fR is dynamically replaced either by
 a version check like "(>= \fIminimal version\fR)" or by nothing (if
 an unversionned dependency is deemed sufficient). 

man/dpkg-gencontrol.1

@@ -114,7 +114,7 @@ The list of generated files which are part of the upload being
 prepared.
 .B dpkg\-gencontrol
 adds the presumed filenames of binary packages whose control files it
-generates here;
+generates here.
 .
 .SH AUTHORS
 Copyright (C) 1995-1996 Ian Jackson

man/install-info.8

@@ -44,7 +44,7 @@ updated or removed. If
 .B \-\-remove\-exactly
 is specified, then
 .I filename
-should be the exact entry name to be removed (i.e. "emacs\-20/emacs" or
+should be the exact entry name to be removed (e.g. "emacs\-20/emacs" or
 "gcc"), otherwise the basename of this filename is used as the
 referent of the menu entry which is created, unless there's an
 overriding START-INFO-DIR entry inside the given file. This file must
@@ -107,7 +107,7 @@ except that
 is taken as the exact entry to be removed, rather than as the name
 of an existing file. This can be important when trying to remove
 entries that refer to info files in subdirectories
-(i.e. "emacs\-20/emacs") because
+(e.g. "emacs\-20/emacs") because
 .B \-\-remove
 will operate on the basename of the given
 .I filename

scripts/822-date.pl

@@ -5,12 +5,10 @@ use warnings;
 
 use Dpkg;
 use Dpkg::Gettext;
+use Dpkg::ErrorHandling qw(warning);
 
 textdomain("dpkg-dev");
 
-push(@INC, $dpkglibdir);
-require 'controllib.pl';
-
 @ARGV && die _g("Usage: 822-date")."\n";
 
 warning(_g("This program is deprecated. Please use 'date -R' instead."));

scripts/Dpkg/ErrorHandling.pm

@@ -1,14 +1,14 @@
 package Dpkg::ErrorHandling;
 
+use Dpkg;
 use Dpkg::Gettext;
 
 use base qw(Exporter);
-our @EXPORT_OK = qw( failure syserr error internerr warning
-                     warnerror subprocerr );
+our @EXPORT_OK = qw(warning warnerror error failure unknown syserr internerr
+                    subprocerr usageerr $warnable_error $quiet_warnings);
 
-our $warnable_error = 0;
+our $warnable_error = 1;
 our $quiet_warnings = 0;
-our $progname = "unknown";
 
 sub failure { die sprintf(_g("%s: failure: %s"), $progname, $_[0])."\n"; }
 sub syserr { die sprintf(_g("%s: failure: %s: %s"), $progname, $_[0], $!)."\n"; }
@@ -31,6 +31,12 @@ sub warnerror
     }
 }
 
+sub unknown {
+    my $field = $_;
+    warning(sprintf(_g("unknown information field '%s' in input data in %s"),
+                    $field, $_[0]));
+}
+
 sub subprocerr {
     my ($p) = @_;
     require POSIX;
@@ -46,5 +52,12 @@ sub subprocerr {
     }
 }
 
+sub usageerr
+{
+    printf(STDERR "%s: %s\n\n", $progname, "@_");
+    # XXX: access to main namespace
+    main::usage();
+    exit(2);
+}
 
 1;

scripts/changelog/debian.pl

@@ -5,6 +5,7 @@ use warnings;
 
 use Dpkg;
 use Dpkg::Gettext;
+use Dpkg::ErrorHandling qw(error internerr usageerr);
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';

scripts/controllib.pl

@@ -7,6 +7,7 @@ use English;
 use POSIX qw(:errno_h);
 use Dpkg;
 use Dpkg::Gettext;
+use Dpkg::ErrorHandling qw(warning error failure internerr syserr subprocerr);
 
 textdomain("dpkg-dev");
 
@@ -29,9 +30,6 @@ our @pkg_dep_fields = qw(Pre-Depends Depends Recommends Suggests Enhances
 our @src_dep_fields = qw(Build-Depends Build-Depends-Indep
                          Build-Conflicts Build-Conflicts-Indep);
 
-our $warnable_error = 1;
-our $quiet_warnings = 0;
-
 
 sub getfowner
 {
@@ -655,57 +653,8 @@ sub parsecdata {
     return $index;
 }
 
-sub unknown {
-    my $field = $_;
-    warning(sprintf(_g("unknown information field '%s' in input data in %s"),
-                    $field, $_[0]));
-}
-
 sub syntax {
     &error(sprintf(_g("syntax error in %s at line %d: %s"), $whatmsg, $., $_[0]));
 }
 
-sub failure { die sprintf(_g("%s: failure: %s"), $progname, $_[0])."\n"; }
-sub syserr { die sprintf(_g("%s: failure: %s: %s"), $progname, $_[0], $!)."\n"; }
-sub error { die sprintf(_g("%s: error: %s"), $progname, $_[0])."\n"; }
-sub internerr { die sprintf(_g("%s: internal error: %s"), $progname, $_[0])."\n"; }
-
-sub warning
-{
-    if (!$quiet_warnings) {
-	warn sprintf(_g("%s: warning: %s"), $progname, $_[0])."\n";
-    }
-}
-
-sub usageerr
-{
-    printf(STDERR "%s: %s\n\n", $progname, "@_");
-    &usage;
-    exit(2);
-}
-
-sub warnerror
-{
-    if ($warnable_error) {
-	warning(@_);
-    } else {
-	error(@_);
-    }
-}
-
-sub subprocerr {
-    my ($p) = @_;
-    require POSIX;
-    if (POSIX::WIFEXITED($?)) {
-        die sprintf(_g("%s: failure: %s gave error exit status %s"),
-                    $progname, $p, POSIX::WEXITSTATUS($?))."\n";
-    } elsif (POSIX::WIFSIGNALED($?)) {
-        die sprintf(_g("%s: failure: %s died from signal %s"),
-                    $progname, $p, POSIX::WTERMSIG($?))."\n";
-    } else {
-        die sprintf(_g("%s: failure: %s failed with unknown exit code %d"),
-                    $progname, $p, $?)."\n";
-    }
-}
-
 1;

scripts/dpkg-architecture.pl

@@ -24,6 +24,7 @@ use warnings;
 
 use Dpkg;
 use Dpkg::Gettext;
+use Dpkg::ErrorHandling qw(warning syserr usageerr);
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';

scripts/dpkg-buildpackage.pl

@@ -8,13 +8,13 @@ use File::Basename;
 
 use Dpkg;
 use Dpkg::Gettext;
+use Dpkg::ErrorHandling qw(warning error failure syserr subprocerr usageerr
+                           $warnable_error);
 use Dpkg::BuildOptions;
 
 push (@INC, $dpkglibdir);
 require 'controllib.pl';
 
-our $warnable_error;
-
 textdomain("dpkg-dev");
 
 sub showversion {

scripts/dpkg-checkbuilddeps.pl

@@ -7,6 +7,7 @@ use warnings;
 use Getopt::Long;
 use Dpkg;
 use Dpkg::Gettext;
+use Dpkg::ErrorHandling qw(error);
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';

scripts/dpkg-distaddfile.pl

@@ -7,6 +7,7 @@ use POSIX;
 use POSIX qw(:errno_h :signal_h);
 use Dpkg;
 use Dpkg::Gettext;
+use Dpkg::ErrorHandling qw(error syserr usageerr);
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';

scripts/dpkg-genchanges.pl

@@ -7,6 +7,8 @@ use POSIX;
 use POSIX qw(:errno_h :signal_h);
 use Dpkg;
 use Dpkg::Gettext;
+use Dpkg::ErrorHandling qw(warning error failure unknown internerr syserr
+                           subprocerr usageerr);
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';

scripts/dpkg-gencontrol.pl

@@ -7,6 +7,8 @@ use POSIX;
 use POSIX qw(:errno_h);
 use Dpkg;
 use Dpkg::Gettext;
+use Dpkg::ErrorHandling qw(warning error failure unknown internerr syserr
+                           subprocerr usageerr);
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';

scripts/dpkg-gensymbols.pl

@@ -8,6 +8,7 @@ use Dpkg::Shlibs qw(@librarypaths);
 use Dpkg::Shlibs::Objdump;
 use Dpkg::Shlibs::SymbolFile;
 use Dpkg::Gettext;
+use Dpkg::ErrorHandling qw(warning error syserr usageerr);
 
 textdomain("dpkg-dev");
 

scripts/dpkg-parsechangelog.pl

@@ -7,9 +7,7 @@ use POSIX;
 use POSIX qw(:errno_h);
 use Dpkg;
 use Dpkg::Gettext;
-
-push(@INC,$dpkglibdir);
-require 'controllib.pl';
+use Dpkg::ErrorHandling qw(warning error syserr subprocerr usageerr);
 
 textdomain("dpkg-dev");
 

scripts/dpkg-shlibdeps.pl

@@ -7,6 +7,7 @@ use English;
 use POSIX qw(:errno_h :signal_h);
 use Dpkg;
 use Dpkg::Gettext;
+use Dpkg::ErrorHandling qw(warning error failure syserr usageerr);
 use Dpkg::Path qw(relative_to_pkg_root);
 use Dpkg::Version qw(vercmp);
 use Dpkg::Shlibs qw(find_library);
@@ -20,8 +21,6 @@ chomp $host_arch;
 my @depfields= qw(Suggests Recommends Depends Pre-Depends);
 my $i=0; my %depstrength = map { $_ => $i++ } @depfields;
 
-push(@INC, $dpkglibdir);
-require 'controllib.pl';
 textdomain("dpkg-dev");
 
 my $shlibsoverride= '/etc/dpkg/shlibs.override';

scripts/dpkg-source.pl

@@ -5,6 +5,9 @@ use warnings;
 
 use Dpkg;
 use Dpkg::Gettext;
+use Dpkg::ErrorHandling qw(warning warnerror error failure unknown
+                           internerr syserr subprocerr usageerr
+                           $warnable_error $quiet_warnings);
 
 my @filesinarchive;
 my %dirincluded;
@@ -109,8 +112,6 @@ require 'controllib.pl';
 
 our (%f, %fi);
 our $sourcepackage;
-our $warnable_error;
-our $quiet_warnings;
 our %substvar;
 our @src_dep_fields;