dpkg (1.13.9) unstable; urgency=low

  The "On like Donkey Kong" Release.

  * Only open the log file when we first need to write to it, this avoids
    the need to suppress errors when not root which fakeroot defeated anyway.
  * Stop dpkg-source clobbering an existing .orig directory during unpacking.
    Closes: #21236.
  * Allow an alternate output directory to be specified to dpkg-source by
    giving a second argument to -x.  Closes: #246802, #282323.
  * Added .arch-inventory to default diff ignore regexp.  Closes: #304297.

  SELinux support (Manoj Srivastava):
  * On SELinux-enabled systems, try to set the security context when the
    package is unpacked.  Closes: #193653, #249496, #307139.
  * Added build-dependancy on libselinux1-dev.

  Improvements to dpkg-source (Brendan O'Dea):
  * Support unpacking of "Wig And Pen" (Format 2.0) source packages.
  * Multiple pristine upstream tarballs allowed.
  * Native and upstream tarballs may be bzip2-compressed instead of gzip,
    as may the debian diff or tarball.
  * Unsupported format error fixed to output the unsupported format
    rather than the supported one.  Closes: #156317.

 -- Scott James Remnant <scott@netsplit.com>  Sun, 12 Jun 2005 15:52:43 +0100

103 files changed, 3178 insertions, 2175 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f14b44ad..fd1c9254e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,111 @@
+2005-06-12  Scott James Remnant  <scott@netsplit.com>
+
+	* configure.ac: Release 1.13.9.
+
+2005-06-11  Scott James Remnant  <scott@netsplit.com>
+
+	* scripts/dpkg-source.pl: Add .arch-inventory to default diff
+	ignore regexp.
+
+	* scripts/dpkg-source.pl: If two arguments are given to dpkg-source,
+	use the second to set $newdirectory rather than creating it ourselves.
+	It's an error to specify an output directory that exists.
+	(usageversion): Document optional second argument to dpkg-source -x.
+	
+	* man/C/dpkg-source.1: Document optional second argument.
+
+2005-06-11  Matt Kraai  <kraai@alumni.cmu.edu>,
+	    Scott James Remnant  <scott@netsplit.com>
+
+	* scripts/dpkg-source.pl: Move the .orig directory out of the way
+	during the duration of the script, moving it back again afterwards.
+
+2005-06-11  Brendan O'Dea  <bod@debian.org>
+
+	Support unpacking of "Wig And Pen" (Format: 2.0) source packages.
+
+	* scripts/dpkg-source.pl: When unpacking a source package with a
+	2.x format, allow multiple orig tarballs and allow the diff to be
+	replaced by a debian.tar.  Additional orig tarballs are named
+	"*.orig-xxx.tar" where the "xxx" is the name of the sub-directory
+	of the source where they should be unpacked.  The debian.tar is
+	unpacked as the debian sub-directory of the source and may contain
+	binaries (which the diff can't) and patches (in a patches
+	sub-directory) which are automatically applied during unpacking.
+	(checkdiff): Move diff checking code into sub-routine as we call
+	it multiple times now.  Allow uncompressed patches, cruft
+	at the start of a patcha and be less strict about patched directory
+	name (including allowing /dev/null).  Skip "Index:" header generated
+	by CVS.
+	(forkgzipread): Run either gunzip or bunzip2 depending on the
+	filename, allowing us to support .tar.bz2, and .diff.bz2.
+	(handleformat): Compare a range of major versions, as we now
+	support both 1.0 and 2.0 formats.
+	(def_dscformat): Generate 1.0 format packages by default.
+	(setfile): Removed unused function.
+	* debian/control ([dpkg-dev]Recommends): Recommend bzip2, it's
+	not an absolute dependency until bz2 packages are supported by
+	katie and policy.
+
+2005-06-11  Scott James Remnant  <scott@netsplit.com>
+
+	* m4/libs.m4 (DPKG_LIB_ZLIB, DPKG_LIB_BZ2): Rewrite to match the
+	way --with-selinux works.  Actually check whether the library and
+	header files we need are available, using the configure option to
+	determine whether the tests should be skipped (=no) or cause a
+	hard failure if not present (=yes or =static).
+	* lib/Makefile.am (INCLUDES): Remove ZLIB_CFLAGS and BZ2_CFLAGS as
+	we don't set these to anything in configure anymore (WITH_ZLIB and
+	WITH_BZ2 are set in config.h) and users would set CFLAGS itself to
+	supply missing -I arguments.
+	* dpkg-deb/Makefile.am (INCLUDES): Remove ZLIB_CFLAGS and BZ2_CLFAGS.
+	* src/Makefile.am (dpkg_query_LDADD): Remove ZLIB_LIBS and CFLAGS_LIBS
+	as dpkg-query doesn't use them.
+
+	* m4/libs.m4 (DPKG_LIB_SELINUX): Add new test for the selinux
+	library and header.  This works a little differently from the
+	current --with-{zlib,bz2} tests in that if no option is given it
+	still tries to enable it if possible.  If "yes" or "static" is given,
+	that forces the requirement (configure fails if not present), if "no"
+	is given the tests are skipped.
+	* configure.ac: Include selinux test.
+
+2005-06-11  Manoj Srivastava  <srivasta@debian.org>
+
+	* lib/star.c (ExtractFile, SetModes): If dpkg is compiled with
+	SELinux, test once whether SELinux is enabled on the system.  If it
+	is enabled, find out the security context of the file from its path
+	and either set what we think it should be or let the default security
+	context for the process be applied.
+	* debian/control (Build-Depends): Add libselinux1-dev as a build
+	dependency. 
+	* debian/rules: Compile-in support for selinux and link statically.
+	* dpkg-deb/Makefile.am (dpkg_deb_LDADD): Link dpkg-deb with
+	SELINUX_LIBS.
+	* src/Makefile.am (dpkg_LDADD): Link dpkg with SELINUX_LIBS.
+
 2005-06-10  Scott James Remnant  <scott@netsplit.com>
 
+	* lib/dbmodify.c (log_message): New function that writes a
+	formatted string to the log file, opening it if it hasn't been
+	yet.  In case of error, we print it and don't try to open the
+	file again.
+	(modstatdb_note): Replace log writing code with call to new
+	log_message function.
+	* src/configure.c (promptconfaction): Replace log writing code
+	with call to log_message function.
+	* src/help.c (log_action): Simplify to just a log_message call.
+	* lib/dpkg-db.h: Remove extern definition of log_pipes, replace
+	with log_message function.
+	* src/main.c (cmdinfos): Change --log argument action to just
+	storing the string in the log_file variable.
+	(setfile): Remove function.
+	* lib/myopt.c (myfileopt): strdup the string option argument
+	before storing it, otherwise it just gets overwritten by the next
+	line.
+
+	* configure.ac: Bump version to 1.13.9~.
+
 	* configure.ac: Release 1.13.8.
 
 	* lib/parse.c (parsedb): Check whether the file size is greater
diff --git a/INSTALL b/INSTALL
index 54caf7c19..095b1eb40 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,13 +1,16 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Installation Instructions
+*************************
 
-   This file is free documentation; the Free Software Foundation gives
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-   These are generic installation instructions.
+These are generic installation instructions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -67,9 +70,9 @@ The simplest way to compile this package is:
 Compilers and Options
 =====================
 
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -82,7 +85,7 @@ is an example:
 Compiling For Multiple Architectures
 ====================================
 
-   You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you must use a version of `make' that
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
@@ -99,19 +102,19 @@ for another architecture.
 Installation Names
 ==================
 
-   By default, `make install' will install the package's files in
+By default, `make install' will install the package's files in
 `/usr/local/bin', `/usr/local/man', etc.  You can specify an
 installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+option `--prefix=PREFIX'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
+give `configure' the option `--exec-prefix=PREFIX', the package will
+use PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files will still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
@@ -122,7 +125,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
 
-   Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -137,11 +140,11 @@ you can use the `configure' options `--x-includes=DIR' and
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -167,9 +170,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -178,7 +181,7 @@ A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 
-   Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -192,8 +195,7 @@ overridden in the site shell script).
 `configure' Invocation
 ======================
 
-   `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
 
 `--help'
 `-h'
diff --git a/Makefile.in b/Makefile.in
index a2457e032..928021e3e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -78,6 +78,12 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-recursive installcheck-recursive installdirs-recursive \
 	pdf-recursive ps-recursive uninstall-info-recursive \
 	uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(pkgdatadir)"
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
@@ -106,7 +112,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -166,6 +171,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -178,7 +184,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -192,6 +197,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -326,7 +333,7 @@ install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
 	  $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	done
@@ -334,7 +341,7 @@ install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 uninstall-dist_pkgdataDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	done
@@ -492,12 +499,14 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -508,15 +517,15 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
-	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
 
 dist-shar: distdir
@@ -529,7 +538,7 @@ dist-zip: distdir
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -538,11 +547,11 @@ dist dist-all: distdir
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
@@ -627,7 +636,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/aclocal.m4 b/aclocal.m4
index a8cfe0104..3d54c09ee 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.4 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
@@ -33,14 +33,14 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.8.5])])
+	 [AM_AUTOMAKE_VERSION([1.9.4])])
 
 # AM_AUX_DIR_EXPAND
 
@@ -108,7 +108,7 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                              -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -145,8 +145,8 @@ else
 fi
 AC_CONFIG_COMMANDS_PRE(
 [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
 fi])])
 
 # serial 7						-*- Autoconf -*-
@@ -319,7 +319,8 @@ AC_SUBST([AMDEPBACKSLASH])
 
 # Generate code to set up dependency tracking.   -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+#   Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -355,27 +356,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   else
     continue
   fi
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
   DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   # When using ansi2knr, U may be empty or an underscore; expand it
   U=`sed -n 's/^U = //p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
@@ -406,7 +401,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -482,7 +477,6 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
 AM_PROG_INSTALL_SH
 AM_PROG_INSTALL_STRIP
 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
@@ -491,7 +485,9 @@ AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
                   [_AM_DEPENDENCIES(CC)],
@@ -734,13 +730,21 @@ fi
 # this.)
 AC_DEFUN([AM_PROG_MKDIR_P],
 [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
   #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
 else
   # On NextStep and OpenStep, the `mkdir' command does not
   # recognize any option.  It will interpret all options as
@@ -906,6 +910,114 @@ fi
 INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004  Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
 m4_include([m4/arch.m4])
 m4_include([m4/codeset.m4])
 m4_include([m4/compiler.m4])
diff --git a/config.h.in b/config.h.in
index 93d7d9261..5201b11ae 100644
--- a/config.h.in
+++ b/config.h.in
@@ -329,9 +329,18 @@
 /* Version number of package */
 #undef VERSION
 
+/* Define to 1 to use libbz2 rather than console tool */
+#undef WITH_BZ2
+
+/* Define to 1 to compile in SELinux supoprt */
+#undef WITH_SELINUX
+
 /* Define to 1 if start-stop-daemon is compiled. */
 #undef WITH_START_STOP_DAEMON
 
+/* Define to 1 to use zlib rather than console tool */
+#undef WITH_ZLIB
+
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #undef WORDS_BIGENDIAN
diff --git a/configure b/configure
index 6f2bbce1b..aee681617 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dpkg 1.13.8.
+# Generated by GNU Autoconf 2.59 for dpkg 1.13.9.
 #
 # Report bugs to <debian-dpkg@lists.debian.org>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='dpkg'
 PACKAGE_TARNAME='dpkg'
-PACKAGE_VERSION='1.13.8'
-PACKAGE_STRING='dpkg 1.13.8'
+PACKAGE_VERSION='1.13.9'
+PACKAGE_STRING='dpkg 1.13.9'
 PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org'
 
 ac_unique_file="lib/dpkg.h"
@@ -311,7 +311,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB WITH_DSELECT_TRUE WITH_DSELECT_FALSE WITH_START_STOP_DAEMON_TRUE WITH_START_STOP_DAEMON_FALSE admindir CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE PERL ZLIB_CFLAGS ZLIB_LIBS BZ2_CFLAGS BZ2_LIBS CURSES_LIBS SSD_LIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB WITH_DSELECT_TRUE WITH_DSELECT_FALSE WITH_START_STOP_DAEMON_TRUE WITH_START_STOP_DAEMON_FALSE admindir CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE PERL ZLIB_LIBS BZ2_LIBS SELINUX_LIBS CURSES_LIBS SSD_LIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -784,22 +784,18 @@ ac_env_PERL_set=${PERL+set}
 ac_env_PERL_value=$PERL
 ac_cv_env_PERL_set=${PERL+set}
 ac_cv_env_PERL_value=$PERL
-ac_env_ZLIB_CFLAGS_set=${ZLIB_CFLAGS+set}
-ac_env_ZLIB_CFLAGS_value=$ZLIB_CFLAGS
-ac_cv_env_ZLIB_CFLAGS_set=${ZLIB_CFLAGS+set}
-ac_cv_env_ZLIB_CFLAGS_value=$ZLIB_CFLAGS
 ac_env_ZLIB_LIBS_set=${ZLIB_LIBS+set}
 ac_env_ZLIB_LIBS_value=$ZLIB_LIBS
 ac_cv_env_ZLIB_LIBS_set=${ZLIB_LIBS+set}
 ac_cv_env_ZLIB_LIBS_value=$ZLIB_LIBS
-ac_env_BZ2_CFLAGS_set=${BZ2_CFLAGS+set}
-ac_env_BZ2_CFLAGS_value=$BZ2_CFLAGS
-ac_cv_env_BZ2_CFLAGS_set=${BZ2_CFLAGS+set}
-ac_cv_env_BZ2_CFLAGS_value=$BZ2_CFLAGS
 ac_env_BZ2_LIBS_set=${BZ2_LIBS+set}
 ac_env_BZ2_LIBS_value=$BZ2_LIBS
 ac_cv_env_BZ2_LIBS_set=${BZ2_LIBS+set}
 ac_cv_env_BZ2_LIBS_value=$BZ2_LIBS
+ac_env_SELINUX_LIBS_set=${SELINUX_LIBS+set}
+ac_env_SELINUX_LIBS_value=$SELINUX_LIBS
+ac_cv_env_SELINUX_LIBS_set=${SELINUX_LIBS+set}
+ac_cv_env_SELINUX_LIBS_value=$SELINUX_LIBS
 ac_env_CURSES_LIBS_set=${CURSES_LIBS+set}
 ac_env_CURSES_LIBS_value=$CURSES_LIBS
 ac_cv_env_CURSES_LIBS_set=${CURSES_LIBS+set}
@@ -816,7 +812,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dpkg 1.13.8 to adapt to many kinds of systems.
+\`configure' configures dpkg 1.13.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -883,7 +879,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dpkg 1.13.8:";;
+     short | recursive ) echo "Configuration of dpkg 1.13.9:";;
    esac
   cat <<\_ACEOF
 
@@ -915,10 +911,9 @@ Optional Packages:
   --without-start-stop-daemon
                           don't build or use start-stop-daemon
   --with-admindir=DIR     dpkg database directory [LOCALSTATEDIR/dpkg]
-  --with-zlib             use zlib for compression and decompression
-                          (yes/static)
+  --with-zlib             use zlib library for compression and decompression
   --with-bz2              use bz2 library for compression and decompression
-                          (yes/static)
+  --with-selinux          use selinux library to set security contexts
 
 Some influential environment variables:
   CC          C compiler command
@@ -931,10 +926,10 @@ Some influential environment variables:
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   PERL        Perl interpreter
-  ZLIB_CFLAGS compiler flags for zlib library
   ZLIB_LIBS   linker flags for zlib library
-  BZ2_CFLAGS  compiler flags for bz2 library
   BZ2_LIBS    linker flags for bz2 library
+  SELINUX_LIBS
+              linker flags for selinux library
   CURSES_LIBS linker flags for curses library
   SSD_LIBS    linker flags for start-stop-daemon
 
@@ -1037,7 +1032,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-dpkg configure 1.13.8
+dpkg configure 1.13.9
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1051,7 +1046,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dpkg $as_me 1.13.8, which was
+It was created by dpkg $as_me 1.13.9, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1567,7 +1562,7 @@ _ACEOF
 
 
 
-am__api_version="1.8"
+am__api_version="1.9"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1719,13 +1714,21 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
 if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
   #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
 else
   # On NextStep and OpenStep, the `mkdir' command does not
   # recognize any option.  It will interpret all options as
@@ -1841,7 +1844,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dpkg'
- VERSION='1.13.8'
+ VERSION='1.13.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1869,9 +1872,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
@@ -1964,6 +1964,13 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
 
 
 
@@ -11783,33 +11790,736 @@ fi
 # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
   withval="$with_zlib"
-  case "$with_zlib" in
-    yes)
-	ZLIB_CFLAGS="${ZLIB_CFLAGS:+$ZLIB_CFLAGS }-DWITH_ZLIB"
-	ZLIB_LIBS="${ZLIB_LIBS:+$ZLIB_LIBS }-lz"
-	;;
-    static)
-	ZLIB_CFLAGS="${ZLIB_CFLAGS:+$ZLIB_CFLAGS }-DWITH_ZLIB"
-	ZLIB_LIBS="${ZLIB_LIBS:+$ZLIB_LIBS }-Wl,-Bstatic -lz -Wl,-Bdynamic"
-	;;
-esac
+
 fi;
+if test "x$with_zlib" != "xno"; then
+	echo "$as_me:$LINENO: checking for gzdopen in -lz" >&5
+echo $ECHO_N "checking for gzdopen in -lz... $ECHO_C" >&6
+if test "${ac_cv_lib_z_gzdopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gzdopen ();
+int
+main ()
+{
+gzdopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_z_gzdopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_z_gzdopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzdopen" >&5
+echo "${ECHO_T}$ac_cv_lib_z_gzdopen" >&6
+if test $ac_cv_lib_z_gzdopen = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_ZLIB 1
+_ACEOF
+
+		 if test "x$with_zlib" = "xstatic"; then
+			dpkg_zlib_libs="-Wl,-Bstatic -lz -Wl,-Bdynamic"
+		 else
+			dpkg_zlib_libs="-lz"
+		 fi
+		 ZLIB_LIBS="${ZLIB_LIBS:+$ZLIB_LIBS }$dpkg_zlib_libs"
+		 with_zlib="yes"
+else
+  if test -n "$with_zlib"; then
+			{ { echo "$as_me:$LINENO: error: zlib library not found
+See \`config.log' for more details." >&5
+echo "$as_me: error: zlib library not found
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+		 fi
+fi
+
+
+	if test "${ac_cv_header_zlib_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking zlib.h usability" >&5
+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <zlib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking zlib.h presence" >&5
+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <zlib.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------- ##
+## Report this to debian-dpkg@lists.debian.org ##
+## ------------------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_zlib_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+
+fi
+if test $ac_cv_header_zlib_h = yes; then
+  :
+else
+  if test -n "$with_zlib"; then
+			{ { echo "$as_me:$LINENO: error: zlib header not found
+See \`config.log' for more details." >&5
+echo "$as_me: error: zlib header not found
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+		 fi
+fi
+
+
+fi
 
 
 # Check whether --with-bz2 or --without-bz2 was given.
 if test "${with_bz2+set}" = set; then
   withval="$with_bz2"
-  case "$with_bz2" in
-    yes)
-	BZ2_CFLAGS="${BZ2_CFLAGS:+$BZ2_CFLAGS }-DWITH_BZ2"
-	BZ2_LIBS="${BZ2_LIBS:+$BZ2_LIBS }-lbz2"
-	;;
-    static)
-	BZ2_CFLAGS="${BZ2_CFLAGS:+$BZ2_CFLAGS }-DWITH_BZ2"
-	BZ2_LIBS="${BZ2_LIBS:+$BZ2_LIBS }-Wl,-Bstatic -lbz2 -Wl,-Bdynamic"
-	;;
+
+fi;
+if test "x$with_bz2" != "xno"; then
+	echo "$as_me:$LINENO: checking for BZ2_bzdopen in -lbz2" >&5
+echo $ECHO_N "checking for BZ2_bzdopen in -lbz2... $ECHO_C" >&6
+if test "${ac_cv_lib_bz2_BZ2_bzdopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbz2  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char BZ2_bzdopen ();
+int
+main ()
+{
+BZ2_bzdopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_bz2_BZ2_bzdopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_bz2_BZ2_bzdopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_BZ2_bzdopen" >&5
+echo "${ECHO_T}$ac_cv_lib_bz2_BZ2_bzdopen" >&6
+if test $ac_cv_lib_bz2_BZ2_bzdopen = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_BZ2 1
+_ACEOF
+
+		 if test "x$with_bz2" = "xstatic"; then
+			dpkg_bz2_libs="-Wl,-Bstatic -lbz2 -Wl,-Bdynamic"
+		 else
+			dpkg_bz2_libs="-lbz2"
+		 fi
+		 BZ2_LIBS="${BZ2_LIBS:+$BZ2_LIBS }$dpkg_bz2_libs"
+		 with_bz2="yes"
+else
+  if test -n "$with_bz2"; then
+			{ { echo "$as_me:$LINENO: error: bz2 library not found
+See \`config.log' for more details." >&5
+echo "$as_me: error: bz2 library not found
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+		 fi
+fi
+
+
+	if test "${ac_cv_header_bzlib_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for bzlib.h" >&5
+echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_bzlib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking bzlib.h usability" >&5
+echo $ECHO_N "checking bzlib.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <bzlib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking bzlib.h presence" >&5
+echo $ECHO_N "checking bzlib.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <bzlib.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: bzlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: bzlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: bzlib.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: bzlib.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: bzlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: bzlib.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: bzlib.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: bzlib.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: bzlib.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: bzlib.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: bzlib.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: bzlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: bzlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: bzlib.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: bzlib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: bzlib.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------- ##
+## Report this to debian-dpkg@lists.debian.org ##
+## ------------------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
 esac
+echo "$as_me:$LINENO: checking for bzlib.h" >&5
+echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_bzlib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_bzlib_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6
+
+fi
+if test $ac_cv_header_bzlib_h = yes; then
+  :
+else
+  if test -n "$with_bz2"; then
+			{ { echo "$as_me:$LINENO: error: bz2 header not found
+See \`config.log' for more details." >&5
+echo "$as_me: error: bz2 header not found
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+		 fi
+fi
+
+
+fi
+
+
+# Check whether --with-selinux or --without-selinux was given.
+if test "${with_selinux+set}" = set; then
+  withval="$with_selinux"
+
 fi;
+if test "x$with_selinux" != "xno"; then
+	echo "$as_me:$LINENO: checking for is_selinux_enabled in -lselinux" >&5
+echo $ECHO_N "checking for is_selinux_enabled in -lselinux... $ECHO_C" >&6
+if test "${ac_cv_lib_selinux_is_selinux_enabled+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lselinux  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char is_selinux_enabled ();
+int
+main ()
+{
+is_selinux_enabled ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_selinux_is_selinux_enabled=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_selinux_is_selinux_enabled=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
+echo "${ECHO_T}$ac_cv_lib_selinux_is_selinux_enabled" >&6
+if test $ac_cv_lib_selinux_is_selinux_enabled = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_SELINUX 1
+_ACEOF
+
+		 if test "x$with_selinux" = "xstatic"; then
+			dpkg_selinux_libs="-Wl,-Bstatic -lselinux -Wl,-Bdynamic"
+		 else
+			dpkg_selinux_libs="-lselinux"
+		 fi
+		 SELINUX_LIBS="${SELINUX_LIBS:+$SELINUX_LIBS }$dpkg_selinux_libs"
+		 with_selinux="yes"
+else
+  if test -n "$with_selinux"; then
+			{ { echo "$as_me:$LINENO: error: selinux library not found
+See \`config.log' for more details." >&5
+echo "$as_me: error: selinux library not found
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+		 fi
+fi
+
+
+	if test "${ac_cv_header_selinux_selinux_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for selinux/selinux.h" >&5
+echo $ECHO_N "checking for selinux/selinux.h... $ECHO_C" >&6
+if test "${ac_cv_header_selinux_selinux_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_selinux_selinux_h" >&5
+echo "${ECHO_T}$ac_cv_header_selinux_selinux_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking selinux/selinux.h usability" >&5
+echo $ECHO_N "checking selinux/selinux.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <selinux/selinux.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking selinux/selinux.h presence" >&5
+echo $ECHO_N "checking selinux/selinux.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <selinux/selinux.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: selinux/selinux.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: selinux/selinux.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: selinux/selinux.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: selinux/selinux.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: selinux/selinux.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: selinux/selinux.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: selinux/selinux.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: selinux/selinux.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: selinux/selinux.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: selinux/selinux.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------- ##
+## Report this to debian-dpkg@lists.debian.org ##
+## ------------------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for selinux/selinux.h" >&5
+echo $ECHO_N "checking for selinux/selinux.h... $ECHO_C" >&6
+if test "${ac_cv_header_selinux_selinux_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_selinux_selinux_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_selinux_selinux_h" >&5
+echo "${ECHO_T}$ac_cv_header_selinux_selinux_h" >&6
+
+fi
+if test $ac_cv_header_selinux_selinux_h = yes; then
+  :
+else
+  if test -n "$with_selinux"; then
+			{ { echo "$as_me:$LINENO: error: selinux header not found
+See \`config.log' for more details." >&5
+echo "$as_me: error: selinux header not found
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+		 fi
+fi
+
+
+fi
 
 if test "x$build_dselect" = "xyes"; then
    echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
@@ -15388,7 +16098,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by dpkg $as_me 1.13.8, which was
+This file was extended by dpkg $as_me 1.13.9, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15451,7 +16161,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-dpkg config.status 1.13.8
+dpkg config.status 1.13.9
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -15701,7 +16411,6 @@ s,@AUTOCONF@,$AUTOCONF,;t t
 s,@AUTOMAKE@,$AUTOMAKE,;t t
 s,@AUTOHEADER@,$AUTOHEADER,;t t
 s,@MAKEINFO@,$MAKEINFO,;t t
-s,@AMTAR@,$AMTAR,;t t
 s,@install_sh@,$install_sh,;t t
 s,@STRIP@,$STRIP,;t t
 s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
@@ -15710,6 +16419,9 @@ s,@mkdir_p@,$mkdir_p,;t t
 s,@AWK@,$AWK,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
 s,@am__leading_dot@,$am__leading_dot,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@am__tar@,$am__tar,;t t
+s,@am__untar@,$am__untar,;t t
 s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
 s,@USE_NLS@,$USE_NLS,;t t
 s,@MSGFMT@,$MSGFMT,;t t
@@ -15769,10 +16481,9 @@ s,@CXXDEPMODE@,$CXXDEPMODE,;t t
 s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
 s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
 s,@PERL@,$PERL,;t t
-s,@ZLIB_CFLAGS@,$ZLIB_CFLAGS,;t t
 s,@ZLIB_LIBS@,$ZLIB_LIBS,;t t
-s,@BZ2_CFLAGS@,$BZ2_CFLAGS,;t t
 s,@BZ2_LIBS@,$BZ2_LIBS,;t t
+s,@SELINUX_LIBS@,$SELINUX_LIBS,;t t
 s,@CURSES_LIBS@,$CURSES_LIBS,;t t
 s,@SSD_LIBS@,$SSD_LIBS,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
@@ -16509,27 +17220,21 @@ echo X"$mf" |
   else
     continue
   fi
-  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
   DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   # When using ansi2knr, U may be empty or an underscore; expand it
   U=`sed -n 's/^U = //p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
diff --git a/configure.ac b/configure.ac
index f1145f494..bc2f560e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.13.8], [debian-dpkg@lists.debian.org])
+AC_INIT([dpkg], [1.13.9], [debian-dpkg@lists.debian.org])
 AC_CONFIG_SRCDIR([lib/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -61,6 +61,7 @@ AC_SYS_LARGEFILE
 # Checks for libraries.
 DPKG_LIB_ZLIB
 DPKG_LIB_BZ2
+DPKG_LIB_SELINUX
 if test "x$build_dselect" = "xyes"; then
    DPKG_LIB_CURSES
 fi
diff --git a/debian/changelog b/debian/changelog
index 8201846ad..1876a491c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+dpkg (1.13.9) unstable; urgency=low
+  
+  The "On like Donkey Kong" Release.
+
+  * Only open the log file when we first need to write to it, this avoids
+    the need to suppress errors when not root which fakeroot defeated anyway.
+  * Stop dpkg-source clobbering an existing .orig directory during unpacking.
+    Closes: #21236.
+  * Allow an alternate output directory to be specified to dpkg-source by
+    giving a second argument to -x.  Closes: #246802, #282323.
+  * Added .arch-inventory to default diff ignore regexp.  Closes: #304297.
+
+  SELinux support (Manoj Srivastava):
+  * On SELinux-enabled systems, try to set the security context when the
+    package is unpacked.  Closes: #193653, #249496, #307139.
+  * Added build-dependancy on libselinux1-dev.
+
+  Improvements to dpkg-source (Brendan O'Dea):
+  * Support unpacking of "Wig And Pen" (Format 2.0) source packages.
+  * Multiple pristine upstream tarballs allowed.
+  * Native and upstream tarballs may be bzip2-compressed instead of gzip,
+    as may the debian diff or tarball.
+  * Unsupported format error fixed to output the unsupported format
+    rather than the supported one.  Closes: #156317.
+
+ -- Scott James Remnant <scott@netsplit.com>  Sun, 12 Jun 2005 15:52:43 +0100
+
 dpkg (1.13.8) experimental; urgency=low
   
   The "In like Flynn" Release.
diff --git a/debian/control b/debian/control
index 1eefe4b2d..f3f72616a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Scott James Remnant <scott@netsplit.com>
 Origin: debian
 Bugs: debbugs://bugs.debian.org
 Standards-Version: 3.6.1.0
-Build-Depends: debhelper (>= 4.1.81), libncurses5-dev | libncurses-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev
+Build-Depends: debhelper (>= 4.1.81), libncurses5-dev | libncurses-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, libselinux1-dev
 
 Package: dpkg
 Architecture: any
@@ -27,7 +27,7 @@ Section: utils
 Priority: standard
 Architecture: all
 Depends: dpkg (>= 1.13.1), perl5, perl-modules, cpio (>= 2.4.2-2), patch (>= 2.2-1), make, binutils
-Recommends: gcc | c-compiler
+Recommends: gcc | c-compiler, bzip2
 Suggests: gnupg, debian-keyring
 Conflicts: dpkgname
 Replaces: dpkgname, dpkg (<< 1.4.1.8), dpkg-doc-ja
diff --git a/debian/rules b/debian/rules
index cb9b41b01..bd1ec8cd9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,8 @@ build-tree/config.status: configure
 		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
 		--with-zlib=static \
-		--with-bz2=static
+		--with-bz2=static \
+		--with-selinux=static
 
 # Build the package in build-tree
 build: build-tree/build-stamp
diff --git a/depcomp b/depcomp
index 25bdb1889..11e2d3bfe 100755
--- a/depcomp
+++ b/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2004-04-25.13
+scriptversion=2004-05-31.23
 
 # Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 
@@ -43,6 +43,7 @@ Environment variables:
   depmode     Dependency tracking mode.
   source      Source file read by `PROGRAMS ARGS'.
   object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
   tmpdepfile  Temporary file to use when outputing dependencies.
   libtool     Whether libtool is used (yes/no).
@@ -61,18 +62,10 @@ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
 fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
-   dir=`echo "$object" | sed 's,/.*$,/,'`
-   if test "$dir" = "$object"; then
-      dir=
-   fi
-   # FIXME: should be _deps on DOS.
-   depfile="$dir.deps/$base"
-fi
 
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
@@ -295,9 +288,12 @@ tru64)
 
    if test "$libtool" = yes; then
       # Dependencies are output in .lo.d with libtool 1.4.
-      # They are output in .o.d with libtool 1.5.
+      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
+      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
+      # latter, because the former will be cleaned when $dir.libs is
+      # erased.
       tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir.libs/$base.o.d"
+      tmpdepfile2="$dir$base.o.d"
       tmpdepfile3="$dir.libs/$base.d"
       "$@" -Wc,-MD
    else
diff --git a/dpkg-deb/Makefile.am b/dpkg-deb/Makefile.am
index f2f8565d9..bde41483f 100644
--- a/dpkg-deb/Makefile.am
+++ b/dpkg-deb/Makefile.am
@@ -2,9 +2,7 @@
 
 localedir = $(datadir)/locale
 INCLUDES = \
-	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
-	-I$(top_srcdir)/lib \
-	$(ZLIB_CFLAGS) $(BZ2_CFLAGS)
+	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl -I$(top_srcdir)/lib
 
 
 bin_PROGRAMS = dpkg-deb
@@ -16,4 +14,5 @@ dpkg_deb_SOURCES = \
 	info.c \
 	main.c
 
-dpkg_deb_LDADD = $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS)
+dpkg_deb_LDADD = \
+	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
diff --git a/dpkg-deb/Makefile.in b/dpkg-deb/Makefile.in
index 5988adfe3..c1245a158 100644
--- a/dpkg-deb/Makefile.in
+++ b/dpkg-deb/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -74,12 +74,11 @@ am_dpkg_deb_OBJECTS = build.$(OBJEXT) extract.$(OBJEXT) info.$(OBJEXT) \
 dpkg_deb_OBJECTS = $(am_dpkg_deb_OBJECTS)
 am__DEPENDENCIES_1 =
 dpkg_deb_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/build.Po ./$(DEPDIR)/extract.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/info.Po ./$(DEPDIR)/main.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -99,7 +98,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -159,6 +157,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -171,7 +170,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -185,6 +183,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -219,9 +219,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 localedir = $(datadir)/locale
 INCLUDES = \
-	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
-	-I$(top_srcdir)/lib \
-	$(ZLIB_CFLAGS) $(BZ2_CFLAGS)
+	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl -I$(top_srcdir)/lib
 
 dpkg_deb_SOURCES = \
 	dpkg-deb.h \
@@ -230,7 +228,9 @@ dpkg_deb_SOURCES = \
 	info.c \
 	main.c
 
-dpkg_deb_LDADD = $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS)
+dpkg_deb_LDADD = \
+	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
+
 all: all-am
 
 .SUFFIXES:
@@ -306,16 +306,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
@@ -420,7 +418,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/dpkg-split/Makefile.in b/dpkg-split/Makefile.in
index 89dc012b9..cecd71cc9 100644
--- a/dpkg-split/Makefile.in
+++ b/dpkg-split/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -80,9 +80,6 @@ SCRIPTS = $(pkglib_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/info.Po ./$(DEPDIR)/join.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/queue.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/split.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -102,7 +99,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -162,6 +158,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -174,7 +171,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -188,6 +184,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -334,16 +332,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
@@ -449,7 +445,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/dselect/Makefile.in b/dselect/Makefile.in
index b39db09c0..0916933df 100644
--- a/dselect/Makefile.in
+++ b/dselect/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -83,16 +83,6 @@ dselect_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a \
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/basecmds.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/baselist.Po ./$(DEPDIR)/basetop.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/bindings.Po ./$(DEPDIR)/curkeys.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/helpmsgs.Po ./$(DEPDIR)/main.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/methkeys.Po ./$(DEPDIR)/methlist.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/method.Po ./$(DEPDIR)/methparse.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/pkgcmds.Po ./$(DEPDIR)/pkgdepcon.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/pkgdisplay.Po ./$(DEPDIR)/pkginfo.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/pkgkeys.Po ./$(DEPDIR)/pkglist.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/pkgsublist.Po ./$(DEPDIR)/pkgtop.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@@ -117,7 +107,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -177,6 +166,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -189,7 +179,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -203,6 +192,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -356,16 +347,14 @@ distclean-compile:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
@@ -471,7 +460,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/getopt/Makefile.in b/getopt/Makefile.in
index 96e42c03b..28d7f67f9 100644
--- a/getopt/Makefile.in
+++ b/getopt/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -76,9 +76,6 @@ libopt_a_OBJECTS = $(am_libopt_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/closeout.Po ./$(DEPDIR)/getopt.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/long-options.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/obstack.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -98,7 +95,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -158,6 +154,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -170,7 +167,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -184,6 +180,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -287,16 +285,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
@@ -398,7 +394,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/install-sh b/install-sh
index e4160c991..6ebe46de6 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2004-04-01.17
+scriptversion=2004-12-17.09
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -58,9 +58,6 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-transformbasename=
-transform_arg=
-instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
 chowncmd=
 chgrpcmd=
@@ -70,23 +67,27 @@ mvcmd="$mvprog"
 src=
 dst=
 dir_arg=
+dstarg=
+no_target_directory=
 
-usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 -d DIRECTORIES...
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
 
-In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
-In the second, create the directory path DIR.
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
 
 Options:
--b=TRANSFORMBASENAME
--c         copy source (using $cpprog) instead of moving (using $mvprog).
+-c         (ignored)
 -d         create directories instead of installing files.
--g GROUP   $chgrp installed files to GROUP.
--m MODE    $chmod installed files to MODE.
--o USER    $chown installed files to USER.
--s         strip installed files (using $stripprog).
--t=TRANSFORM
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
 --help     display this help and exit.
 --version  display version info and exit.
 
@@ -96,12 +97,7 @@ Environment variables override the default commands:
 
 while test -n "$1"; do
   case $1 in
-    -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-        shift
-        continue;;
-
-    -c) instcmd=$cpprog
-        shift
+    -c) shift
         continue;;
 
     -d) dir_arg=true
@@ -129,14 +125,20 @@ while test -n "$1"; do
         shift
         continue;;
 
-    -t=*) transformarg=`echo $1 | sed 's/-t=//'`
-        shift
-        continue;;
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
 
     --version) echo "$0 $scriptversion"; exit 0;;
 
     *)  # When -d is used, all remaining arguments are directories to create.
-	test -n "$dir_arg" && break
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
         # Otherwise, the last argument is the destination.  Remove it from $@.
 	for arg
 	do
@@ -174,13 +176,13 @@ do
     src=
 
     if test -d "$dst"; then
-      instcmd=:
+      mkdircmd=:
       chmodcmd=
     else
-      instcmd=$mkdirprog
+      mkdircmd=$mkdirprog
     fi
   else
-    # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
     if test ! -f "$src" && test ! -d "$src"; then
@@ -202,12 +204,16 @@ do
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
       dst=$dst/`basename "$src"`
     fi
   fi
 
   # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 
   # Make sure that the destination directory exists.
 
@@ -220,7 +226,8 @@ do
     oIFS=$IFS
     # Some sh's can't handle IFS=/ for some reason.
     IFS='%'
-    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
     IFS=$oIFS
 
     pathcomp=
@@ -229,51 +236,42 @@ do
       pathcomp=$pathcomp$1
       shift
       if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp" || lasterr=$?
+        $mkdirprog "$pathcomp"
 	# mkdir can fail with a `File exist' error in case several
 	# install-sh are creating the directory concurrently.  This
 	# is OK.
-	test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
+	test -d "$pathcomp" || exit
       fi
       pathcomp=$pathcomp/
     done
   fi
 
   if test -n "$dir_arg"; then
-    $doit $instcmd "$dst" \
+    $doit $mkdircmd "$dst" \
       && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
       && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
       && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
 
   else
-    # If we're going to rename the final executable, determine the name now.
-    if test -z "$transformarg"; then
-      dstfile=`basename "$dst"`
-    else
-      dstfile=`basename "$dst" $transformbasename \
-               | sed $transformarg`$transformbasename
-    fi
-
-    # don't allow the sed command to completely eliminate the filename.
-    test -z "$dstfile" && dstfile=`basename "$dst"`
+    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
     rmtmp=$dstdir/_rm.$$_
 
     # Trap to clean up those temp files at exit.
-    trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
     trap '(exit $?); exit' 1 2 13 15
 
-    # Move or copy the file name to the temp name
-    $doit $instcmd "$src" "$dsttmp" &&
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
     # If any of these fail, we abort the whole thing.  If we want to
     # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $instcmd $src $dsttmp" command.
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
     { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
@@ -298,7 +296,7 @@ do
 	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
 	       || {
 		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit
+		 (exit 1); exit 1
 	       }
 	     else
 	       :
@@ -309,12 +307,12 @@ do
 	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 	 }
     }
-  fi || { (exit 1); exit; }
+  fi || { (exit 1); exit 1; }
 done
 
 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
-  (exit 0); exit
+  (exit 0); exit 0
 }
 
 # Local variables:
diff --git a/intl/plural.c b/intl/plural.c
index ffa854e8f..72494f9eb 100644
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -1,84 +1,21 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
+/* A Bison parser, made from plural.y
+   by GNU bison 1.35.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#define YYBISON 1  /* Identify Bison output.  */
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
-#define YYPURE 1
-
-/* Using locations.  */
-#define YYLSP_NEEDED 0
-
-/* If NAME_PREFIX is specified substitute the variables and functions
-   names.  */
 #define yyparse __gettextparse
-#define yylex   __gettextlex
+#define yylex __gettextlex
 #define yyerror __gettexterror
-#define yylval  __gettextlval
-#define yychar  __gettextchar
+#define yylval __gettextlval
+#define yychar __gettextchar
 #define yydebug __gettextdebug
 #define yynerrs __gettextnerrs
+# define	EQUOP2	257
+# define	CMPOP2	258
+# define	ADDOP2	259
+# define	MULOP2	260
+# define	NUMBER	261
 
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     EQUOP2 = 258,
-     CMPOP2 = 259,
-     ADDOP2 = 260,
-     MULOP2 = 261,
-     NUMBER = 262
-   };
-#endif
-#define EQUOP2 258
-#define CMPOP2 259
-#define ADDOP2 260
-#define MULOP2 261
-#define NUMBER 262
-
-
-
-
-/* Copy the first part of user declarations.  */
 #line 1 "plural.y"
 
 /* Expression parsing for plural form selection.
@@ -125,37 +62,16 @@
 #define YYLEX_PARAM	&((struct parse_args *) arg)->cp
 #define YYPARSE_PARAM	arg
 
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
 #line 49 "plural.y"
-typedef union YYSTYPE {
+#ifndef YYSTYPE
+typedef union {
   unsigned long int num;
   enum operator op;
   struct expression *exp;
-} YYSTYPE;
-/* Line 191 of yacc.c.  */
-#line 151 "plural.c"
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+} yystype;
+# define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
-
-
-
-/* Copy the second part of user declarations.  */
 #line 55 "plural.y"
 
 /* Prototypes for local functions.  */
@@ -230,135 +146,21 @@ new_exp_3 (enum operator op, struct expression *bexp,
   return new_exp (3, op, args);
 }
 
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
 
 
-/* Line 214 of yacc.c.  */
-#line 237 "plural.c"
-
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
-
-# ifndef YYFREE
-#  define YYFREE free
-# endif
-# ifndef YYMALLOC
-#  define YYMALLOC malloc
-# endif
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   define YYSTACK_ALLOC alloca
-#  endif
-# else
-#  if defined (alloca) || defined (_ALLOCA_H)
-#   define YYSTACK_ALLOC alloca
-#  else
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
-#  endif
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-# endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
+#define	YYFINAL		27
+#define	YYFLAG		-32768
+#define	YYNTBASE	16
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
+#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
 
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  short int yyss;
-  YYSTYPE yyvs;
-  };
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
-      + YYSTACK_GAP_MAXIMUM)
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  register YYSIZE_T yyi;		\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (0)
-#  endif
-# endif
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (0)
-
-#endif
-
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short int yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL  9
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   54
-
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  16
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  3
-/* YYNRULES -- Number of rules. */
-#define YYNRULES  13
-/* YYNRULES -- Number of states. */
-#define YYNSTATES  27
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   262
-
-#define YYTRANSLATE(YYX) 						\
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char yytranslate[] =
+/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
+static const char yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -385,138 +187,252 @@ static const unsigned char yytranslate[] =
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     6,     7,
-       8,     9,    11
+       2,     2,     2,     2,     2,     2,     1,     6,     7,     8,
+       9,    11
 };
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const unsigned char yyprhs[] =
+static const short yyprhs[] =
 {
-       0,     0,     3,     5,    11,    15,    19,    23,    27,    31,
-      35,    38,    40,    42
+       0,     0,     2,     8,    12,    16,    20,    24,    28,    32,
+      35,    37,    39
 };
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yysigned_char yyrhs[] =
+static const short yyrhs[] =
 {
-      17,     0,    -1,    18,    -1,    18,     3,    18,    12,    18,
-      -1,    18,     4,    18,    -1,    18,     5,    18,    -1,    18,
-       6,    18,    -1,    18,     7,    18,    -1,    18,     8,    18,
-      -1,    18,     9,    18,    -1,    10,    18,    -1,    13,    -1,
-      11,    -1,    14,    18,    15,    -1
+      17,     0,    17,     3,    17,    12,    17,     0,    17,     4,
+      17,     0,    17,     5,    17,     0,    17,     6,    17,     0,
+      17,     7,    17,     0,    17,     8,    17,     0,    17,     9,
+      17,     0,    10,    17,     0,    13,     0,    11,     0,    14,
+      17,    15,     0
 };
 
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned char yyrline[] =
+#endif
+
+#if YYDEBUG
+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+static const short yyrline[] =
 {
-       0,   150,   150,   158,   162,   166,   170,   174,   178,   182,
-     186,   190,   194,   199
+       0,   150,   158,   162,   166,   170,   174,   178,   182,   186,
+     190,   194,   199
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+
+#if (YYDEBUG) || defined YYERROR_VERBOSE
+
+/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
-  "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
-  "$accept", "start", "exp", 0
+  "$", "error", "$undefined.", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2", 
+  "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'", 
+  "start", "exp", 0
 };
 #endif
 
-# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
-static const unsigned short int yytoknum[] =
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const short yyr1[] =
 {
-       0,   256,   257,    63,   124,    38,   258,   259,   260,   261,
-      33,   262,    58,   110,    40,    41
+       0,    16,    17,    17,    17,    17,    17,    17,    17,    17,
+      17,    17,    17
 };
-# endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+static const short yyr2[] =
 {
-       0,    16,    17,    18,    18,    18,    18,    18,    18,    18,
-      18,    18,    18,    18
+       0,     1,     5,     3,     3,     3,     3,     3,     3,     2,
+       1,     1,     3
 };
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const unsigned char yyr2[] =
+/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
+   doesn't specify something else to do.  Zero means the default is an
+   error. */
+static const short yydefact[] =
 {
-       0,     2,     1,     5,     3,     3,     3,     3,     3,     3,
-       2,     1,     1,     3
+       0,     0,    11,    10,     0,     1,     9,     0,     0,     0,
+       0,     0,     0,     0,     0,    12,     0,     3,     4,     5,
+       6,     7,     8,     0,     2,     0,     0,     0
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const unsigned char yydefact[] =
+static const short yydefgoto[] =
 {
-       0,     0,    12,    11,     0,     0,     2,    10,     0,     1,
-       0,     0,     0,     0,     0,     0,     0,    13,     0,     4,
-       5,     6,     7,     8,     9,     0,     3
+      25,     5
 };
 
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yysigned_char yydefgoto[] =
+static const short yypact[] =
 {
-      -1,     5,     6
+      -9,    -9,-32768,-32768,    -9,    34,-32768,    11,    -9,    -9,
+      -9,    -9,    -9,    -9,    -9,-32768,    24,    39,    43,    16,
+      26,    -3,-32768,    -9,    34,    21,    53,-32768
 };
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -10
-static const yysigned_char yypact[] =
+static const short yypgoto[] =
 {
-      -9,    -9,   -10,   -10,    -9,     8,    36,   -10,    13,   -10,
-      -9,    -9,    -9,    -9,    -9,    -9,    -9,   -10,    26,    41,
-      45,    18,    -2,    14,   -10,    -9,    36
+  -32768,    -1
 };
 
-/* YYPGOTO[NTERM-NUM].  */
-static const yysigned_char yypgoto[] =
-{
-     -10,   -10,    -1
-};
 
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -1
-static const unsigned char yytable[] =
+#define	YYLAST		53
+
+
+static const short yytable[] =
 {
-       7,     1,     2,     8,     3,     4,    15,    16,     9,    18,
-      19,    20,    21,    22,    23,    24,    10,    11,    12,    13,
-      14,    15,    16,    16,    26,    14,    15,    16,    17,    10,
-      11,    12,    13,    14,    15,    16,     0,     0,    25,    10,
-      11,    12,    13,    14,    15,    16,    12,    13,    14,    15,
-      16,    13,    14,    15,    16
+       6,     1,     2,     7,     3,     4,    14,    16,    17,    18,
+      19,    20,    21,    22,     8,     9,    10,    11,    12,    13,
+      14,    26,    24,    12,    13,    14,    15,     8,     9,    10,
+      11,    12,    13,    14,    13,    14,    23,     8,     9,    10,
+      11,    12,    13,    14,    10,    11,    12,    13,    14,    11,
+      12,    13,    14,    27
 };
 
-static const yysigned_char yycheck[] =
+static const short yycheck[] =
 {
-       1,    10,    11,     4,    13,    14,     8,     9,     0,    10,
-      11,    12,    13,    14,    15,    16,     3,     4,     5,     6,
-       7,     8,     9,     9,    25,     7,     8,     9,    15,     3,
-       4,     5,     6,     7,     8,     9,    -1,    -1,    12,     3,
-       4,     5,     6,     7,     8,     9,     5,     6,     7,     8,
-       9,     6,     7,     8,     9
+       1,    10,    11,     4,    13,    14,     9,     8,     9,    10,
+      11,    12,    13,    14,     3,     4,     5,     6,     7,     8,
+       9,     0,    23,     7,     8,     9,    15,     3,     4,     5,
+       6,     7,     8,     9,     8,     9,    12,     3,     4,     5,
+       6,     7,     8,     9,     5,     6,     7,     8,     9,     6,
+       7,     8,     9,     0
 };
+#define YYPURE 1
+
+/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
+#line 3 "/usr/local/share/bison/bison.simple"
+
+/* Skeleton output parser for bison,
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
+   Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* This is the parser code that is written into each bison parser when
+   the %semantic_parser declaration is not specified in the grammar.
+   It was written by Richard Stallman by simplifying the hairy parser
+   used when %semantic_parser is specified.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
+# else
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || defined (_ALLOCA_H)
+#    define YYSTACK_ALLOC alloca
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning. */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+# else
+#  if defined (__STDC__) || defined (__cplusplus)
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   define YYSIZE_T size_t
+#  endif
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
+# endif
+#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
+
+#if (! defined (yyoverflow) \
+     && (! defined (__cplusplus) \
+	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
 {
-       0,    10,    11,    13,    14,    17,    18,    18,    18,     0,
-       3,     4,     5,     6,     7,     8,     9,    15,    18,    18,
-      18,    18,    18,    18,    18,    12,    18
+  short yyss;
+  YYSTYPE yyvs;
+# if YYLSP_NEEDED
+  YYLTYPE yyls;
+# endif
 };
 
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# if YYLSP_NEEDED
+#  define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))	\
+      + 2 * YYSTACK_GAP_MAX)
+# else
+#  define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+      + YYSTACK_GAP_MAX)
+# endif
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  register YYSIZE_T yyi;		\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (0)
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX;	\
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (0)
+
+#endif
+
+
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
 #endif
@@ -535,35 +451,29 @@ static const unsigned char yystos[] =
 
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
+#define YYEMPTY		-2
 #define YYEOF		0
-
 #define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
+#define YYABORT 	goto yyabortlab
+#define YYERROR		goto yyerrlab1
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
-
 #define YYFAIL		goto yyerrlab
-
 #define YYRECOVERING()  (!!yyerrstatus)
-
 #define YYBACKUP(Token, Value)					\
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
+      yychar1 = YYTRANSLATE (yychar);				\
       YYPOPSTACK;						\
       goto yybackup;						\
     }								\
   else								\
     { 								\
-      yyerror ("syntax error: cannot back up");\
+      yyerror ("syntax error: cannot back up");			\
       YYERROR;							\
     }								\
 while (0)
@@ -571,24 +481,41 @@ while (0)
 #define YYTERROR	1
 #define YYERRCODE	256
 
+
 /* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
+   are run).
+
+   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
+   first token.  By default, to implement support for ranges, extend
+   its range to the last symbol.  */
 
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)		\
-   ((Current).first_line   = (Rhs)[1].first_line,	\
-    (Current).first_column = (Rhs)[1].first_column,	\
-    (Current).last_line    = (Rhs)[N].last_line,	\
-    (Current).last_column  = (Rhs)[N].last_column)
+# define YYLLOC_DEFAULT(Current, Rhs, N)       	\
+   Current.last_line   = Rhs[N].last_line;	\
+   Current.last_column = Rhs[N].last_column;
 #endif
 
+
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval)
-#endif
+#if YYPURE
+# if YYLSP_NEEDED
+#  ifdef YYLEX_PARAM
+#   define YYLEX		yylex (&yylval, &yylloc, YYLEX_PARAM)
+#  else
+#   define YYLEX		yylex (&yylval, &yylloc)
+#  endif
+# else /* !YYLSP_NEEDED */
+#  ifdef YYLEX_PARAM
+#   define YYLEX		yylex (&yylval, YYLEX_PARAM)
+#  else
+#   define YYLEX		yylex (&yylval)
+#  endif
+# endif /* !YYLSP_NEEDED */
+#else /* !YYPURE */
+# define YYLEX			yylex ()
+#endif /* !YYPURE */
+
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -603,93 +530,13 @@ do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
 } while (0)
-
-# define YYDSYMPRINT(Args)			\
-do {						\
-  if (yydebug)					\
-    yysymprint Args;				\
-} while (0)
-
-# define YYDSYMPRINTF(Title, Token, Value, Location)		\
-do {								\
-  if (yydebug)							\
-    {								\
-      YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr, 					\
-                  Token, Value);	\
-      YYFPRINTF (stderr, "\n");					\
-    }								\
-} while (0)
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_stack_print (short int *bottom, short int *top)
-#else
-static void
-yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
-#endif
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (/* Nothing. */; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
-  YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (0)
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_reduce_print (int yyrule)
-#else
-static void
-yy_reduce_print (yyrule)
-    int yyrule;
-#endif
-{
-  int yyi;
-  unsigned int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylno);
-  /* Print the symbols being reduced, and their result.  */
-  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
-}
-
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (Rule);		\
-} while (0)
-
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
 
-
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
 # define YYINITDEPTH 200
@@ -702,17 +549,15 @@ int yydebug;
    SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
+#if YYMAXDEPTH == 0
 # undef YYMAXDEPTH
 #endif
 
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
-
 
-
-#if YYERROR_VERBOSE
+#ifdef YYERROR_VERBOSE
 
 # ifndef yystrlen
 #  if defined (__GLIBC__) && defined (_STRING_H)
@@ -762,126 +607,78 @@ yystpcpy (yydest, yysrc)
 }
 #  endif
 # endif
-
-#endif /* !YYERROR_VERBOSE */
-
-
-
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-
-  if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-    }
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
-  switch (yytype)
-    {
-      default:
-        break;
-    }
-  YYFPRINTF (yyoutput, ")");
-}
-
-#endif /* ! YYDEBUG */
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yytype, yyvaluep)
-    int yytype;
-    YYSTYPE *yyvaluep;
 #endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-
-  switch (yytype)
-    {
-
-      default:
-        break;
-    }
-}
 
+#line 315 "/usr/local/share/bison/bison.simple"
+
 
-/* Prevent warnings from -Wmissing-prototypes.  */
+/* The user can define YYPARSE_PARAM as the name of an argument to be passed
+   into yyparse.  The argument should have type void *.
+   It should actually point to an object.
+   Grammar actions can access the variable by casting it
+   to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM
 # if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM);
+#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL
 # else
-int yyparse ();
+#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
 # endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#else /* !YYPARSE_PARAM */
+# define YYPARSE_PARAM_ARG
+# define YYPARSE_PARAM_DECL
+#endif /* !YYPARSE_PARAM */
+
+/* Prevent warning if -Wstrict-prototypes.  */
+#ifdef __GNUC__
+# ifdef YYPARSE_PARAM
+int yyparse (void *);
+# else
 int yyparse (void);
-#else
-int yyparse ();
+# endif
 #endif
-#endif /* ! YYPARSE_PARAM */
-
 
+/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
+   variables are global, or local to YYPARSE.  */
+
+#define YY_DECL_NON_LSP_VARIABLES			\
+/* The lookahead symbol.  */				\
+int yychar;						\
+							\
+/* The semantic value of the lookahead symbol. */	\
+YYSTYPE yylval;						\
+							\
+/* Number of parse errors so far.  */			\
+int yynerrs;
 
+#if YYLSP_NEEDED
+# define YY_DECL_VARIABLES			\
+YY_DECL_NON_LSP_VARIABLES			\
+						\
+/* Location data for the lookahead symbol.  */	\
+YYLTYPE yylloc;
+#else
+# define YY_DECL_VARIABLES			\
+YY_DECL_NON_LSP_VARIABLES
+#endif
 
 
+/* If nonreentrant, generate the variables here. */
 
-/*----------.
-| yyparse.  |
-`----------*/
+#if !YYPURE
+YY_DECL_VARIABLES
+#endif  /* !YYPURE */
 
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
 int
-yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
+yyparse (YYPARSE_PARAM_ARG)
+     YYPARSE_PARAM_DECL
 {
-  /* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
-
-/* Number of syntax errors so far.  */
-int yynerrs;
+  /* If reentrant, generate the variables here. */
+#if YYPURE
+  YY_DECL_VARIABLES
+#endif  /* !YYPURE */
 
   register int yystate;
   register int yyn;
@@ -889,7 +686,7 @@ int yynerrs;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
+  int yychar1 = 0;
 
   /* Three stacks and their tools:
      `yyss': related to states,
@@ -899,29 +696,41 @@ int yynerrs;
      Refer to the stacks thru separate pointers, to allow yyoverflow
      to reallocate them elsewhere.  */
 
-  /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  register short int *yyssp;
+  /* The state stack. */
+  short	yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
+  register short *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
   register YYSTYPE *yyvsp;
 
+#if YYLSP_NEEDED
+  /* The location stack.  */
+  YYLTYPE yylsa[YYINITDEPTH];
+  YYLTYPE *yyls = yylsa;
+  YYLTYPE *yylsp;
+#endif
 
-
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+#if YYLSP_NEEDED
+# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
+#else
+# define YYPOPSTACK   (yyvsp--, yyssp--)
+#endif
 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
+
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
-
+#if YYLSP_NEEDED
+  YYLTYPE yyloc;
+#endif
 
   /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
+     rule. */
   int yylen;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -938,8 +747,9 @@ int yynerrs;
 
   yyssp = yyss;
   yyvsp = yyvs;
-
-
+#if YYLSP_NEEDED
+  yylsp = yyls;
+#endif
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -954,7 +764,7 @@ int yynerrs;
  yysetstate:
   *yyssp = yystate;
 
-  if (yyss + yystacksize - 1 <= yyssp)
+  if (yyssp >= yyss + yystacksize - 1)
     {
       /* Get the current used size of the three stacks, in elements.  */
       YYSIZE_T yysize = yyssp - yyss + 1;
@@ -965,19 +775,26 @@ int yynerrs;
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
-
+	short *yyss1 = yyss;
 
 	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
+	   data in use in that stack, in bytes.  */
+# if YYLSP_NEEDED
+	YYLTYPE *yyls1 = yyls;
+	/* This used to be a conditional around just the two extra args,
+	   but that might be undefined if yyoverflow is a macro.  */
 	yyoverflow ("parser stack overflow",
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
-
+		    &yyls1, yysize * sizeof (*yylsp),
 		    &yystacksize);
-
+	yyls = yyls1;
+# else
+	yyoverflow ("parser stack overflow",
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+		    &yystacksize);
+# endif
 	yyss = yyss1;
 	yyvs = yyvs1;
       }
@@ -986,22 +803,24 @@ int yynerrs;
       goto yyoverflowlab;
 # else
       /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
+      if (yystacksize >= YYMAXDEPTH)
 	goto yyoverflowlab;
       yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
+      if (yystacksize > YYMAXDEPTH)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short int *yyss1 = yyss;
+	short *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyoverflowlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
-
-#  undef YYSTACK_RELOCATE
+# if YYLSP_NEEDED
+	YYSTACK_RELOCATE (yyls);
+# endif
+# undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
       }
@@ -1010,12 +829,14 @@ int yynerrs;
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
-
+#if YYLSP_NEEDED
+      yylsp = yyls + yysize - 1;
+#endif
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
-      if (yyss + yystacksize - 1 <= yyssp)
+      if (yyssp >= yyss + yystacksize - 1)
 	YYABORT;
     }
 
@@ -1023,6 +844,7 @@ int yynerrs;
 
   goto yybackup;
 
+
 /*-----------.
 | yybackup.  |
 `-----------*/
@@ -1035,55 +857,88 @@ yybackup:
   /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yyn == YYFLAG)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* yychar is either YYEMPTY or YYEOF
+     or a valid token in external form.  */
+
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
-  if (yychar <= YYEOF)
+  /* Convert token to internal form (in yychar1) for indexing tables with */
+
+  if (yychar <= 0)		/* This means end of input. */
     {
-      yychar = yytoken = YYEOF;
+      yychar1 = 0;
+      yychar = YYEOF;		/* Don't call YYLEX any more */
+
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      yytoken = YYTRANSLATE (yychar);
-      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+      yychar1 = YYTRANSLATE (yychar);
+
+#if YYDEBUG
+     /* We have to keep this `#if YYDEBUG', since we use variables
+	which are defined only if `YYDEBUG' is set.  */
+      if (yydebug)
+	{
+	  YYFPRINTF (stderr, "Next token is %d (%s",
+		     yychar, yytname[yychar1]);
+	  /* Give the individual parser a way to print the precise
+	     meaning of a token, for further debugging info.  */
+# ifdef YYPRINT
+	  YYPRINT (stderr, yychar, yylval);
+# endif
+	  YYFPRINTF (stderr, ")\n");
+	}
+#endif
     }
 
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+  yyn += yychar1;
+  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
     goto yydefault;
+
   yyn = yytable[yyn];
-  if (yyn <= 0)
+
+  /* yyn is what to do for this token type in this state.
+     Negative => reduce, -yyn is rule number.
+     Positive => shift, yyn is new state.
+       New state is final state => don't bother to shift,
+       just return success.
+     0, or most negative number => error.  */
+
+  if (yyn < 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
+      if (yyn == YYFLAG)
 	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
+  else if (yyn == 0)
+    goto yyerrlab;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
   /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
+	      yychar, yytname[yychar1]));
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
-
+#if YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
 
   /* Count tokens shifted since error; after three, turn off error
      status.  */
@@ -1114,118 +969,140 @@ yyreduce:
   /* If YYLEN is nonzero, implement the default value of the action:
      `$$ = $1'.
 
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
+     Otherwise, the following line sets YYVAL to the semantic value of
+     the lookahead token.  This behavior is undocumented and Bison
      users should not rely upon it.  Assigning to YYVAL
      unconditionally makes the parser a bit smaller, and it avoids a
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];
 
+#if YYLSP_NEEDED
+  /* Similarly for the default location.  Let the user run additional
+     commands if for instance locations are ranges.  */
+  yyloc = yylsp[1-yylen];
+  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+#endif
 
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
+#if YYDEBUG
+  /* We have to keep this `#if YYDEBUG', since we use variables which
+     are defined only if `YYDEBUG' is set.  */
+  if (yydebug)
     {
-        case 2:
+      int yyi;
+
+      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
+		 yyn, yyrline[yyn]);
+
+      /* Print the symbols being reduced, and their result.  */
+      for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
+	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+    }
+#endif
+
+  switch (yyn) {
+
+case 1:
 #line 151 "plural.y"
-    {
+{
 	    if (yyvsp[0].exp == NULL)
 	      YYABORT;
 	    ((struct parse_args *) arg)->res = yyvsp[0].exp;
 	  }
     break;
-
-  case 3:
+case 2:
 #line 159 "plural.y"
-    {
+{
 	    yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
-
-  case 4:
+case 3:
 #line 163 "plural.y"
-    {
+{
 	    yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
-
-  case 5:
+case 4:
 #line 167 "plural.y"
-    {
+{
 	    yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
-
-  case 6:
+case 5:
 #line 171 "plural.y"
-    {
+{
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
-
-  case 7:
+case 6:
 #line 175 "plural.y"
-    {
+{
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
-
-  case 8:
+case 7:
 #line 179 "plural.y"
-    {
+{
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
-
-  case 9:
+case 8:
 #line 183 "plural.y"
-    {
+{
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
-
-  case 10:
+case 9:
 #line 187 "plural.y"
-    {
+{
 	    yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
 	  }
     break;
-
-  case 11:
+case 10:
 #line 191 "plural.y"
-    {
+{
 	    yyval.exp = new_exp_0 (var);
 	  }
     break;
-
-  case 12:
+case 11:
 #line 195 "plural.y"
-    {
+{
 	    if ((yyval.exp = new_exp_0 (num)) != NULL)
 	      yyval.exp->val.num = yyvsp[0].num;
 	  }
     break;
-
-  case 13:
+case 12:
 #line 200 "plural.y"
-    {
+{
 	    yyval.exp = yyvsp[-1].exp;
 	  }
     break;
+}
 
+#line 705 "/usr/local/share/bison/bison.simple"
 
-    }
-
-/* Line 1010 of yacc.c.  */
-#line 1220 "plural.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
+#if YYLSP_NEEDED
+  yylsp -= yylen;
+#endif
 
-
-  YY_STACK_PRINT (yyss, yyssp);
+#if YYDEBUG
+  if (yydebug)
+    {
+      short *yyssp1 = yyss - 1;
+      YYFPRINTF (stderr, "state stack now");
+      while (yyssp1 != yyssp)
+	YYFPRINTF (stderr, " %d", *++yyssp1);
+      YYFPRINTF (stderr, "\n");
+    }
+#endif
 
   *++yyvsp = yyval;
-
+#if YYLSP_NEEDED
+  *++yylsp = yyloc;
+#endif
 
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
@@ -1233,11 +1110,11 @@ yyreduce:
 
   yyn = yyr1[yyn];
 
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
+  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
-    yystate = yydefgoto[yyn - YYNTOKENS];
+    yystate = yydefgoto[yyn - YYNTBASE];
 
   goto yynewstate;
 
@@ -1250,151 +1127,145 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if YYERROR_VERBOSE
+
+#ifdef YYERROR_VERBOSE
       yyn = yypact[yystate];
 
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
+      if (yyn > YYFLAG && yyn < YYLAST)
 	{
 	  YYSIZE_T yysize = 0;
-	  int yytype = YYTRANSLATE (yychar);
-	  const char* yyprefix;
 	  char *yymsg;
-	  int yyx;
+	  int yyx, yycount;
 
+	  yycount = 0;
 	  /* Start YYX at -YYN if negative to avoid negative indexes in
 	     YYCHECK.  */
-	  int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	  /* Stay within bounds of both yycheck and yytname.  */
-	  int yychecklim = YYLAST - yyn;
-	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yycount = 0;
-
-	  yyprefix = ", expecting ";
-	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      {
-		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
-		yycount += 1;
-		if (yycount == 5)
-		  {
-		    yysize = 0;
-		    break;
-		  }
-	      }
-	  yysize += (sizeof ("syntax error, unexpected ")
-		     + yystrlen (yytname[yytype]));
+	  for (yyx = yyn < 0 ? -yyn : 0;
+	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+	    if (yycheck[yyx + yyn] == yyx)
+	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+	  yysize += yystrlen ("parse error, unexpected ") + 1;
+	  yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
 	  yymsg = (char *) YYSTACK_ALLOC (yysize);
 	  if (yymsg != 0)
 	    {
-	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
+	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
+	      yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
 
 	      if (yycount < 5)
 		{
-		  yyprefix = ", expecting ";
-		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+		  yycount = 0;
+		  for (yyx = yyn < 0 ? -yyn : 0;
+		       yyx < (int) (sizeof (yytname) / sizeof (char *));
+		       yyx++)
+		    if (yycheck[yyx + yyn] == yyx)
 		      {
-			yyp = yystpcpy (yyp, yyprefix);
+			const char *yyq = ! yycount ? ", expecting " : " or ";
+			yyp = yystpcpy (yyp, yyq);
 			yyp = yystpcpy (yyp, yytname[yyx]);
-			yyprefix = " or ";
+			yycount++;
 		      }
 		}
 	      yyerror (yymsg);
 	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    yyerror ("syntax error; also virtual memory exhausted");
+	    yyerror ("parse error; also virtual memory exhausted");
 	}
       else
-#endif /* YYERROR_VERBOSE */
-	yyerror ("syntax error");
+#endif /* defined (YYERROR_VERBOSE) */
+	yyerror ("parse error");
     }
+  goto yyerrlab1;
 
 
-
+/*--------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action |
+`--------------------------------------------------*/
+yyerrlab1:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
-      if (yychar <= YYEOF)
-        {
-          /* If at end of input, pop the error token,
-	     then the rest of the stack, then return failure.  */
-	  if (yychar == YYEOF)
-	     for (;;)
-	       {
-		 YYPOPSTACK;
-		 if (yyssp == yyss)
-		   YYABORT;
-		 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-		 yydestruct (yystos[*yyssp], yyvsp);
-	       }
-        }
-      else
-	{
-	  YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-	  yydestruct (yytoken, &yylval);
-	  yychar = YYEMPTY;
-
-	}
+      /* return failure if at end of input */
+      if (yychar == YYEOF)
+	YYABORT;
+      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
+		  yychar, yytname[yychar1]));
+      yychar = YYEMPTY;
     }
 
   /* Else will try to reuse lookahead token after shifting the error
      token.  */
-  goto yyerrlab1;
 
+  yyerrstatus = 3;		/* Each real token shifted decrements this */
 
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
+  goto yyerrhandle;
 
-#ifdef __GNUC__
-  /* Pacify GCC when the user code never invokes YYERROR and the label
-     yyerrorlab therefore never appears in user code.  */
-  if (0)
-     goto yyerrorlab;
-#endif
 
-  yyvsp -= yylen;
-  yyssp -= yylen;
-  yystate = *yyssp;
-  goto yyerrlab1;
+/*-------------------------------------------------------------------.
+| yyerrdefault -- current state does not do anything special for the |
+| error token.                                                       |
+`-------------------------------------------------------------------*/
+yyerrdefault:
+#if 0
+  /* This is wrong; only states that explicitly want error tokens
+     should shift them.  */
+
+  /* If its default is to accept any token, ok.  Otherwise pop it.  */
+  yyn = yydefact[yystate];
+  if (yyn)
+    goto yydefault;
+#endif
 
 
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+/*---------------------------------------------------------------.
+| yyerrpop -- pop the current state because it cannot handle the |
+| error token                                                    |
+`---------------------------------------------------------------*/
+yyerrpop:
+  if (yyssp == yyss)
+    YYABORT;
+  yyvsp--;
+  yystate = *--yyssp;
+#if YYLSP_NEEDED
+  yylsp--;
+#endif
 
-  for (;;)
+#if YYDEBUG
+  if (yydebug)
     {
-      yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
+      short *yyssp1 = yyss - 1;
+      YYFPRINTF (stderr, "Error: state stack now");
+      while (yyssp1 != yyssp)
+	YYFPRINTF (stderr, " %d", *++yyssp1);
+      YYFPRINTF (stderr, "\n");
+    }
+#endif
 
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-	YYABORT;
+/*--------------.
+| yyerrhandle.  |
+`--------------*/
+yyerrhandle:
+  yyn = yypact[yystate];
+  if (yyn == YYFLAG)
+    goto yyerrdefault;
+
+  yyn += YYTERROR;
+  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
+    goto yyerrdefault;
 
-      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp);
-      YYPOPSTACK;
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
+  yyn = yytable[yyn];
+  if (yyn < 0)
+    {
+      if (yyn == YYFLAG)
+	goto yyerrpop;
+      yyn = -yyn;
+      goto yyreduce;
     }
+  else if (yyn == 0)
+    goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
@@ -1402,7 +1273,9 @@ yyerrlab1:
   YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
-
+#if YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
 
   yystate = yyn;
   goto yynewstate;
@@ -1422,15 +1295,13 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
+/*---------------------------------------------.
+| yyoverflowab -- parser overflow comes here.  |
+`---------------------------------------------*/
 yyoverflowlab:
   yyerror ("parser stack overflow");
   yyresult = 2;
   /* Fall through.  */
-#endif
 
 yyreturn:
 #ifndef yyoverflow
@@ -1439,8 +1310,6 @@ yyreturn:
 #endif
   return yyresult;
 }
-
-
 #line 205 "plural.y"
 
 
@@ -1619,4 +1488,3 @@ yyerror (const char *str)
 {
   /* Do nothing.  We don't print error messages here.  */
 }
-
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 44d088ec6..6981fc0fd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,8 +5,7 @@ pkgconfdir = $(sysconfdir)/@PACKAGE@
 INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
 	-DCONFIGDIR=\"$(pkgconfdir)\" \
-	-DCOPYINGFILE=\"$(datadir)/common-licenses/GPL-2\" \
-	$(ZLIB_CFLAGS) $(BZ2_CFLAGS)
+	-DCOPYINGFILE=\"$(datadir)/common-licenses/GPL-2\"
 
 
 noinst_LIBRARIES = libdpkg.a
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 67e624076..4f56dde4c 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -82,17 +82,6 @@ libdpkg_a_OBJECTS = $(am_libdpkg_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/compat.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/compression.Po ./$(DEPDIR)/database.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/dbmodify.Po ./$(DEPDIR)/dump.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ehandle.Po ./$(DEPDIR)/fields.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/lock.Po ./$(DEPDIR)/md5.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/mlib.Po ./$(DEPDIR)/myopt.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/nfmalloc.Po ./$(DEPDIR)/parse.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/parsehelp.Po ./$(DEPDIR)/showcright.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/showpkg.Po ./$(DEPDIR)/star.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/tarfn.Po ./$(DEPDIR)/utils.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/varbuf.Po ./$(DEPDIR)/vercmp.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -112,7 +101,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -172,6 +160,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -184,7 +173,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -198,6 +186,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -235,8 +225,7 @@ pkgconfdir = $(sysconfdir)/@PACKAGE@
 INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
 	-DCONFIGDIR=\"$(pkgconfdir)\" \
-	-DCOPYINGFILE=\"$(datadir)/common-licenses/GPL-2\" \
-	$(ZLIB_CFLAGS) $(BZ2_CFLAGS)
+	-DCOPYINGFILE=\"$(datadir)/common-licenses/GPL-2\"
 
 noinst_LIBRARIES = libdpkg.a
 libdpkg_a_SOURCES = \
@@ -339,16 +328,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
@@ -450,7 +437,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/lib/dbmodify.c b/lib/dbmodify.c
index a16767161..1ba694e7e 100644
--- a/lib/dbmodify.c
+++ b/lib/dbmodify.c
@@ -230,7 +230,6 @@ void modstatdb_shutdown(void) {
 }
 
 struct pipef *status_pipes= NULL;
-struct pipef *log_pipes= NULL;
 
 void modstatdb_note(struct pkginfo *pkg) {
   assert(cstatus >= msdbrw_write);
@@ -252,26 +251,9 @@ void modstatdb_note(struct pkginfo *pkg) {
       pipef= pipef->next;
     }
   }
-  if (log_pipes) {
-    static struct varbuf *log= NULL;
-    struct pipef *pipef= log_pipes;
-    char time_str[20];
-    time_t now;
-    int r;
-    if (log == NULL) {
-      log = nfmalloc(sizeof(struct varbuf));
-      varbufinit(log);
-    } else
-      varbufreset(log);
-    time(&now);
-    strftime(time_str, sizeof(time_str), "%Y-%m-%d %H:%M:%S", gmtime(&now));
-    r= varbufprintf(log, "%s status %s %s %s\n", time_str, statusinfos[pkg->status].name,
-		    pkg->name, versiondescribe(&pkg->installed.version, vdew_nonambig));
-    while (pipef) {
-      write(pipef->fd, log->buf, r);
-      pipef= pipef->next;
-    }
-  }
+  log_message("status %s %s %s", statusinfos[pkg->status].name, pkg->name,
+	      versiondescribe(&pkg->installed.version, vdew_nonambig));
+
   varbufreset(&uvb);
   varbufrecord(&uvb, pkg, &pkg->installed);
   if (fwrite(uvb.buf, 1, uvb.used, importanttmp) != uvb.used)
@@ -300,3 +282,41 @@ void modstatdb_note(struct pkginfo *pkg) {
 
   onerr_abort--;
 }
+
+const char *log_file= NULL;
+
+void log_message(const char *fmt, ...) {
+  static struct varbuf *log= NULL;
+  static FILE *logfd= NULL;
+  char time_str[20];
+  time_t now;
+  va_list al;
+
+  if (!log_file)
+    return;
+
+  if (!logfd) {
+    logfd= fopen(log_file, "a");
+    if (!logfd) {
+      fprintf(stderr, _("couldn't open log `%s': %s\n"), log_file,
+	      strerror(errno));
+      log_file= NULL;
+      return;
+    }
+  }
+
+  if (!log) {
+    log= nfmalloc(sizeof(struct varbuf));
+    varbufinit(log);
+  } else
+    varbufreset(log);
+
+  va_start(al,fmt);
+  varbufvprintf(log, fmt, al);
+  varbufaddc(log, 0);
+  va_end(al);
+
+  time(&now);
+  strftime(time_str, sizeof(time_str), "%Y-%m-%d %H:%M:%S", gmtime(&now));
+  fprintf(logfd, "%s %s\n", time_str, log->buf);
+}
diff --git a/lib/dpkg-db.h b/lib/dpkg-db.h
index 72c1f974f..6c512095c 100644
--- a/lib/dpkg-db.h
+++ b/lib/dpkg-db.h
@@ -164,7 +164,7 @@ struct pipef {
   int fd;
   struct pipef *next;
 };
-extern struct pipef *status_pipes, *log_pipes;
+extern struct pipef *status_pipes;
 
 enum modstatdb_rw modstatdb_init(const char *admindir, enum modstatdb_rw reqrwflags);
 void modstatdb_note(struct pkginfo *pkg);
@@ -172,6 +172,8 @@ void modstatdb_shutdown(void);
 
 extern char *statusfile, *availablefile; /* initialised by modstatdb_init */
 
+void log_message(const char *fmt, ...);
+
 /*** from database.c ***/
 
 struct pkginfo *findpackage(const char *name);
diff --git a/lib/myopt.c b/lib/myopt.c
index 56c8f9035..5aed2f337 100644
--- a/lib/myopt.c
+++ b/lib/myopt.c
@@ -75,7 +75,7 @@ void myfileopt(const char* fn, const struct cmdinfo* cmdinfos) {
     if (cip->takesvalue) {
       if (!opt) ohshite(_("configuration error: %s needs a value"), linebuf);
       if (cip->call) cip->call(cip,opt);
-      else *cip->sassignto= opt;
+      else *cip->sassignto= strdup(opt);
     } else {
       if (opt) ohshite(_("configuration error: %s does not take a value"), linebuf);
       if (cip->call) cip->call(cip,NULL);
diff --git a/lib/star.c b/lib/star.c
index a5f2cd646..9ca848bb2 100644
--- a/lib/star.c
+++ b/lib/star.c
@@ -11,6 +11,10 @@
 #include <errno.h>
 #include <string.h>
 #include <time.h>
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+static int selinux_enabled=-1;
+#endif
 
 static int
 Read(void * userData, char * buffer, int length)
@@ -68,6 +72,37 @@ ExtractFile(TarInfo * i)
 	/* fchown() and fchmod() are cheaper than chown() and chmod(). */
 	fchown(fd, i->UserID, i->GroupID);
 	fchmod(fd, i->Mode & ~S_IFMT);
+
+#ifdef WITH_SELINUX
+        /* Set selinux_enabled if it is not already set (singleton) */
+        if (selinux_enabled < 0)
+		selinux_enabled = (is_selinux_enabled() > 0);
+
+        /* Since selinux is enabled, try and set the context */
+        if (selinux_enabled == 1) {
+		security_context_t scontext = NULL;
+		/*
+		 * well, we could use
+		 *   void set_matchpathcon_printf(void (*f)(const char *fmt, ...));
+		 * to redirect the errors from the following bit, but that
+		 * seems too much effort.
+		 */
+
+		/*
+		 * Do nothing if we can't figure out what the context is,
+		 * or if it has no context; in which case the default
+		 * context shall be applied.
+		 */
+		if( ! ((matchpathcon(i->Name, i->Mode & ~S_IFMT, &scontext) != 0) ||
+		       (strcmp(scontext, "<<none>>") == 0)))
+		{
+			if(fsetfilecon(fd, scontext) < 0)
+				perror("Error setting file context:");
+		}
+		freecon(scontext);
+	}
+#endif /* WITH_SELINUX */
+
 	close(fd);
 	t.actime = time(0);
 	t.modtime = i->ModTime;
@@ -85,6 +120,37 @@ SetModes(TarInfo * i)
 	chown(i->Name, i->UserID, i->GroupID);
 #endif
 	chmod(i->Name, i->Mode & ~S_IFMT);
+
+#ifdef WITH_SELINUX
+        /* Set selinux_enabled if it is not already set (singleton) */
+        if (selinux_enabled < 0)
+		selinux_enabled = (is_selinux_enabled() > 0);
+
+        /* Since selinux is enabled, try and set the context */
+        if (selinux_enabled == 1) {
+		security_context_t scontext = NULL;
+		/*
+		 * well, we could use
+		 *   void set_matchpathcon_printf(void (*f)(const char *fmt, ...));
+		 * to redirect the errors from the following bit, but that
+		 * seems too much effort.
+		 */
+
+		/*
+		 * Do nothing if we can't figure out what the context is,
+		 * or if it has no context; in which case the default
+		 * context shall be applied.
+		 */
+		if( ! ((matchpathcon(i->Name, i->Mode & ~S_IFMT, &scontext) != 0) ||
+		       (strcmp(scontext, "<<none>>") == 0)))
+		{
+			if(lsetfilecon(i->Name, scontext) < 0)
+				perror("Error setting file context:");
+		}
+		freecon(scontext);
+	}
+#endif /* WITH_SELINUX */
+
 	t.actime = time(0);
 	t.modtime = i->ModTime;
 	utime(i->Name, &t);
diff --git a/m4/libs.m4 b/m4/libs.m4
index ccde235c3..23d5cc455 100644
--- a/m4/libs.m4
+++ b/m4/libs.m4
@@ -2,44 +2,92 @@
 # -------------
 # Check for zlib library.
 AC_DEFUN([DPKG_LIB_ZLIB],
-[AC_ARG_VAR([ZLIB_CFLAGS], [compiler flags for zlib library])dnl
-AC_ARG_VAR([ZLIB_LIBS], [linker flags for zlib library])dnl
+[AC_ARG_VAR([ZLIB_LIBS], [linker flags for zlib library])dnl
 AC_ARG_WITH(zlib,
 	AS_HELP_STRING([--with-zlib],
-		       [use zlib for compression and decompression (yes/static)]),
-[case "$with_zlib" in
-    yes)
-	ZLIB_CFLAGS="${ZLIB_CFLAGS:+$ZLIB_CFLAGS }-DWITH_ZLIB"
-	ZLIB_LIBS="${ZLIB_LIBS:+$ZLIB_LIBS }-lz"
-	;;
-    static)
-	ZLIB_CFLAGS="${ZLIB_CFLAGS:+$ZLIB_CFLAGS }-DWITH_ZLIB"
-	ZLIB_LIBS="${ZLIB_LIBS:+$ZLIB_LIBS }-Wl,-Bstatic -lz -Wl,-Bdynamic"
-	;;
-esac])
+		       [use zlib library for compression and decompression]))
+if test "x$with_zlib" != "xno"; then
+	AC_CHECK_LIB([z], [gzdopen],
+		[AC_DEFINE(WITH_ZLIB, 1,
+			[Define to 1 to use zlib rather than console tool])
+		 if test "x$with_zlib" = "xstatic"; then
+			dpkg_zlib_libs="-Wl,-Bstatic -lz -Wl,-Bdynamic"
+		 else
+			dpkg_zlib_libs="-lz"
+		 fi
+		 ZLIB_LIBS="${ZLIB_LIBS:+$ZLIB_LIBS }$dpkg_zlib_libs"
+		 with_zlib="yes"],
+		[if test -n "$with_zlib"; then
+			AC_MSG_FAILURE([zlib library not found])
+		 fi])
+
+	AC_CHECK_HEADER([zlib.h],,
+		[if test -n "$with_zlib"; then
+			AC_MSG_FAILURE([zlib header not found])
+		 fi])
+fi
 ])# DPKG_LIB_ZLIB
 
 # DPKG_LIB_BZ2
 # ------------
 # Check for bz2 library.
 AC_DEFUN([DPKG_LIB_BZ2],
-[AC_ARG_VAR([BZ2_CFLAGS], [compiler flags for bz2 library])dnl
-AC_ARG_VAR([BZ2_LIBS], [linker flags for bz2 library])dnl
+[AC_ARG_VAR([BZ2_LIBS], [linker flags for bz2 library])dnl
 AC_ARG_WITH(bz2,
 	AS_HELP_STRING([--with-bz2],
-		       [use bz2 library for compression and decompression (yes/static)]),
-[case "$with_bz2" in
-    yes)
-	BZ2_CFLAGS="${BZ2_CFLAGS:+$BZ2_CFLAGS }-DWITH_BZ2"
-	BZ2_LIBS="${BZ2_LIBS:+$BZ2_LIBS }-lbz2"
-	;;
-    static)
-	BZ2_CFLAGS="${BZ2_CFLAGS:+$BZ2_CFLAGS }-DWITH_BZ2"
-	BZ2_LIBS="${BZ2_LIBS:+$BZ2_LIBS }-Wl,-Bstatic -lbz2 -Wl,-Bdynamic"
-	;;
-esac])
+		       [use bz2 library for compression and decompression]))
+if test "x$with_bz2" != "xno"; then
+	AC_CHECK_LIB([bz2], [BZ2_bzdopen],
+		[AC_DEFINE(WITH_BZ2, 1,
+			[Define to 1 to use libbz2 rather than console tool])
+		 if test "x$with_bz2" = "xstatic"; then
+			dpkg_bz2_libs="-Wl,-Bstatic -lbz2 -Wl,-Bdynamic"
+		 else
+			dpkg_bz2_libs="-lbz2"
+		 fi
+		 BZ2_LIBS="${BZ2_LIBS:+$BZ2_LIBS }$dpkg_bz2_libs"
+		 with_bz2="yes"],
+		[if test -n "$with_bz2"; then
+			AC_MSG_FAILURE([bz2 library not found])
+		 fi])
+
+	AC_CHECK_HEADER([bzlib.h],,
+		[if test -n "$with_bz2"; then
+			AC_MSG_FAILURE([bz2 header not found])
+		 fi])
+fi
 ])# DPKG_LIB_BZ2
 
+# DPKG_LIB_SELINUX
+# ----------------
+# Check for selinux library.
+AC_DEFUN([DPKG_LIB_SELINUX],
+[AC_ARG_VAR([SELINUX_LIBS], [linker flags for selinux library])dnl
+AC_ARG_WITH(selinux,
+	AS_HELP_STRING([--with-selinux],
+		       [use selinux library to set security contexts]))
+if test "x$with_selinux" != "xno"; then
+	AC_CHECK_LIB([selinux], [is_selinux_enabled],
+		[AC_DEFINE(WITH_SELINUX, 1,
+			[Define to 1 to compile in SELinux supoprt])
+		 if test "x$with_selinux" = "xstatic"; then
+			dpkg_selinux_libs="-Wl,-Bstatic -lselinux -Wl,-Bdynamic"
+		 else
+			dpkg_selinux_libs="-lselinux"
+		 fi
+		 SELINUX_LIBS="${SELINUX_LIBS:+$SELINUX_LIBS }$dpkg_selinux_libs"
+		 with_selinux="yes"],
+		[if test -n "$with_selinux"; then
+			AC_MSG_FAILURE([selinux library not found])
+		 fi])
+
+	AC_CHECK_HEADER([selinux/selinux.h],,
+		[if test -n "$with_selinux"; then
+			AC_MSG_FAILURE([selinux header not found])
+		 fi])
+fi
+])# DPKG_LIB_SELINUX
+
 # DPKG_LIB_CURSES
 # ---------------
 # Check for curses library.
diff --git a/man/C/Makefile.in b/man/C/Makefile.in
index 785ed43e4..f66316228 100644
--- a/man/C/Makefile.in
+++ b/man/C/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -66,7 +66,8 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
+	"$(DESTDIR)$(man8dir)"
 man5dir = $(mandir)/man5
 man8dir = $(mandir)/man8
 NROFF = nroff
@@ -82,7 +83,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -142,6 +142,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -154,7 +155,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -168,6 +168,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -464,7 +466,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/man/C/dpkg-source.1 b/man/C/dpkg-source.1
index 8f79c112c..a3cefc206 100644
--- a/man/C/dpkg-source.1
+++ b/man/C/dpkg-source.1
@@ -7,6 +7,7 @@ dpkg\-buildpackage, dpkg\-distaddfile, dpkg\-parsechangelog
 .SH SYNOPSIS
 .B dpkg\-source
 .BI "\-x " filename .dsc
+.RI [ output-directory ]
 .br
 .B dpkg\-source \-b
 .RI [ options "] " directory " [" orig-directory | orig-targz |'']
@@ -252,9 +253,15 @@ are given with relative pathnames these are interpreted starting at
 the source tree's top level directory.
 .TP
 .B \-x
-Extract a source package.  One non-option argument should be supplied,
+Extract a source package.  One non-option argument must be supplied,
 the name of the Debian source control file
 .RB ( .dsc ).
+An optional second non-option argument may be supplied to specify the
+directory to extract the source package to, this must not exist.  If
+no output directory is specified, the source package is extracted into
+a directory named \fIsource\fR-\fIversion-\fR under the current working
+directory. 
+
 No options are useful with
 .BR "dpkg\-source \-x" .
 .B dpkg\-source
diff --git a/man/Makefile.in b/man/Makefile.in
index 07a9099b0..41e11afc0 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -84,7 +84,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -144,6 +143,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -156,7 +156,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -170,6 +169,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -384,15 +385,17 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -421,7 +424,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/man/de/Makefile.in b/man/de/Makefile.in
index e5dcc1e98..45752bc6b 100644
--- a/man/de/Makefile.in
+++ b/man/de/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -80,7 +80,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -140,6 +139,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -152,7 +152,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -166,6 +165,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -340,7 +341,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/man/es/Makefile.in b/man/es/Makefile.in
index 2d578feae..3b97f0482 100644
--- a/man/es/Makefile.in
+++ b/man/es/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -66,7 +66,8 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
+	"$(DESTDIR)$(man8dir)"
 man5dir = $(mandir)/man5
 man8dir = $(mandir)/man8
 NROFF = nroff
@@ -82,7 +83,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -142,6 +142,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -154,7 +155,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -168,6 +168,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -448,7 +450,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in
index a75f83bd0..a13b5829b 100644
--- a/man/fr/Makefile.in
+++ b/man/fr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -66,7 +66,8 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
+	"$(DESTDIR)$(man8dir)"
 man5dir = $(mandir)/man5
 man8dir = $(mandir)/man8
 NROFF = nroff
@@ -82,7 +83,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -142,6 +142,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -154,7 +155,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -168,6 +168,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -446,7 +448,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in
index 2dd725105..6b6cdad51 100644
--- a/man/ja/Makefile.in
+++ b/man/ja/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -66,7 +66,8 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
+	"$(DESTDIR)$(man8dir)"
 man5dir = $(mandir)/man5
 man8dir = $(mandir)/man8
 NROFF = nroff
@@ -82,7 +83,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -142,6 +142,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -154,7 +155,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -168,6 +168,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -450,7 +452,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/man/pt_BR/Makefile.in b/man/pt_BR/Makefile.in
index 80385d3ba..bfdff2965 100644
--- a/man/pt_BR/Makefile.in
+++ b/man/pt_BR/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -81,7 +81,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -141,6 +140,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -153,7 +153,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -167,6 +166,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -387,7 +388,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in
index 530787990..4a7c1c66a 100644
--- a/man/ru/Makefile.in
+++ b/man/ru/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -66,7 +66,8 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
+	"$(DESTDIR)$(man8dir)"
 man5dir = $(mandir)/man5
 man8dir = $(mandir)/man8
 NROFF = nroff
@@ -82,7 +83,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -142,6 +142,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -154,7 +155,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -168,6 +168,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -435,7 +437,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/man/sv/Makefile.in b/man/sv/Makefile.in
index 70997ec15..879d0b132 100644
--- a/man/sv/Makefile.in
+++ b/man/sv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -66,7 +66,8 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
+	"$(DESTDIR)$(man8dir)"
 man5dir = $(mandir)/man5
 man8dir = $(mandir)/man8
 NROFF = nroff
@@ -82,7 +83,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -142,6 +142,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -154,7 +155,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -168,6 +168,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -442,7 +444,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/methods/Makefile.in b/methods/Makefile.in
index dbb42342d..c1b22e20c 100644
--- a/methods/Makefile.in
+++ b/methods/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -66,6 +66,12 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(methodsdir)" "$(DESTDIR)$(methodsdir)"
 nobase_dist_methodsSCRIPT_INSTALL = $(install_sh_SCRIPT)
 SCRIPTS = $(nobase_dist_methods_SCRIPTS)
@@ -84,7 +90,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -144,6 +149,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -156,7 +162,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -170,6 +175,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -255,11 +262,9 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 install-nobase_dist_methodsSCRIPTS: $(nobase_dist_methods_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(methodsdir)" || $(mkdir_p) "$(DESTDIR)$(methodsdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@$(am__vpath_adj_setup) \
 	list='$(nobase_dist_methods_SCRIPTS)'; for p in $$list; do \
-	  case $$p in \
-	    $(srcdir)/*) p=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
+	  $(am__vpath_adj) p=$$f; \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
@@ -271,11 +276,9 @@ install-nobase_dist_methodsSCRIPTS: $(nobase_dist_methods_SCRIPTS)
 
 uninstall-nobase_dist_methodsSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@$(am__vpath_adj_setup) \
 	list='$(nobase_dist_methods_SCRIPTS)'; for p in $$list; do \
-	  case $$p in \
-	    $(srcdir)/*) p=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
+	  $(am__vpath_adj) p=$$f; \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
 	  f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
 	  echo " rm -f '$(DESTDIR)$(methodsdir)/$$f'"; \
@@ -285,25 +288,19 @@ uninstall-info-am:
 install-nobase_dist_methodsDATA: $(nobase_dist_methods_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(methodsdir)" || $(mkdir_p) "$(DESTDIR)$(methodsdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@$(am__vpath_adj_setup) \
 	list='$(nobase_dist_methods_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  case $$p in \
-	    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-	    *) f=$$p;; \
-	  esac; \
+	  $(am__vpath_adj) \
 	  echo " $(nobase_dist_methodsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(methodsdir)/$$f'"; \
 	  $(nobase_dist_methodsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(methodsdir)/$$f"; \
 	done
 
 uninstall-nobase_dist_methodsDATA:
 	@$(NORMAL_UNINSTALL)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@$(am__vpath_adj_setup) \
 	list='$(nobase_dist_methods_DATA)'; for p in $$list; do \
-	  case $$p in \
-	    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-	    *) f=$$p;; \
-	  esac; \
+	  $(am__vpath_adj) \
 	  echo " rm -f '$(DESTDIR)$(methodsdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(methodsdir)/$$f"; \
 	done
@@ -368,7 +365,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/missing b/missing
index e7ef83a1c..64b5f901d 100755
--- a/missing
+++ b/missing
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2003-09-02.23
+scriptversion=2004-09-07.08
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
@@ -60,11 +60,6 @@ case "$1" in
     msg="probably too old"
   fi
   ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
 
   -h|--h|--he|--hel|--help)
     echo "\
@@ -92,10 +87,12 @@ Supported PROGRAM values:
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Send bug reports to <bug-automake@gnu.org>."
+    exit 0
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
     echo "missing $scriptversion (GNU Automake)"
+    exit 0
     ;;
 
   -*)
@@ -104,12 +101,42 @@ Send bug reports to <bug-automake@gnu.org>."
     exit 1
     ;;
 
-  aclocal*)
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
        exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
     fi
+    ;;
+esac
 
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+  aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
@@ -119,11 +146,6 @@ WARNING: \`$1' is $msg.  You should only need it if
     ;;
 
   autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
@@ -133,11 +155,6 @@ WARNING: \`$1' is $msg.  You should only need it if
     ;;
 
   autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
@@ -157,11 +174,6 @@ WARNING: \`$1' is $msg.  You should only need it if
     ;;
 
   automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
@@ -173,11 +185,6 @@ WARNING: \`$1' is $msg.  You should only need it if
     ;;
 
   autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
          You might have modified some files without having the
@@ -254,11 +261,6 @@ WARNING: \`$1' is $msg.  You should only need it if
     ;;
 
   help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
@@ -279,11 +281,6 @@ WARNING: \`$1' is $msg.  You should only need it if
     ;;
 
   makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -301,10 +298,6 @@ WARNING: \`$1' is $msg.  You should only need it if
 
   tar)
     shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
 
     # We have already tried tar in the generic part.
     # Look for gnutar/gtar before invocation to avoid ugly error
diff --git a/origins/Makefile.in b/origins/Makefile.in
index 14f53905c..8096d3bd8 100644
--- a/origins/Makefile.in
+++ b/origins/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -66,6 +66,12 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(originsdir)"
 dist_originsDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_origins_DATA)
@@ -80,7 +86,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -140,6 +145,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -152,7 +158,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -166,6 +171,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -239,7 +246,7 @@ install-dist_originsDATA: $(dist_origins_DATA)
 	test -z "$(originsdir)" || $(mkdir_p) "$(DESTDIR)$(originsdir)"
 	@list='$(dist_origins_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " $(dist_originsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(originsdir)/$$f'"; \
 	  $(dist_originsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(originsdir)/$$f"; \
 	done
@@ -247,7 +254,7 @@ install-dist_originsDATA: $(dist_origins_DATA)
 uninstall-dist_originsDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_origins_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(originsdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(originsdir)/$$f"; \
 	done
@@ -311,7 +318,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/po/bs.gmo b/po/bs.gmo
index edd59323e..b5c07d049 100644
--- a/po/bs.gmo
+++ b/po/bs.gmo
diff --git a/po/bs.po b/po/bs.po
index e46bfe7bc..72721ba5c 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2004-11-27 01:29+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -201,36 +201,41 @@ msgstr ""
 msgid "failed to remove my own update file %.255s"
 msgstr ""
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr ""
 
+#: lib/dbmodify.c:301
+#, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr ""
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2134,12 +2139,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: src/main.c:295
-#, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr ""
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2180,47 +2180,47 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr ""
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr ""
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr ""
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr ""
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr ""
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr ""
diff --git a/po/ca.gmo b/po/ca.gmo
index f5b485fae..55dba4730 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index c220481b4..50f257c54 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.25\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-09 19:53+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -209,36 +209,41 @@ msgstr ""
 msgid "failed to remove my own update file %.255s"
 msgstr "no s'ha pogut esborrar el nostre propi fitxer d'actualització %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "no es pot escriure l'estat d'actualització de «%.250s»"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "no es pot fer «flush» amb l'estat d'actualització de «%.250s»"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "no es pot truncar l'estat actualitzat de «%.250s»"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "no es pot fer «fsync» en l'estat d'actualització de «%.250s»"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "no es pot tancar l'estat d'actualització de «%.250s»"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "no es pot instal·lar l'estat actualització de «%.250s»"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "no es pot obrir el fitxer de depuració «%.255s»\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2438,12 +2443,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "enter invàlid per a --%s: «%.250s»"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "no es pot obrir el fitxer de depuració «%.255s»\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2533,47 +2533,47 @@ msgstr ""
 "seriosament la instal·lació. Les opcions de forçat marcades amb [*] estan\n"
 "activades per defecte.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opció force/refuse desconeguda «%.*s»"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "no s'ha pogut fer «malloc» en execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "no s'ha pogut fer «strdup» en execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "no s'ha pogut executar %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd accepta 1 argument, no 0"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd només accepta 1 argument"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "número invàlid per a --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "no s'ha pogut obrir «%i» per a un flux"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperat abans de la fí de la línia %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "es necessita una opció d'acció"
diff --git a/po/cs.gmo b/po/cs.gmo
index aa84826b6..63a54de5d 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 2673a148f..42c50487e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-01 16:47+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <provoz@debian.cz>\n"
@@ -207,36 +207,41 @@ msgstr "operace po¾aduje zápisová práva do stavové oblasti dpkg"
 msgid "failed to remove my own update file %.255s"
 msgstr "nemohu odstranit svùj vlastní soubor s aktualizacemi %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "nelze zapsat zmìnìný stav balíku `%.250s'"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "nemohu vyprázdnit aktualizovaný stav `%.250s'"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "nelze zkrátit pro aktualizovaný stav `%.250s'"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "nelze synchronizovat aktualizovaný stav `%.250s'"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "nelze uzavøít zmìnìný stav balíku `%.250s'"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "nelze nainstalovat zmìnìný stav balíku `%.250s'"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "nepodaøilo se otevøít ladící soubor `%.255s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2349,12 +2354,7 @@ msgstr "--ignore-depends potøebuje platné jméno balíku, co¾ `%250s' není; %s"
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "neplatné èíslo pro --%s: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "nepodaøilo se otevøít ladící soubor `%.255s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2435,47 +2435,47 @@ msgstr ""
 "VAROVÁNÍ - pou¾ití oznaèených [!] pøepínaèù mù¾e vá¾nì po¹kodit instalaci.\n"
 "Implicitnì zapnuté donucovací volby jsou oznaèeny [*].\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "neznámá force/refuse volba `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "nelze provést malloc() v execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "nelze provést strdup v execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "nelze spustit %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd vy¾aduje jeden parametr"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd vy¾aduje pouze jeden parametr"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "neplatné èíslo pro --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nelze otevøít `%i' pro proud"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "neoèekávaný konec souboru pøed koncem øádku %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "potøebuji zadat akci"
diff --git a/po/da.gmo b/po/da.gmo
index 0d863605f..6af79daf1 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 2abc98d80..d3190c8b1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_1.10.19_da\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-01 22:10+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -208,36 +208,41 @@ msgstr "handling kræver læse/skriveadgang til dpkg-statusområdet"
 msgid "failed to remove my own update file %.255s"
 msgstr "kunne ikke fjerne min egen opdateringsfil %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "kunne ikke skrive opdateret status for '%.250s'"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "kunne ikke tømme opdateret status for '%.250s'"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "kunne ikke klippe for opdateret status for '%.250s'"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "kunne ikke synkronisere opdateret status for '%.250s'"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "kunne ikke lukke opdateret status for '%.250s'"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "kunne ikke installere opdateret status for '%.250s'"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "kunne ikke åbne aflusningsfil '%.255s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2366,12 +2371,7 @@ msgstr "--ignore-depends kræver et gyldigt pakkenavn. Det er '%.250s' ikke; %s"
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ugyldigt heltal for --%s: '%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "kunne ikke åbne aflusningsfil '%.255s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2452,47 +2452,47 @@ msgstr ""
 "alvorligt.\n"
 "Gennemtvingsningstilvalg mærket [*] er aktiveret som standard.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukendt gennemtvingnings/afvisnings-tilvalg '%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "kunne ikke udføre 'malloc' i execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "kunne ikke udføre 'strdup' i execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "kunne ikke eksekvere %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd tager 1 parameter, ikke 0"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd tager kun 1 parameter"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "ugyldigt tal for  --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "kunne ikke åbne '%i' for strøm"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "uventet slut-på-fil før afslutningen af linje %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "kræver et handlings-tilvalg"
diff --git a/po/de.gmo b/po/de.gmo
index 63fdbc1b9..b78e7ab4a 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index f8ebd6f49..4e3caaa15 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.10.26\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-03 11:24 +0100\n"
 "Last-Translator: Michael Piefel <piefel@debian.org>\n"
 "Language-Team: German <de@debian-l10n-german@lists.debian.org>\n"
@@ -209,36 +209,41 @@ msgstr "Operation braucht Lese/Schreibrechte für den Statusbereich von dpkg"
 msgid "failed to remove my own update file %.255s"
 msgstr "konnte meine eigene Update-Datei %.255s nicht löschen"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "kann den erneuerten Status von »%.250s« nicht schreiben"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "kann den erneuerten Status von »%.250s« nicht leeren"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "kann für erneuerten Status von »%.250s« nicht abschneiden"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "kann kein fsync durchführen für erneuerten Status von »%.250s«"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "kann den erneuerten Status von »%.250s« nicht schließen"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "kann den erneuerten Status von »%.250s« nicht installieren"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "konnte Debug-Datei »%.255s« nicht öffnen\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2381,12 +2386,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ungültige Zahl für --%s: »%.250s«"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "konnte Debug-Datei »%.255s« nicht öffnen\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2476,48 +2476,48 @@ msgstr ""
 "schwer\n"
 "beschädigen. Optionen markierten mit [*] sind per Vorgabe angestellt.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "unbekannte force/refuse-Option »%.*s«"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "konnte kein malloc durchführen in execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "konnte kein strdup durchführen in execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "konnte %s nicht ausführen"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd nimmt 1 Argument, nicht 0"
 
 #
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd nimmt nur 1 Argument"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "ungültige Zahl für --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "konnte »%i« nicht für Stream öffnen"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "unerwartetes Dateiende vor Ende der Zeile %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "brauche eine Aktions-Option"
diff --git a/po/dpkg.pot b/po/dpkg.pot
index 7371358eb..1406bf389 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -202,36 +202,41 @@ msgstr ""
 msgid "failed to remove my own update file %.255s"
 msgstr ""
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr ""
 
+#: lib/dbmodify.c:301
+#, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr ""
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2131,12 +2136,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: src/main.c:295
-#, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr ""
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2177,47 +2177,47 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr ""
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr ""
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr ""
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr ""
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr ""
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr ""
diff --git a/po/el.gmo b/po/el.gmo
index 4d64f1976..a9b72a57d 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index 9c3659d2a..912a5076e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_1_13_po_el\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-02-20 14:49EEST\n"
 "Last-Translator: Greek Translation Team <debian-l10n-greek@lists.debian."
 "org>\n"
@@ -220,37 +220,42 @@ msgstr ""
 msgid "failed to remove my own update file %.255s"
 msgstr "αποτυχία αφαί�εσης το δικό μου ενημε�ωτικό α�χείο %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "αδυναμία εγγ�αφής της ενημε�ωμένης κατάστασης του `%.250s'"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "αδυναμία καθα�ισμο� της ενημε�ωμένης κατάστασης του `%.250s'"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "αδ�νατος ο ψαλιδισμός της ανανεωμένης κατάστασης του `%.250s'"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr ""
 "αδ�νατος ο συγχ�ονισμός (fsync) της ανανεωμένης κατάστασης του `%.250s'"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "αδυναμία κλεισίματος της ενημε�ωμένης κατάστασης του `%.250s'"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "αδ�νατη η εγκατάσταση της ενημε�ωμένης κατάστασης του `%.250s'"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "αδ�νατο το άνοιγμα του α�χείου debug `%.255s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2408,12 +2413,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "μη έγκυ�ος ακέ�αιος για --%s: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "αδ�νατο το άνοιγμα του α�χείου debug `%.255s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2498,47 +2498,47 @@ msgstr ""
 "για το σ�στημά σας. Ο εξαναγκασμός των επιλογών με σήμανση [*] είναι εξ'\n"
 "ο�ισμο� ενε�γοποιημένος.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "άγνωστη επιλογή force/refuse `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "αδ�νατη η δέσμευση μνήμης με τη malloc στο execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "αδ�νατη η αντιγ�αφή συμβολοσει�άς με τη strdup στο execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "αδ�νατη η εκτέλεση του %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "η --command-fd παί�νει 1 ό�ισμα, όχι 0"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd παί�νει μόνο 1 ό�ισμα"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "μη έγκυ�ος α�ιθμός για το --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "αδ�νατο το άνοιγμα του `%i' ως �οή (stream)"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "απ�όσμενο eof π�ιν το τέλος της γ�αμμής %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "χ�ειάζεται μια επιλογή ενέ�γειας"
diff --git a/po/es.gmo b/po/es.gmo
index 84ea39d77..d067405de 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 45ced22a7..2da05d5e7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.10.18\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2004-12-31 12:07+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -214,36 +214,41 @@ msgstr ""
 msgid "failed to remove my own update file %.255s"
 msgstr "fallo al borrar mi propio fichero de actualización %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "no se puede escribir el estado actualizado de `%.250s'"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "no se puede efectuar `flush' con el estado actualizado de `%.250s'"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "no se puede truncar el estado actualizado de `%.250s'"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "no se puede efectuar `fsync' en el estado actualizado de `%.250s'"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "no se puede cerrar el estado actualizado de `%.250s'"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "no se puede instalar el estado actualizado de `%.250s'"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "no se puede abrir el fichero de depuración `%.255s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2485,12 +2490,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "entero inválido para --%s: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "no se puede abrir el fichero de depuración `%.255s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2583,47 +2583,47 @@ msgstr ""
 "la instalación. Las opciones de forzado marcadas con [*] están activadas\n"
 "por omisión.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opción force/refuse desconocida `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "no se pudo ejecutar malloc en execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "no se pudo ejecutar strdup en execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "fallo al ejecutar %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd toma 1 argumento, no 0"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd sólo toma 1 argumento"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "número inválido para --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "no se pudo abrir `%i' para un flujo"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes del fin de la línea %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "se necesita una opción de acción"
diff --git a/po/eu.gmo b/po/eu.gmo
index 09ff244c5..4a250ded3 100644
--- a/po/eu.gmo
+++ b/po/eu.gmo
diff --git a/po/eu.po b/po/eu.po
index 79a5c7ad9..d29fd97fb 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-eu\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-09 20:49+0100\n"
 "Last-Translator: Piarres Beobide  <pi@beobide.net>\n"
 "Language-Team: Librezale.org <librezale@librezale.org>\n"
@@ -210,36 +210,41 @@ msgstr ""
 msgid "failed to remove my own update file %.255s"
 msgstr "Ezin izan dut nire eguneraketa fitxategia ezabatu %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "Ezin izan da `%.250s'-ren eguneratutako egoera idatzi"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "Ezin izan da `%.250s'-ren eguneratutako egoera bultzatu"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "Ezin izan da `%.250s'-ren eguneratutako egoera hartu"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "Ezin izan da `%.250s'-ren eguneratutako egoera sinkronizatu"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "Ezin izan da `%.250s'-ren eguneratutako egoera itxi"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "Ezin izan da `%.250s'-ren eguneratutako egoera instalatu"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "ezin da `%.255s' arazpen fitxategia ireki\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2417,12 +2422,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s-rentzat zenbaki oso baliogabea: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "ezin da `%.255s' arazpen fitxategia ireki\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2502,47 +2502,47 @@ msgstr ""
 "liteke.\n"
 "[*] markaturik dauden indartze aukerak lehenetsirik daude.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "indartze/debekatze aukera ezezaguna: `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "ezin da execbackend-en malloc egin"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "ezin da execbackend-en strdup egin"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "huts %s exekutatzean"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd argumentu bat behar du, ez 0"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd-ek bakarrik argumentu bat onartzen du"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "--command-fd -rentzat zenbaki baliogabea"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "Ezin da korrontearentzat '%i? ireki"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "ezuzteko fitxategi amaiera %d lerro amaiaeran"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "ekintza aukera bat behar da"
diff --git a/po/fr.gmo b/po/fr.gmo
index 7f648a64f..08d96ba01 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 2eba40cf8..6c77ef8ed 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.6.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-03-30 08:43+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -265,36 +265,41 @@ msgstr ""
 msgid "failed to remove my own update file %.255s"
 msgstr "échec de la suppression de mon propre fichier de mise à jour %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "impossible d'écrire le nouvel état de « %.250s »"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "impossible d'éliminer le nouvel état de « %.250s »"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "impossible de tronquer le nouvel état de « %.250s »"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "impossible de synchroniser le nouvel état de « %.250s »"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "impossible de fermer le nouvel état de « %.250s »"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "impossible d'installer le nouvel état de « %.250s »"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "impossible d'ouvrir le fichier de journal « %s »"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2524,12 +2529,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "entier incorrect pour --%s « %.250s »"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "impossible d'ouvrir le fichier de journal « %s »"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2621,47 +2621,47 @@ msgstr ""
 "           installation.\n"
 "Les options de forçage marquées [*] sont activées par défaut.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "option de forçage/refus « %.*s » inconnue"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "Impossible de faire un « malloc » dans « execbackend »"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "Impossible de faire un « strdup » dans « execbackend »"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "échec de l'exécution de « %s »"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd prend un argument et non zéro"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd ne prend qu'un argument"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "nombre invalide pour --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "impossible d'ouvrir le flux d'entrée « %i »"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "EOF inattendu avant la fin de la ligne %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "requiert une option d'action"
diff --git a/po/gl.gmo b/po/gl.gmo
index a15b37465..996b94319 100644
--- a/po/gl.gmo
+++ b/po/gl.gmo
diff --git a/po/gl.po b/po/gl.po
index ca10c075c..f89a81f8c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-02-05 13:10+0100\n"
 "Last-Translator: Héctor Fernández López <trorrr@yahoo.es>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -208,36 +208,41 @@ msgstr ""
 msgid "failed to remove my own update file %.255s"
 msgstr "erro ó borrar o ficheiro de actualización propio %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "non se puido escribir o estado actualizado de `%.250s'"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "non se puido facer `flush' do estado actualizado de `%.250s'"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "non se puido truncar para o estado actualizado de `%.250s'"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "non se puido facer `fsync' do estado actualizado de `%.250s'"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "non se puido pechar o estado actualizado de `%.250s'"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "non se puido instalar o estado actualizado de `%.250s'"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "non se puido abrir o ficheiro de depurado `%.255s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2390,13 +2395,8 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "enteiro incorrecto para --%s: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "non se puido abrir o ficheiro de depurado `%.255s'\n"
-
 #  `incidental' -> tomei a traducción da versión castelá

-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2475,47 +2475,47 @@ msgstr ""
 "instalación. As opcións de forzado marcadas con [*] están activadas\n"
 "por defecto.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opción force/refuse descoñecida `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "non se puido facer malloc en execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "non se puido facer strdup en execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "erro ó executar %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd leva 1 argumento, non 0"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd só leva 1 argumento"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "número non válido para --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "non se puido abrir `%i' en modo fluxo"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes do fin da liña %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "é necesaria unha opción de acción"
diff --git a/po/he.gmo b/po/he.gmo
index 2640fd7f7..cd56db962 100644
--- a/po/he.gmo
+++ b/po/he.gmo
diff --git a/po/he.po b/po/he.po
index c482976cc..0fd9fd320 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2004-10-07 03:01+0200\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: English <en@li.org>\n"
@@ -202,36 +202,41 @@ msgstr ""
 msgid "failed to remove my own update file %.255s"
 msgstr ""
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr ""
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr ""
 
+#: lib/dbmodify.c:301
+#, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr ""
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2131,12 +2136,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: src/main.c:295
-#, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr ""
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2177,47 +2177,47 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr ""
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr ""
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr ""
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr ""
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr ""
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr ""
diff --git a/po/id.gmo b/po/id.gmo
index d8320da1e..5f3e45048 100644
--- a/po/id.gmo
+++ b/po/id.gmo
diff --git a/po/id.po b/po/id.po
index abfdaa78d..f45a24fb8 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-03-07 17:41+0700\n"
 "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n"
 "Language-Team: Debian Indonesia L10N Team <debian-l10n-id@gurame.fisika.ui."
@@ -211,36 +211,41 @@ msgstr "operasi ini membutuhkan akses baca/tulis ke area status dpkg"
 msgid "failed to remove my own update file %.255s"
 msgstr "gagal membuang berkas terbaru saya: %.250s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "tidak bisa menulis status terbaru dari `%.250s'"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "tidak bisa mengosongkan status terbaru dari `%.250s'"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "tidak bisa memotong status terbaru `%.250s'"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "tidak bisa melakukan 'fsync' status terbaru dari `%.250s'"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "tidak bisa menutup status terbaru `%.250s'"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "tidak bisa memasang status terbaru dari `%.250s'"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "tidak dapat membuka berkas debug `%.250s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2375,12 +2380,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "integer untuk --%s tidak sah: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "tidak dapat membuka berkas debug `%.250s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2459,47 +2459,47 @@ msgstr ""
 "parah.\n"
 "Pilihan paksaan bertanda [*] akan langsung diaktifkan.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "Pilihan force/refuse `%.*s' tak dikenal"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "tidak dapat melakukan 'malloc' pada 'execbackend'"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "tidak dapat melakukan 'strdup' pada 'execbackend'"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "Gagal menjalankan perintah %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd butuh 1 argumen, bukan 0"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd hanya butuh 1 argumen"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "angka tidak sah untuk --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "tidak dapat membuka `%i' untuk stream"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof tidak diharapkan sebelum akhir baris %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "butuh suatu pilihan aksi"
diff --git a/po/it.gmo b/po/it.gmo
index 0eec5940a..69eb031b5 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 30d98b7dc..548f6f18c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-06 17:59+0100\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: italian <debian-l10n-italian@debian.org>\n"
@@ -241,36 +241,41 @@ msgstr ""
 msgid "failed to remove my own update file %.255s"
 msgstr "impossibile rimuovere il mio stesso file di update %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "impossibile scrivere lo stato aggiornato di `%.250s'"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "impossibile fare il flush dello stato aggiornato di `%.250s'"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "impossibile fare il truncate dello stato aggiornato di `%.250s'<"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "impossibile fare l'fsync dello stato aggiornato di `%.250s'<"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "impossibile chiudere lo stato aggiornato di `%.250s'<"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "impossibile installare lo stato aggiornato di `%.250s'<"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "impossibile aprire il file di debug `%.255s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2456,12 +2461,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "numero intero non valido per l'opzione --%s: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "impossibile aprire il file di debug `%.255s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2550,47 +2550,47 @@ msgstr ""
 "seriamente la vostra installazione.\n"
 "Le opzioni contrassegnate da [*] sono abilitate di default.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opzione force/refuse sconosciuta: `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "impossibile fare malloc in execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "impossibile fare strdup in execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "impossibile eseguire %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd accetta un parametro, non nessuno"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd accetta un solo parametro"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "numero non valido in --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "impossibile aprire `%i' per ricevere il flusso"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inaspettato prima della fine della linea %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "è necessaria una opzione che indichi che azione svolgere"
diff --git a/po/ja.gmo b/po/ja.gmo
index 07e28bdc0..d1cfd0fbe 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index f64390b22..ad7b33930 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.10.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2004-12-31 16:22+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -217,36 +217,41 @@ msgstr "Áàºî¤Ï dpkg ¥¹¥Æ¡¼¥¿¥¹¥¨¥ê¥¢¤Ø¤ÎÆɤ߽ñ¤­¤Î¸¢¸Â¤¬É¬ÍפǤ¹¡£"
 msgid "failed to remove my own update file %.255s"
 msgstr "°ì»þŪ¤Ê¹¹¿·ÍÑ¥Õ¥¡¥¤¥ë %.255s ¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "¹¹¿·¤·¤¿`%.250s'¤Î¥¹¥Æ¡¼¥¿¥¹¤ò½ñ¤­¹þ¤á¤Þ¤»¤ó¡£"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "¹¹¿·¤·¤¿`%.250s'¤Î¥¹¥Æ¡¼¥¿¥¹¤ò¥Õ¥é¥Ã¥·¥å¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "¹¹¿·¤·¤¿`%.250s'¤Î¥¹¥Æ¡¼¥¿¥¹¤òÀÚ¤êµÍ¤á¤é¤ì¤Þ¤»¤ó¡£"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "¹¹¿·¤·¤¿`%.250s'¤Î¥¹¥Æ¡¼¥¿¥¹¤ò fsync ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "¹¹¿·¤·¤¿`%.250s'¤Î¥¹¥Æ¡¼¥¿¥¹¤ò¥¯¥í¡¼¥º¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "¹¹¿·¤·¤¿`%.250s'¤Î¥¹¥Æ¡¼¥¿¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó¡£"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "¥Ç¥Ð¥Ã¥°¥Õ¥¡¥¤¥ë `%.250s' ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2386,12 +2391,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s ¤ËÂФ¹¤ëÉÔÀµ¤ÊÀ°¿ô¤Ç¤¹: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "¥Ç¥Ð¥Ã¥°¥Õ¥¡¥¤¥ë `%.250s' ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2465,47 +2465,47 @@ msgstr ""
 "·Ù¹ð:[!]¤Î¤¢¤ë¥ª¥×¥·¥ç¥ó¤Î»ÈÍѤ¹¤ë¤È¡¢¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë¿¼¹ï¤Ê¥À¥á¡¼¥¸¤ò\n"
 "¼õ¤±¤ë¾ì¹ç¤¬¤¢¤ë¡£[*]¤Î¤Ä¤¤¤¿¥ª¥×¥·¥ç¥ó¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¡£\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ÉÔÌÀ¤Ê¶¯À©¡¦µñÈÝ(force/refuse)¥ª¥×¥·¥ç¥ó `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "¥Ð¥Ã¥¯¥¨¥ó¥É¤Î¼Â¹Ô¤Ç malloc ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "¥Ð¥Ã¥¯¥¨¥ó¥É¤Î¼Â¹Ô¤Ç strdup ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "%s ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd ¤Ï 1 ¤Ä¤Î°ú¿ô¤ò¼è¤ê¤Þ¤¹¡£"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd ¤Ï°ú¿ô¤ò 1 ¤Ä¤À¤±°ú¿ô¤ò¼è¤ê¤Þ¤¹¡£"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "--command-fd ¤Ø¤ÎÃͤ¬ÉÔÀµ¤Ç¤¹"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "`%i' ¤ò¥¹¥È¥ê¡¼¥à¤È¤·¤Æ¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "%d ¹ÔÌܤιÔËö¤Þ¤Ç¤Ëͽ´ü¤·¤Ê¤¤ eof ¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "¥¢¥¯¥·¥ç¥ó¤ò»ØÄꤹ¤ë¥ª¥×¥·¥ç¥ó¤¬É¬ÍפǤ¹¡£"
diff --git a/po/ko.gmo b/po/ko.gmo
index 66cd8e485..682eb7871 100644
--- a/po/ko.gmo
+++ b/po/ko.gmo
diff --git a/po/ko.po b/po/ko.po
index 96fd6c6f5..c82c189eb 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2004-11-21 03:52+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <cwryu@debian.org>\n"
@@ -203,36 +203,41 @@ msgstr "� 작업� dpkg �태 �역� �기/쓰기 권한� 필요합니
 msgid "failed to remove my own update file %.255s"
 msgstr "�체 업��트 파� %.255s�(를) 지우는 � 실패했습니다"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "`%.250s'� 업��트 �태를 쓸 수 없습니다"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "`%.250s'� 업��트 �태를 플러시할 수 없습니다"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "`%.250s'� 업��트 �태를 �를 수 없습니다"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "`%.250s'� 업��트 �태를 �기화할 수 없습니다"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "`%.250s'� 업��트 �태를 닫� 수 없습니다"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "`%.250s'� 업��트 �태를 설치할 수 없습니다"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "디버그 파� `%.255s'�(를) 열 수 없습니다\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2352,12 +2357,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s 옵션� 숫�가 잘못�었습니다: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "디버그 파� `%.255s'�(를) 열 수 없습니다\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2428,48 +2428,48 @@ msgstr ""
 "경고 - [!]가 붙� 옵션� 사용하면 설치 �태를 심�하게 �가질 수 있습니다.\n"
 "[*]가 표시� 강제 옵션� 기본값으로 켜집니다.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "알 수 없는 force/refuse 옵션 `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "execbackend�서 malloc할 수 없습니다"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "execbackend�서 strdup할 수 없습니다"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "%s 실행� 실패했습니다"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd 옵션� 0개가 아니� 1개� �수를 받습니다"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd 옵션� 정확히 1개� �수만 받습니다"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "--command-fd 옵션� 번호가 올바르지 않습니다"
 
 # fdopen() 실패 �황
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "`%i' 파�디스�립터를 스트림으로 열 수 없습니다"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "%d번째 줄� �나기 전� 예�치 못하게 파�� �났습니다"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "명령 옵션� 필요합니다"
diff --git a/po/nb.gmo b/po/nb.gmo
index eb5da787d..6d6119c30 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index afce57f50..a9f1c7809 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-25 11:14+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -206,36 +206,41 @@ msgstr "operasjonen krever lese- og skrivetilgang til dpkg-statusområdet"
 msgid "failed to remove my own update file %.255s"
 msgstr "klarte ikke fjerne min egen oppdateringsfil %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "klarte ikke skrive oppdatert status for «%.250s»"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "klarte ikke tømme oppdatert status for «%.250s»"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "klarte ikke klippe for oppdatert status for «%.250s»"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "klarte ikke synkronisere oppdatert status for «%.250s»"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "klarte ikke lukke oppdatert status for «%.250s»"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "klarte ikke installere oppdatert status for «%.250s»"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "klarte ikke åpne avlusingsfil `%.255s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2366,12 +2371,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ugyldig heltall for --%s: «%.250s»"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "klarte ikke åpne avlusingsfil `%.255s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2447,47 +2447,47 @@ msgstr ""
 "ADVARSEL - Funksjoner merket med [!] kan ødelegge installasjonen alvorlig.\n"
 "Opsjoner som er merket med [*] er slått på som standard.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukjent tvangs-/avvisningsopsjon «%.*s»"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "klarte ikke utføre «malloc» i execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "klarte ikke utføre «strdup» i execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "klarte ikke kjøre %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd tar ett argument, ikke 0"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd tar bare ett argument"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "ugyldig tall for --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "klarte ikke åpne «%i» for strøm"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "uventet slutt på fil før slutten av linje %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "trenger et handlingsvalg"
diff --git a/po/nl.gmo b/po/nl.gmo
index b90e93acf..09b7bfdb9 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 6896ab080..3b0d85d06 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-06 23:41+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"
@@ -202,36 +202,41 @@ msgstr ""
 msgid "failed to remove my own update file %.255s"
 msgstr "kon mijn eigen update bestand %.255s niet verwijderen"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "kon de nieuwe status van `%.250s' niet wegschrijven"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "kon de nieuwe status van `%.250s' niet doorspoelen"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "kon niet afkappen voor de nieuwe status van `%.250s'"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "kon nieuwe status van `%.250s' niet synchroniseren"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "kon nieuwe status van `%.250s' niet afsluiten"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "kon nieuwe status van `%.250s' niet installeren"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "kon debugbestand `%.255s' niet openen\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2384,12 +2389,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ongeldig getal voor --%s: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "kon debugbestand `%.255s' niet openen\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2476,47 +2476,47 @@ msgstr ""
 "ernstig beschadigen.\n"
 "Forceeropties gemarkeerd met [*] staan standaard aan.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "onbekende force/refuse optie `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "kon geen geheugen reserveren in exec-backend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "strdup is mislukt in exec-backend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "kon %s niet uitvoeren"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd verwacht een argument, niet nul"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd verwacht slechts één argument"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "ongeldig nummer voor --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "kon `%i' niet openen voor stream"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "onverwacht bestandseinde voor einde regel %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "heb een actie-optie nodig"
diff --git a/po/nn.gmo b/po/nn.gmo
index 36f2eb51a..214b55731 100644
--- a/po/nn.gmo
+++ b/po/nn.gmo
diff --git a/po/nn.po b/po/nn.po
index 5a0d7ae1b..2d725063b 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_nn\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-08 16:16+0100\n"
 "Last-Translator: HÃ¥vard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian (Nynorsk) <i18n-nn@lister.ping.uio.no>\n"
@@ -208,36 +208,41 @@ msgstr "operasjonen krev lese- og skrivetilgang til dpkg-statusområdet"
 msgid "failed to remove my own update file %.255s"
 msgstr "klarte ikkje fjerna mi eiga oppdateringsfil %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "klarte ikkje skriva oppdatert status for «%.250s»"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "klarte ikkje tømma oppdatert status for «%.250s»"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "klarte ikkje klippa for oppdatert status for «%.250s»"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "klarte ikkje synkronisera oppdatert status for «%.250s»"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "klarte ikkje lukka oppdatert status for «%.250s»"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "klarte ikkje installera oppdatert status for «%.250s»"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "klarte ikkje opna avlusingsfil `%.255s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2376,12 +2381,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ugyldig heiltal for --%s: «%.250s»"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "klarte ikkje opna avlusingsfil `%.255s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2460,47 +2460,47 @@ msgstr ""
 "alvorleg.\n"
 "Vala som er merkte med [*] er slått på som standard.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukjend tvingings-/avvisingsval «%.*s»"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "klarte ikkje utføra «malloc» i execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "klarte ikkje utføra «strdup» i execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "klarte ikkje køyra %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd tek éin parameter, ikkje null"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd tek berre ein parameter"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "ugyldig tal for --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "klarte ikkje opna «%i» for straum"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "uventa slutt på fil før slutten av linje %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "treng eit handlingsval"
diff --git a/po/pl.gmo b/po/pl.gmo
index 1d8611ec8..f98f58743 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 20cc6f4b1..dc4ef7ffd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.20\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-05 19:50+0100\n"
 "Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -202,36 +202,41 @@ msgstr "¿±dana operacja wymaga uprawnieñ zapisu/odczytu pliku status"
 msgid "failed to remove my own update file %.255s"
 msgstr "nie mo¿na usun±æ uaktualnionego pliku %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "nie mo¿na zapisaæ uaktualnionego pliku `%.250s'"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "nie mo¿na od¶wie¿yæ uaktualnionego pliku `%.250s'"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "nie mo¿na obci±æ uaktualnionego pliku `%.250s'"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "nie mo¿na zsynchronizowaæ uaktualnionego pliku `%.250s'"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "nie mo¿na zamkn±æ uaktualnionego pliku `%.250s'"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "nie mo¿na zainstalowaæ uaktualnionego pliku `%.250s'"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "nie mo¿na otworzyæ pliku debuggera `%.255s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2382,12 +2387,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "b³êdna warto¶æ liczbowa dla --%s: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "nie mo¿na otworzyæ pliku debuggera `%.255s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2464,47 +2464,47 @@ msgstr ""
 "UWAGA - u¿ycie opcji oznaczonej [!] mo¿e powa¿nie uszkodziæ instalacjê.\n"
 "Opcje oznaczone [*] s± domy¶lnie w³±czone.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "nieznana opcja force/refuse `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "malloc w execbackend nie powiod³o siê"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "strdup w execbackend nie powiod³o siê"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "wywo³anie %s nie powiod³o siê"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd wymaga 1 argumentu, nie 0"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd wymaga tylko 1 argumentu"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "nieprawid³owy numer przy --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nie uda³o siê otworzyæ `%i' jako strumienia"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "niespodziewany EOF przed koñcem linii %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "nale¿y okre¶liæ dzia³anie"
diff --git a/po/pt.gmo b/po/pt.gmo
index 57d969451..481bcb1f2 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index 94214fdda..535d553f0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-09 09:20+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -204,36 +204,41 @@ msgstr "a operação requer acesso de leitura/escrita na área do status do dpkg
 msgid "failed to remove my own update file %.255s"
 msgstr "falhou a remoção do meu próprio ficheiro de actualização %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "não foi possível escrever o status actualizado de `%.250s'"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "não foi possível esvaziar o status actualizado de `%.250s'"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "não foi possível truncar para o status actualizado de `%.250s'"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "não foi possível fazer fsync ao status actualizado de `%.250s'"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "não foi possível fechar o status actualizado de `%.250s'"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "não foi possível instalar o status actualizado de `%.250s'"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "não pode abrir ficheiro de debug `%.255s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2405,12 +2410,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "número inteiro inválido para --%s: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "não pode abrir ficheiro de debug `%.255s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2499,47 +2499,47 @@ msgstr ""
 "instalação.\n"
 "Opções para forçar marcadas com [*] são habilitadas por padrão.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opção desconhecida de forçar/recusar `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "não pode fazer malloc no execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "não pode fazer strdup no execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "falhou executar %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd leva 1 argumento, não 0"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-df leva apenas 1 argumento"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "número inválido para --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "não pode abrir `%i' para stream"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes do fim da linha %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "é necessária uma opção de acção"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index a7a6f09f4..244d438ae 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 30be69d32..dda5947de 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-06 16:42-0200\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -209,36 +209,41 @@ msgstr "operação requer acesso de leitura/gravação à área de status do dpkg"
 msgid "failed to remove my own update file %.255s"
 msgstr "remoção de meu próprio arquivo de atualização %.255s falhou"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "não foi possível gravar status atualizado de `%.250s'"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "não foi possível efetuar flush do status atualizado de `%.250s'"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "não foi possível truncar o status atualizado de `%.250s'"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "não foi possível efetuar fsync do status atualizado de `%.250s'"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "não foi possível fechar status atualizado de `%.250s'"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "não foi possível instalar status atualizado de `%.250s'"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "não foi possível abrir arquivo de depuração `%.250s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2405,12 +2410,7 @@ msgstr "--ignore-depends requer um nome de pacote válido. `%.250s' não é; %s"
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "inteiro inválido para --%s: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "não foi possível abrir arquivo de depuração `%.250s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2497,47 +2497,47 @@ msgstr ""
 "instalação.\n"
 "Opções para forçar marcadas com [*] são habilitadas por padrão.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opção de forçar/recusar `%.*s' desconhecida"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "não foi possível alocar memória em execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "não foi possível fazer strdup em execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "falha ao executar %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd recebe 1 argumento, não 0"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd recebe somente 1 argumento"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "número inválido para --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "não foi possível abrir `%i' para stream"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado após fim da linha %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "preciso de uma opção de ação"
diff --git a/po/ro.gmo b/po/ro.gmo
index f3b013e2a..5ad6af4bf 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index 4deef079e..c361d1b37 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_ro\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-05-25 03:12+0200\n"
 "Last-Translator: Eddy PetriÅŸor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian (Română) <debian-l10n-romanian@lists.debian.org>\n"
@@ -218,36 +218,41 @@ msgstr "operaţia necesită acces de tip scriere/citire în zona de stare a dpkg
 msgid "failed to remove my own update file %.255s"
 msgstr "eşec la îndepărtarea propriului fişier cu actualizări %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "nu pot scrie starea actualizată a `%.250s'"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "nu pot goli starea actuală a `%.250s'"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "nu pot trunchia pentru starea actualizată a `%.250s'"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "nu pot să sincronizez cu fsync starea actualizată a lui `%.250s'"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "nu pot închide starea actualizată a `%.250s'"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "nu pot instala starea actualizată a `%.250s'"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "nu pot deschide fiÅŸierul de depanare `%.255s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2431,12 +2436,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "întreg invalid pentru --%s: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "nu pot deschide fiÅŸierul de depanare `%.255s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2523,47 +2523,47 @@ msgstr ""
 "sistemul dvs.\n"
 "Forţarea opţiunilor marcate cu [*] sunt implicit activate.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opţiune de forţare/refuzare necunoscută `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "nu am putut executa malloc în aplicaţia propriu-zisă"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "nu am putut executa strdup în aplicaţia propriu-zisă"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "eşec la execuţia %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd ia 1 argument, nu 0"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd ia doar 1 argument"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "număr invalid pentru --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nu am putut deschide `%i' pentru fluxul de date"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "sfârşit neaşteptat de fişier înainte de terminarea liniei %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "e necesară o opţiune de acţiune"
diff --git a/po/ru.gmo b/po/ru.gmo
index d6b1c7337..3877c3b3b 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 5dace6702..b2ae2b95d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-01 11:38+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@id.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -207,36 +207,41 @@ msgstr "операциÑ� требует прав на чтение облаÑ�Ñ‚Ð
 msgid "failed to remove my own update file %.255s"
 msgstr "не удало�ь удалить �об�твенный файл обновлений %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "не удало�ь запи�ать обновлённый файл �о�то�ни� пакета %.250s"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "не удало�ь �бро�ить буфер обновлённого файла �о�то�ни� пакета %.250s"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "не удало�ь у�ечь обновлённый файл �о�то�ни� пакета %.250s"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "не удало�ь �инхронизировать обновлённый файл �о�то�ни� пакета %.250s"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "не удало�ь закрыть обновлённый файл �о�то�ни� пакета %.250s"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "не удало�ь у�тановить обновлённый файл �о�то�ни� пакета %.250s"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "не удало�ь открыть отладочный файл %.255s\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2469,12 +2474,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "аргумент --%s (%.250s) не �вл�ет�� допу�тимым целочи�ленным значением"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "не удало�ь открыть отладочный файл %.255s\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2566,47 +2566,47 @@ msgstr ""
 "повредить\n"
 "вашу �и�тему. Параметры, отмеченные [*], задей�твованы по умолчанию.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "недопу�тимый параметр игнорировани�/обработки проблем %.*s"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "не удало�ь выделить пам�ть при работе функции execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "не удало�ь �копировать �троку при работе функции execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "не удало�ь запу�тить %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "параметр --command-fd принимает один аргумент, а не ноль"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "параметр --command-fd принимает только один аргумент"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "аргумент параметра --command-fd не �вл�ет�� чи�лом"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "не удало�ь открыть поток де�криптора файла %i"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "неожиданный конец файла, ещё не кончила�ь �трока %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "требует�� параметр дей�тви�"
diff --git a/po/sk.gmo b/po/sk.gmo
index 27ce6cbc2..bacf34951 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index fc3c2be5a..b28cfb9b5 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-08 17:21-0500\n"
 "Last-Translator: Roman Benko <benco@acid.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -206,36 +206,41 @@ msgstr "operácia vy¾aduje práva na èítanie/zápis do stavovej oblasti dpkg"
 msgid "failed to remove my own update file %.255s"
 msgstr "chyba pri odstraòovaní môjho vlastného akualizaèného súboru %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "nie je mo¾né zapísa» aktualizovaný stav `%.250s'"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "nie je mo¾né vyprázdni» aktualizovaný stav `%.250s'"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "nie je mo¾né skráti» aktualizovaný stav `%.250s'"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "nie je mo¾né vykona» funkciu fsync na aktualizovaný stav `%.250s'"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "nie je mo¾né uzavrie» aktualizovaný stav `%.250s'"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "nie je mo¾né in¹talova» aktualizovaný stav `%.250s'"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "nebolo mo¾né otvori» ladiaci súbor `%.255s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2386,12 +2391,7 @@ msgstr "--ignore-depends vy¾aduje platný názov balíku. `%.250s' nie je; %s"
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "neplatné èíslo pre --%s: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "nebolo mo¾né otvori» ladiaci súbor `%.255s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2462,47 +2462,47 @@ msgstr ""
 "in¹taláciu.\n"
 "Vnútenie volieb oznaèených [*] je predvolene povelené.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "neznáma vnucovacia/odmietacia voµba `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "nemô¾e vykona» funkciu malloc v execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "nemô¾e vykona» funkciu strdup v execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "nie je mo¾né spusti» %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd vy¾aduje jeden paramater, nie nula"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd vy¾aduje len jeden argument"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "neplatné èíslo pre --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nie je mo¾né otvori» `%i' pre tok"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "neèakaný koniec súboru pred koncom riadku %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "potrebujem zada» akciu"
diff --git a/po/sv.gmo b/po/sv.gmo
index abb332a0b..ce85d0cfc 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index da21650fc..30aaa0ce8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-01-01 23:52+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Peter Karlsson <peterk@debian.org>\n"
@@ -204,36 +204,41 @@ msgstr "operationen kräver läs-/skrivåtkomst till dpkgs statusarea"
 msgid "failed to remove my own update file %.255s"
 msgstr "kunde inte ta bort min egen uppdateringsfil %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "kunde inte skriva uppdaterad status för \"%.250s\""
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "kunde inte tömma uppdaterad status för \"%.250s\""
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "kunde inte klippa för uppdaterad status för \"%.250s\""
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "kunde inte synkronisera uppdaterad status för \"%.250s\""
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "kunde inte stänga uppdaterad status för \"%.250s\""
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "kunde inte installera uppdaterad status för \"%.250s\""
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "kunde inte öppna felsökningsfil \"%.255s\"\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2354,12 +2359,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ogiltigt heltal för --%s: \"%.250s\""
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "kunde inte öppna felsökningsfil \"%.255s\"\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2435,47 +2435,47 @@ msgstr ""
 "installation\n"
 "om de används. Flaggor markerade [*] är förvalda.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "okänd flagga för force/refuse: \"%.*s\""
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "kunde inte allokera i execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "kunde inte duplicera sträng i execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "kunde inte exekvera %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd tar exakt ett argument"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd tar bara ett argument"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "ogiltigt tal för --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "kunde inte öppna \"%i\" för ström"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "oväntat filslut före slut på rad %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "du har inte talat om vad som skall utföras"
diff --git a/po/tl.gmo b/po/tl.gmo
index 5b8234813..3c257b16c 100644
--- a/po/tl.gmo
+++ b/po/tl.gmo
diff --git a/po/tl.po b/po/tl.po
index 8db9e6d3e..c3b724cf5 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-03-07 20:09+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -208,36 +208,41 @@ msgstr ""
 msgid "failed to remove my own update file %.255s"
 msgstr "bigo sa pagtanggal ng sariling talaksang apdeyt %.255s"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "hindi makapagsulat ng kalagayang inapdeyt ng `%.250s'"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "hindi mai-flush ang kalagayang inapdeyt ng `%.250s'"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "hindi mai-truncate para sa kalagayang inapdeyt ng `%.250s'"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "hindi ma-fsync ang kalagayang inapdeyt ng `%.250s'"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "hindi masarhan ang kalagayang inapdeyt ng `%.250s'"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "hindi ma-luklok ang kalagayang inapdeyt ng `%.250s'"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "hindi mabuksan ang talaksang pan-debug `%.255s'\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2423,12 +2428,7 @@ msgstr ""
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "di tanggap na integer para sa --%s: `%.250s'"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "hindi mabuksan ang talaksang pan-debug `%.255s'\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2520,47 +2520,47 @@ msgstr ""
 "ay\n"
 "naka-enable na default.\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "di kilalang opsyon na force/refuse `%.*s'"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "hindi maka-malloc sa execbackend"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "hindi maka-strdup sa execbackend"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "bigo sa pag-exec ng %s"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd ay tumatanggap ng 1 argumento, hindi 0"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd ay tumatanggap lamang ng 1 argumento"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "di tanggap na numero para sa --command-fd"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "hindi mabuksan ang `%i' para sa stream"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "di inaasahang eof bago matapos ang linya %d"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "kailangan ng opsyon ng gagawin"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 32fb77768..174162a36 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6972d5b76..e8f35d746 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-02-07 05:27+1300\n"
 "Last-Translator: Tchaikov <chaisave@263.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -203,36 +203,41 @@ msgstr "该�作需�用户对 dpkg 状�目录有读写��"
 msgid "failed to remove my own update file %.255s"
 msgstr "删除我自己的更新文件 %.255s 失败"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "无法写入“%.250s�的更新状�"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "无法刷新“%.250s�的更新状�"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "无法删节“%.250s�的更新状�"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "无法 fsync “%.250s�的更新状�"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "无法关闭“%.250s�的更新状�文件"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "无法安装“%.250s�的更新状�"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "无法打开调试信�文件“%.255s�\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2315,12 +2320,7 @@ msgstr "--ignore-depends 需è¦�一个有效的软件包å��。而“%.250sâ€�å�´ä
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s 有一个无效的数字�数：“%.250s�"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "无法打开调试信�文件“%.255s�\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2394,47 +2394,47 @@ msgstr ""
 "警告 - 使用带有[!]标记的选项�能会严�破�您的系统安装。\n"
 "缺�情况下，是使用带有[*]标记的强制手段的。\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "无法识别的 force/refuse 选项“%.*s�"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "无法在 execbackend 中 malloc"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "无法在 execbackend 中 strdup"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "exec %s 失败"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd 需�带一个�数，而�是零个"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd �需带一个�数"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "--command-fd 有一个无效的数字�数"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "无法打开“%i�，并把它作为字符��作"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行还未结�时，�现了预料之外的 eof"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "需�一个指示�作的选项"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index c635a12d5..9cf2c1966 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 63128ac91..bbd466f14 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-06-10 07:42+0100\n"
+"POT-Creation-Date: 2005-06-12 15:53+0100\n"
 "PO-Revision-Date: 2005-02-05 19:54+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -203,36 +203,41 @@ msgstr "該�作需�用戶� dpkg 狀態目錄有讀寫權�"
 msgid "failed to remove my own update file %.255s"
 msgstr "刪除我自己的更新檔案 %.255s 失敗"
 
-#: lib/dbmodify.c:278
+#: lib/dbmodify.c:260
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "無法寫入“%.250s�的更新狀態"
 
-#: lib/dbmodify.c:280
+#: lib/dbmodify.c:262
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "無法刷新“%.250s�的更新狀態"
 
-#: lib/dbmodify.c:282
+#: lib/dbmodify.c:264
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "無法刪除“%.250s�的更新狀態"
 
-#: lib/dbmodify.c:284
+#: lib/dbmodify.c:266
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "無法�步檔案“%.250s�的更新狀態"
 
-#: lib/dbmodify.c:286
+#: lib/dbmodify.c:268
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "無法關閉“%.250s�的更新狀態"
 
-#: lib/dbmodify.c:289
+#: lib/dbmodify.c:271
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "無法安�“%.250s�的更新狀態"
 
+#: lib/dbmodify.c:301
+#, fuzzy, c-format
+msgid "couldn't open log `%s': %s\n"
+msgstr "無法打開�錯檔案“%.255s�\n"
+
 #: lib/dump.c:291
 #, c-format
 msgid "failed to open `%s' for writing %s information"
@@ -2304,12 +2309,7 @@ msgstr "--ignore-depends 需è¦�一個有效的套件å��。而“%.250sâ€�å�»ä¸�æ
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s 有一個無效的數字�數：“%.250s�"
 
-#: src/main.c:295
-#, fuzzy, c-format
-msgid "couldn't open log `%s': %s\n"
-msgstr "無法打開�錯檔案“%.255s�\n"
-
-#: src/main.c:316
+#: src/main.c:292
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2382,47 +2382,47 @@ msgstr ""
 "警告 - 使用帶有[!]標記的�項�能會嚴�破壞您的系統安�。\n"
 "�設情�下，是使用帶有[*]標記的強制方法。\n"
 
-#: src/main.c:361
+#: src/main.c:337
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "無法識別的 force/refuse �項“%.*s�"
 
-#: src/main.c:464 src/main.c:468
+#: src/main.c:442 src/main.c:446
 msgid "couldn't malloc in execbackend"
 msgstr "無法在 execbackend 中 malloc"
 
-#: src/main.c:466 src/main.c:473
+#: src/main.c:444 src/main.c:451
 msgid "couldn't strdup in execbackend"
 msgstr "無法在 execbackend 中 strdup"
 
-#: src/main.c:477
+#: src/main.c:455
 #, c-format
 msgid "failed to exec %s"
 msgstr "exec %s 失敗"
 
-#: src/main.c:489
+#: src/main.c:467
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd 需�帶一個�數，而�是零個"
 
-#: src/main.c:490
+#: src/main.c:468
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd �需帶一個�數"
 
-#: src/main.c:492
+#: src/main.c:470
 msgid "invalid number for --command-fd"
 msgstr "--command-fd 有一個無效的數字�數"
 
-#: src/main.c:494
+#: src/main.c:472
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "無法打開“%i�，並把它作為串�處�"
 
-#: src/main.c:519
+#: src/main.c:497
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行還未��時，發�了�料之外的 eof"
 
-#: src/main.c:563 src/main.c:578 src/query.c:565 dpkg-deb/main.c:184
+#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "需�一個指示�作的�項"
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 2cf80b965..a9c370bf1 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -64,7 +64,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(changelogdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sbindir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(changelogdir)" \
+	"$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sbindir)"
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 changelogSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 dist_pkglibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@@ -84,7 +85,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -144,6 +144,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -156,7 +157,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -170,6 +170,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -434,7 +436,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index cc34a59a6..fe54ea29d 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -8,10 +8,12 @@ my %dirincluded;
 my %notfileobject;
 my $fn;
 
-$diff_ignore_default_regexp = '(?:^|/)\.#.*$|(?:^|/).*~$|(?:^|/)\..*\.swp|DEADJOE|\.cvsignore|(?:/(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|_darcs))(?:$|/.*$)';
+$diff_ignore_default_regexp = '(?:^|/)\.#.*$|(?:^|/).*~$|(?:^|/)\..*\.swp|DEADJOE|\.cvsignore|\.arch-inventory|(?:/(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|_darcs))(?:$|/.*$)';
 
 $sourcestyle = 'X';
-$dscformat = "1.0";
+$min_dscformat = 1;
+$max_dscformat = 2;
+$def_dscformat = "1.0"; # default format for -b
 
 use POSIX;
 use POSIX qw (:errno_h :signal_h);
@@ -40,7 +42,7 @@ Ian Jackson and Klee Dienes.  This is free software; see the GNU
 General Public Licence version 2 or later for copying conditions.
 There is NO warranty.
 
-Usage:  dpkg-source -x <filename>.dsc
+Usage:  dpkg-source -x <filename>.dsc [<output-directory>]
         dpkg-source -b <directory> [<orig-directory>|<orig-targz>|\'\']
 Build options:   -c<controlfile>     get control info from this file
                  -l<changelogfile>   get per-version info from this file
@@ -70,13 +72,9 @@ General options: -h                  print this message
 }
 
 sub handleformat {
-	local $fmt	= shift;
-	local $ourfmt	= $dscformat;
-
-	$fmt =~ s/(.*)\.\d*/$1/;
-	$ourfmt =~ s/(.*)\.\d*/$1/;
-
-	return ($fmt==$ourfmt);
+	my $fmt = shift;
+	return unless $fmt =~ /^(\d+)/; # only check major version
+	return $1 >= $min_dscformat && $1 <= $max_dscformat;
 }
 
 
@@ -101,7 +99,7 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
     } elsif (m/^-F([0-9a-z]+)$/) {
         $changelogformat=$1;
     } elsif (m/^-D([^\=:]+)[=:]/) {
-        $override{$1}= $';
+        $override{$1}= "$'";
     } elsif (m/^-U([^\=:]+)$/) {
         $remove{$1}= 1;
     } elsif (m/^-i(.*)$/) {
@@ -109,9 +107,9 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
     } elsif (m/^-I(.+)$/) {
         push @tar_ignore, "--exclude=$1";
     } elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:]/) {
-        $substvar{$1}= $';
+        $substvar{$1}= "$'";
     } elsif (m/^-T/) {
-        $varlistfile= $';
+        $varlistfile= "$'";
     } elsif (m/^-h$/) {
         &usageversion; exit(0);
     } elsif (m/^-W$/) {
@@ -147,7 +145,7 @@ if ($opmode eq 'build') {
     
     &parsechangelog;
     &parsecontrolfile;
-    $f{"Format"}=$dscformat;
+    $f{"Format"}=$def_dscformat;
 
     $archspecific=0;
     for $_ (keys %fi) {
@@ -177,7 +175,7 @@ if ($opmode eq 'build') {
 		    } else {
                         for $a (split(/\s+/,$v)) {
                             &error("architecture $a only allowed on its own".
-                                   " (list for package $p is \`$a')")
+                                   " (list for package $p is `$a')")
                                    if grep($a eq $_, 'any','all');
                             push(@sourcearch,$a) unless $archadded{$a}++;
                         }
@@ -263,22 +261,22 @@ if ($opmode eq 'build') {
 
     if ($sourcestyle =~ m/[aA]/) {
         if (stat("$origtargz")) {
-            -f _ || &error("packed orig \`$origtargz' exists but is not a plain file");
+            -f _ || &error("packed orig `$origtargz' exists but is not a plain file");
             $sourcestyle =~ y/aA/pP/;
         } elsif ($! != ENOENT) {
-            &syserr("unable to stat putative packed orig \`$origtargz'");
+            &syserr("unable to stat putative packed orig `$origtargz'");
         } elsif (stat("$origdir")) {
-            -d _ || &error("unpacked orig \`$origdir' exists but is not a directory");
+            -d _ || &error("unpacked orig `$origdir' exists but is not a directory");
             $sourcestyle =~ y/aA/rR/;
         } elsif ($! != ENOENT) {
-            &syserr("unable to stat putative unpacked orig \`$origdir'");
+            &syserr("unable to stat putative unpacked orig `$origdir'");
         } else {
             $sourcestyle =~ y/aA/nn/;
         }
     }
     $dirbase= $dir; $dirbase =~ s,/?$,,; $dirbase =~ s,[^/]+$,,; $dirname= $&;
-    $dirname eq $basedirname || &warn("source directory \`$dir' is not <sourcepackage>".
-                                      "-<upstreamversion> \`$basedirname'");
+    $dirname eq $basedirname || &warn("source directory `$dir' is not <sourcepackage>".
+                                      "-<upstreamversion> `$basedirname'");
     
     if ($sourcestyle ne 'n') {
         $origdirbase= $origdir; $origdirbase =~ s,/?$,,;
@@ -302,10 +300,10 @@ if ($opmode eq 'build') {
 
         if (stat($tarname)) {
             $sourcestyle =~ m/[nUR]/ ||
-                &error("tarfile \`$tarname' already exists, not overwriting,".
+                &error("tarfile `$tarname' already exists, not overwriting,".
                        " giving up; use -sU or -sR to override");
         } elsif ($! != ENOENT) {
-            &syserr("unable to check for existence of \`$tarname'");
+            &syserr("unable to check for existence of `$tarname'");
         }
 
         print("$progname: building $sourcepackage in $tarname\n")
@@ -316,14 +314,14 @@ if ($opmode eq 'build') {
             chdir($tardirbase) || &syserr("chdir to above (orig) source $tardirbase");
             open(STDOUT,">&GZIP") || &syserr("reopen gzip for tar");
             # FIXME: put `--' argument back when tar is fixed
-            exec('tar',@tar_ignore,'-cf','-',$tardirname); &syserr("exec tar");
+            exec('tar',@tar_ignore,'-cf','-',$tardirname) or &syserr("exec tar");
         }
         close(GZIP);
         &reapgzip;
         $c2 == waitpid($c2,0) || &syserr("wait for tar");
         $? && !(WIFSIGNALED($c2) && WTERMSIG($c2) == SIGPIPE) && subprocerr("tar");
         rename("$tarname.new",$tarname) ||
-            &syserr("unable to rename \`$tarname.new' (newly created) to \`$tarname'");
+            &syserr("unable to rename `$tarname.new' (newly created) to `$tarname'");
 
     } else {
         
@@ -338,13 +336,13 @@ if ($opmode eq 'build') {
 
         if (stat($origdir)) {
             $sourcestyle =~ m/[KP]/ ||
-                &error("orig dir \`$origdir' already exists, not overwriting,".
+                &error("orig dir `$origdir' already exists, not overwriting,".
                        " giving up; use -sA, -sK or -sP to override");
 	    push @exit_handlers, sub { erasedir($origdir) };
             erasedir($origdir);
 	    pop @exit_handlers;
         } elsif ($! != ENOENT) {
-            &syserr("unable to check for existence of orig dir \`$origdir'");
+            &syserr("unable to check for existence of orig dir `$origdir'");
         }
 
         $expectprefix= $origdir; $expectprefix =~ s,^\./,,;
@@ -352,14 +350,14 @@ if ($opmode eq 'build') {
 # which we can still handle anyway.
 #        checktarsane($origtargz,$expectprefix);
         mkdir("$origtargz.tmp-nest",0755) ||
-            &syserr("unable to create \`$origtargz.tmp-nest'");
+            &syserr("unable to create `$origtargz.tmp-nest'");
 	push @exit_handlers, sub { erasedir("$origtargz.tmp-nest") };
         extracttar($origtargz,"$origtargz.tmp-nest",$expectprefix);
         rename("$origtargz.tmp-nest/$expectprefix",$expectprefix) ||
-            &syserr("unable to rename \`$origtargz.tmp-nest/$expectprefix' to ".
-                    "\`$expectprefix'");
+            &syserr("unable to rename `$origtargz.tmp-nest/$expectprefix' to ".
+                    "`$expectprefix'");
         rmdir("$origtargz.tmp-nest") ||
-            &syserr("unable to remove \`$origtargz.tmp-nest'");
+            &syserr("unable to remove `$origtargz.tmp-nest'");
 	    pop @exit_handlers;
     }
         
@@ -372,7 +370,7 @@ if ($opmode eq 'build') {
         defined($c2= open(FIND,"-|")) || &syserr("fork for find");
         if (!$c2) {
             chdir($dir) || &syserr("chdir to $dir for find");
-            exec('find','.','-print0'); &syserr("exec find");
+            exec('find','.','-print0') or &syserr("exec find");
         }
         $/= "\0";
 
@@ -409,7 +407,7 @@ if ($opmode eq 'build') {
                     exec('diff','-u',
                          '-L',"$basedirname.orig/$fn",
                          '-L',"$basedirname/$fn",
-                         '--',"$ofnread","$dir/$fn"); &syserr("exec diff");
+                         '--',"$ofnread","$dir/$fn") or &syserr("exec diff");
                 }
                 $difflinefound= 0;
                 $/= "\n";
@@ -425,7 +423,7 @@ if ($opmode eq 'build') {
                               "(either original or modified version)");
                     } else {
                         s/\n$//;
-                        &internerr("unknown line from diff -u on $fn: \`$_'");
+                        &internerr("unknown line from diff -u on $fn: `$_'");
                     }
                     print(GZIP $_) || &syserr("failed to write to gzip");
                 }
@@ -455,7 +453,7 @@ if ($opmode eq 'build') {
         defined($c2= open(FIND,"-|")) || &syserr("fork for 2nd find");
         if (!$c2) {
             chdir($origdir) || &syserr("chdir to $origdir for 2nd find");
-            exec('find','.','-print0'); &syserr("exec 2nd find");
+            exec('find','.','-print0') or &syserr("exec 2nd find");
         }
         $/= "\0";
         while (defined($fn= <FIND>)) {
@@ -502,11 +500,16 @@ if ($opmode eq 'build') {
     $sourcestyle =~ m/[pun]/ ||
         &usageerr("source handling style -s$sourcestyle not allowed with -x");
 
-    @ARGV==1 || &usageerr("-x needs exactly one argument, the .dsc");
+    @ARGV>=1 || &usageerr("-x needs at least one argument, the .dsc");
+    @ARGV<=2 || &usageerr("-x takes no more than two arguments");
     $dsc= shift(@ARGV);
     $dsc= "./$dsc" unless $dsc =~ m:^/:;
     $dscdir= $dsc; $dscdir= "./$dscdir" unless $dsc =~ m,^/|^\./,;
     $dscdir =~ s,/[^/]+$,,;
+    if (@ARGV) {
+	$newdirectory= shift(@ARGV);
+	! -e $newdirectory || &error("unpack target exists: $newdirectory");
+    }
 
     open(CDATA,"< $dsc") || &error("cannot open .dsc file $dsc: $!");
     &parsecdata('S',-1,"source control file $dsc");
@@ -517,25 +520,23 @@ if ($opmode eq 'build') {
             &error("missing critical source control field $f");
     }
 
+    my $dscformat = $def_dscformat;
     if (defined $fi{'S Format'}) {
 	if (not handleformat($fi{'S Format'})) {
-	    &error("Unsupported format of .dsc file ($dscformat)");
+	    &error("Unsupported format of .dsc file ($fi{'S Format'})");
 	}
         $dscformat=$fi{'S Format'};
     }
 
-    $sourcepackage =~ m/[^.0-9]/ &&
-        &error("dsc format contains illegal character \`$&'");
-
-    $sourcepackage= $fi{'S Source'};
+    $sourcepackage = $fi{'S Source'};
     $sourcepackage =~ m/[^-+.0-9a-z]/ &&
-        &error("source package name contains illegal character \`$&'");
+        &error("source package name contains illegal character `$&'");
     $sourcepackage =~ m/^[0-9a-z]/ ||
         &error("source package name starts with non-alphanum");
 
     $version= $fi{'S Version'};
     $version =~ m/[^-+:.0-9a-zA-Z~]/ &&
-        &error("version number contains illegal character \`$&'");
+        &error("version number contains illegal character `$&'");
     $version =~ s/^\d+://;
     if ($version =~ m/-([^-]+)$/) {
         $baseversion= $`; $revision= $1;
@@ -543,95 +544,149 @@ if ($opmode eq 'build') {
         $baseversion= $version; $revision= '';
     }
 
-    $files= $fi{'S Files'};
+    $files = $fi{'S Files'};
+    my @tarfiles;
+    my $difffile;
+    my $debianfile;
+    my %seen;
     for $file (split(/\n /,$files)) {
         next if $file eq '';
         $file =~ m/^([0-9a-f]{32})[ \t]+(\d+)[ \t]+([0-9a-zA-Z][-+:.,=0-9a-zA-Z_~]+)$/
-            || &error("Files field contains bad line \`$file'");
+            || &error("Files field contains bad line `$file'");
         ($md5sum{$3},$size{$3},$file) = ($1,$2,$3);
-        &setfile(\$tarfile) if $file =~ m/\.tar\.gz$/;
-        &setfile(\$difffile) if $file =~ m/\.diff\.gz$/;
-    }
+	local $_ = $file;
 
-    $newdirectory= $sourcepackage.'-'.$baseversion;
-    $expectprefix= $newdirectory; $expectprefix.= '.orig' if length($difffile);
-    
-    length($tarfile) || &error("no tarfile in Files field");
-    checkstats($tarfile);
-    checkstats($difffile) if length($difffile);
+	&error("Files field contains invalid filename `$file'")
+	    unless s/^\Q$sourcepackage\E_\Q$baseversion\E\b// and
+		   s/\.(gz|bz2)$//;
 
-# tar checking is disabled, there are too many broken tar archives out there
-# which we can still handle anyway.
-#    checktarsane("$dscdir/$tarfile",$expectprefix);
-
-    if (length($difffile)) {
-            
-        &forkgzipread("$dscdir/$difffile");
-        $/="\n";
-	$_ = <GZIP>;
-        while ($_ || !eof(GZIP)) {
-	    # read file header (---/+++ pair)
-	    s/\n$// or &error("diff is missing trailing newline");
-	    /^--- / or &error("expected ^--- in line $. of diff");
-                $fn= $';
-                substr($fn,0,length($expectprefix)+1) eq "$expectprefix/" ||
-                    &error("diff patches file ($fn) not in expected subdirectory");
-                $fn =~ m/\.dpkg-orig$/ &&
-                    &error("diff patches file with name ending .dpkg-orig");
-                $dirname= $fn;
-                if ($dirname =~ s,/[^/]+$,, && !defined($dirincluded{$dirname})) {
-		    $dirtocreate{$dirname} = 1;
-		}
-                defined($notfileobject{$fn}) &&
-                    &error("diff patches something which is not a plain file");
-                $_= <GZIP>; s/\n$// ||
-                    &error("diff finishes in middle of ---/+++ (line $.)");
-                $_ eq '+++ '.$newdirectory.substr($fn,length($expectprefix)) ||
-                    &error("line after --- for file $fn isn't as expected");
-                $filepatched{$fn}++ && &error("diff patches file $fn twice");
-	    # read hunks
-	    my $hunk = 0;
-	    while (($_ = <GZIP>) && !/^--- /) {
-		# read hunk header (@@)
-		s/\n$// or &error("diff is missing trailing newline");
-		next if /^\\ No newline/;
-		/^@@ -\d+(,(\d+))? \+\d+(,(\d+))? @\@$/ or
-		    &error("Expected ^@@ in line $. of diff");
-		my ($olines, $nlines) = ($1 ? $2 : 1, $3 ? $4 : 1);
-		++$hunk;
-		# read hunk
-		while ($olines || $nlines) {
-		    $_ = <GZIP> or &error("unexpected end of diff");
-		    s/\n$// or &error("diff is missing trailing newline");
-		    next if /^\\ No newline/;
-		    if (/^ /) { --$olines; --$nlines; }
-		    elsif (/^-/) { --$olines; }
-		    elsif (/^\+/) { --$nlines; }
-		    else { &error("expected [ +-] at start of line $. of diff"); }
-		}
+	&error("repeated file type - files `$seen{$_}' and `$file'") if $seen{$_};
+	$seen{$_} = $file;
+
+	checkstats($file);
+
+	if (/^\.(orig(-\w+)?\.)?tar$/) {
+	    if ($2) { push @tarfiles, $file; } # push orig-foo.tar.gz to the end
+	    else    { unshift @tarfiles, $file; }
+	    next;
+	}
+
+	if ($revision and s/^-\Q$revision\E\b//) {
+	    if (/^\.diff$/) {
+		$difffile = $file;
+		next;
 	    }
-	    $hunk or &error("expected ^\@\@ at line $. of diff");
-        }
-        close(GZIP);
-        
-        &reapgzip;
+	    if (/^\.debian\.tar$/) {
+		$debianfile = $file;
+		next;
+	    }
+	}
+
+	&error("unrecognised file suffix `$_'");
+    }
+
+    &error("no tarfile in Files field") unless @tarfiles;
+    my $native = !($difffile || $debianfile);
+    if ($native) {
+	&warn("multiple tarfiles in native package") if @tarfiles > 1;
+	&warn("native package with .orig.tar") unless $seen{'.tar'};
+    } else {
+	&warn("no upstream tarfile in Files field") unless $seen{'.orig.tar'};
+	if ($dscformat =~ /^1\./) {
+	    &warn("multiple upstream tarballs in $dscformat format dsc") if @tarfiles > 1;
+	    &warn("debian.tar in $dscformat format dsc") if $debianfile;
+	}
     }
 
+    $newdirectory = $sourcepackage.'-'.$baseversion unless defined($newdirectory);
+    $expectprefix = $newdirectory;
+    $expectprefix .= '.orig' if $difffile || $debianfile;
+    
+    checkdiff("$dscdir/$difffile") if $difffile;
     print("$progname: extracting $sourcepackage in $newdirectory\n")
         || &syserr("write extracting message");
     
     &erasedir($newdirectory);
-    &erasedir("$newdirectory.orig");
-
-    mkdir("$expectprefix.tmp-nest",0755)
-	|| &syserr("unable to create \`$expectprefix.tmp-nest'");
-    system "chmod", "g-s", "$expectprefix.tmp-nest";
-    extracttar("$dscdir/$tarfile","$expectprefix.tmp-nest","$expectprefix");
-    rename("$expectprefix.tmp-nest/$expectprefix","$expectprefix")
-	|| &syserr("unable to rename \`$expectprefix.tmp-nest/$expectprefix' "
-		   ."to \`$expectprefix'");
-    rmdir("$expectprefix.tmp-nest")
-	|| &syserr("unable to remove \`$expectprefix.tmp-nest'");
+    ! -e "$expectprefix"
+	|| rename("$expectprefix","$newdirectory.tmp-keep")
+	|| &syserr("unable to rename `$expectprefix' to `$newdirectory.tmp-keep'");
+
+    push @tarfiles, $debianfile if $debianfile;
+    for my $tarfile (@tarfiles)
+    {
+	my $target;
+	if ($tarfile =~ /\.orig-(\w+)\.tar/) {
+	    my $sub = $1;
+	    $sub =~ s/\d+$// if $sub =~ /\D/;
+	    $target = "$expectprefix/$sub";
+	} elsif ($tarfile =~ /\.debian.tar/) {
+	    $target = "$expectprefix/debian";
+	} else {
+	    $target = $expectprefix;
+	}
+
+	my $tmp = "$target.tmp-nest";
+	(my $t = $target) =~ s!.*/!!;
+
+	mkdir($tmp,0755) || &syserr("unable to create `$tmp'");
+	system "chmod", "g-s", $tmp;
+	print("$progname: unpacking $tarfile\n");
+	extracttar("$dscdir/$tarfile",$tmp,$t);
+	rename("$tmp/$t",$target)
+	    || &syserr("unable to rename `$tmp/$t' to `$target'");
+	rmdir($tmp)
+	    || &syserr("unable to remove `$tmp'");
+
+	# for the first tar file:
+	if ($tarfile eq $tarfiles[0] and !$native)
+	{
+	    # -sp: copy the .orig.tar.gz if required
+	    if ($sourcestyle =~ /p/) {
+		stat("$dscdir/$tarfile") ||
+		    &syserr("failed to stat `$dscdir/$tarfile' to see if need to copy");
+		($dsctardev,$dsctarino) = stat _;
+		if (!stat($tarfile)) {
+		    $! == ENOENT || &syserr("failed to check destination `$tarfile'".
+					    " to see if need to copy");
+		} else {
+		    ($dumptardev,$dumptarino) = stat _;
+		}
+		unless ($dumptardev == $dsctardev && $dumptarino == $dsctarino) {
+		    system('cp','--',"$dscdir/$tarfile", $tarfile);
+		    $? && subprocerr("cp $dscdir/$tarfile to $tarfile");
+		}
+	    }
+	    # -su: keep .orig directory unpacked
+	    elsif ($sourcestyle =~ /u/ and $expectprefix ne $newdirectory) {
+		! -e "$newdirectory.tmp-keep"
+		    || &error("unable to keep orig directory (already exists)");
+		system('cp','-ar','--',$expectprefix,"$newdirectory.tmp-keep");
+		$? && subprocerr("cp $expectprefix to $newdirectory.tmp-keep");
+	    }
+	}
+    }
+
+    my @patches;
+    push @patches, "$dscdir/$difffile" if $difffile;
+
+    if ($debianfile and -d (my $pd = "$expectprefix/debian/patches"))
+    {
+	my @p;
+
+	opendir D, $pd;
+	while (defined ($_ = readdir D))
+	{
+	    # patches match same rules as run-parts
+	    next unless /^[\w-]+$/ and -f "$pd/$_";
+	    my $p = $_;
+	    checkdiff("$pd/$p");
+	    push @p, $p;
+	}
+
+	closedir D;
+
+	push @patches, map "$newdirectory/debian/patches/$_", sort @p;
+    }
 
     for $dircreate (keys %dirtocreate) {
 	$dircreatem= "";
@@ -643,87 +698,71 @@ if ($opmode eq 'build') {
 		    || &syserr("failed to create $dircreatem subdirectory");
 	    }
 	    else {
-		-d _ || &error("diff patches file in directory \`$dircreate',"
+		-d _ || &error("diff patches file in directory `$dircreate',"
 			       ." but $dircreatem isn't a directory !");
 	    }
 	}
     }
-    
-    if (length($difffile)) {
-        rename($expectprefix,$newdirectory) ||
-            &syserr("failed to rename newly-extracted $expectprefix to $newdirectory");
-
-        if ($sourcestyle =~ m/u/) {
-	    mkdir("$expectprefix.tmp-nest",0755)
-		|| &syserr("unable to create \`$expectprefix.tmp-nest'");
-	    system "chmod", "g-s", "$expectprefix.tmp-nest";
-	    extracttar("$dscdir/$tarfile","$expectprefix.tmp-nest",
-		       "$expectprefix");
-	    rename("$expectprefix.tmp-nest/$expectprefix","$expectprefix")
-		|| &syserr("unable to rename \`$expectprefix.tmp-nest/"
-			   ."$expectprefix' to \`$expectprefix'");
-	    rmdir("$expectprefix.tmp-nest")
-		|| &syserr("unable to remove \`$expectprefix.tmp-nest'");
-         } elsif ($sourcestyle =~ m/p/) {
-            stat("$dscdir/$tarfile") ||
-                &syserr("failed to stat \`$dscdir/$tarfile' to see if need to copy");
-            ($dsctardev,$dsctarino) = stat _;
-            $dumptar= $sourcepackage.'_'.$baseversion.'.orig.tar.gz';
-            if (!stat($dumptar)) {
-                $! == ENOENT || &syserr("failed to check destination \`$dumptar'".
-                                        " to see if need to copy");
-            } else {
-                ($dumptardev,$dumptarino) = stat _;
-                if ($dumptardev == $dsctardev && $dumptarino == $dsctarino) {
-                    $dumptar= '';
-                }
-            }
-            if (length($dumptar)) {
-                system('cp','--',"$dscdir/$tarfile","$dumptar");
-                $? && subprocerr("cp $dscdir/$tarfile to $dumptar");
-            }
-        }                
 
-        &forkgzipread("$dscdir/$difffile");
+    if ($newdirectory ne $expectprefix)
+    {
+	rename($expectprefix,$newdirectory) ||
+	    &syserr("failed to rename newly-extracted $expectprefix to $newdirectory");
+
+	# rename the copied .orig directory
+	! -e "$newdirectory.tmp-keep"
+	    || rename("$newdirectory.tmp-keep",$expectprefix)
+	    || &syserr("failed to rename saved $newdirectory.tmp-keep to $expectprefix");
+    }
+
+    for my $patch (@patches) {
+	print("$progname: applying $patch\n");
+	if ($patch =~ /\.(gz|bz2)$/) {
+	    &forkgzipread($patch);
+	    *DIFF = *GZIP;
+	} else {
+	    open DIFF, $patch or &error("can't open diff `$patch'");
+	}
+
         defined($c2= fork) || &syserr("fork for patch");
         if (!$c2) {
-            open(STDIN,"<&GZIP") || &syserr("reopen gzip for patch");
+            open(STDIN,"<&DIFF") || &syserr("reopen gzip for patch");
             chdir($newdirectory) || &syserr("chdir to $newdirectory for patch");
 	    $ENV{'LC_ALL'}= 'C';
 	    $ENV{'LANG'}= 'C';
             exec('patch','-s','-t','-F','0','-N','-p1','-u',
-                 '-V','never','-g0','-b','-z','.dpkg-orig');
-            &syserr("exec patch");
+                 '-V','never','-g0','-b','-z','.dpkg-orig') or &syserr("exec patch");
         }
-        close(GZIP);
+        close(DIFF);
         $c2 == waitpid($c2,0) || &syserr("wait for patch");
         $? && subprocerr("patch");
-        &reapgzip;
 
-        for $fn (keys %filepatched) {
-            $ftr= "$newdirectory/".substr($fn,length($expectprefix)+1).".dpkg-orig";
-            unlink($ftr) || &syserr("remove patch backup file $ftr");
-        }
+	&reapgzip if $patch =~ /\.(gz|bz2)$/;
+    }
 
-        if (!(@s= lstat("$newdirectory/debian/rules"))) {
-            $! == ENOENT || &syserr("cannot stat $newdirectory/debian/rules");
-            &warn("$newdirectory/debian/rules does not exist");
-        } elsif (-f _) {
-            chmod($s[2] | 0111, "$newdirectory/debian/rules") ||
-                &syserr("cannot make $newdirectory/debian/rules executable");
-        } else {
-            &warn("$newdirectory/debian/rules is not a plain file");
-        }
+    for $fn (keys %filepatched) {
+	$ftr= "$newdirectory/".substr($fn,length($expectprefix)+1).".dpkg-orig";
+	unlink($ftr) || &syserr("remove patch backup file $ftr");
+    }
+
+    if (!(@s= lstat("$newdirectory/debian/rules"))) {
+	$! == ENOENT || &syserr("cannot stat $newdirectory/debian/rules");
+	&warn("$newdirectory/debian/rules does not exist");
+    } elsif (-f _) {
+	chmod($s[2] | 0111, "$newdirectory/debian/rules") ||
+	    &syserr("cannot make $newdirectory/debian/rules executable");
+    } else {
+	&warn("$newdirectory/debian/rules is not a plain file");
     }
 
     $execmode= 0777 & ~umask;
-    (@s= stat('.')) || &syserr("cannot stat \`.'");
+    (@s= stat('.')) || &syserr("cannot stat `.'");
     $dirmode= $execmode | ($s[2] & 02000);
     $plainmode= $execmode & ~0111;
     $fifomode= ($plainmode & 0222) | (($plainmode & 0222) << 1);
     for $fn (@filesinarchive) {
 	$fn=~ s,^$expectprefix,$newdirectory,;
-        (@s= lstat($fn)) || &syserr("cannot stat extracted object \`$fn'");
+        (@s= lstat($fn)) || &syserr("cannot stat extracted object `$fn'");
         $mode= $s[2];
         if (-d _) {
             $newmode= $dirmode;
@@ -732,12 +771,12 @@ if ($opmode eq 'build') {
         } elsif (-p _) {
             $newmode= $fifomode;
         } elsif (!-l _) {
-            &internerr("unknown object \`$fn' after extract (mode ".
+            &internerr("unknown object `$fn' after extract (mode ".
                        sprintf("0%o",$mode).")");
         } else { next; }
         next if ($mode & 07777) == $newmode;
         chmod($newmode,$fn) ||
-            &syserr(sprintf("cannot change mode of \`%s' to 0%o from 0%o",
+            &syserr(sprintf("cannot change mode of `%s' to 0%o from 0%o",
                             $fn,$newmode,$mode));
     }
     exit(0);
@@ -752,7 +791,7 @@ sub checkstats {
     $s[7] == $size{$f} || &error("file $f has size $s[7] instead of expected $size{$f}");
     $m= `md5sum`; $? && subprocerr("md5sum $f"); $m =~ s/\n$//;
     $m =~ s/ *-$//; # Remove trailing spaces and -, to work with GNU md5sum
-    $m =~ m/^[0-9a-f]{32}$/ || &failure("md5sum of $f gave bad output \`$m'");
+    $m =~ m/^[0-9a-f]{32}$/ || &failure("md5sum of $f gave bad output `$m'");
     $m eq $md5sum{$f} || &error("file $f has md5sum $m instead of expected $md5sum{$f}");
     open(STDIN,"</dev/null") || &syserr("reopen stdin from /dev/null");
 }
@@ -767,9 +806,9 @@ sub erasedir {
     $? && subprocerr("rm -rf $dir");
     if (!stat($dir)) {
         $! == ENOENT && return;
-        &syserr("unable to check for removal of dir \`$dir'");
+        &syserr("unable to check for removal of dir `$dir'");
     }
-    &failure("rm -rf failed to remove \`$dir'");
+    &failure("rm -rf failed to remove `$dir'");
 }
 
 use strict 'vars';
@@ -789,8 +828,7 @@ sub checktarcpio {
 	$ENV{'LANG'}= 'C';
         open (STDIN,"<&GZIP") || &syserr ("reopen gzip for cpio");
         &cpiostderr;
-        exec ('cpio','-0t');
-	&syserr ("exec cpio");
+        exec ('cpio','-0t') or &syserr ("exec cpio");
     }
     close (GZIP);
 
@@ -804,7 +842,7 @@ sub checktarcpio {
 	$pname =~ y/ -~/?/c;
 
         if ($fn =~ m/\n/) {
-	    &error ("tarfile \`$tarfileread' contains object with".
+	    &error ("tarfile `$tarfileread' contains object with".
 		    " newline in its name ($pname)");
 	}
 
@@ -812,7 +850,7 @@ sub checktarcpio {
 
 	if (! $tarprefix) {
 	    if ($fn =~ m/\n/) {
-                &error("first output from cpio -0t (from \`$tarfileread') ".
+                &error("first output from cpio -0t (from `$tarfileread') ".
                        "contains newline - you probably have an out of ".
                        "date version of cpio.  GNU cpio 2.4.2-2 is known to work");
 	    }
@@ -820,7 +858,7 @@ sub checktarcpio {
 	    # need to check for multiple dots on some operating systems
 	    # empty tarprefix (due to regex failer) will match emptry string
 	    if ($tarprefix =~ /^[.]*$/) {
-		&error("tarfile \`$tarfileread' does not extract into a ".
+		&error("tarfile `$tarfileread' does not extract into a ".
 		       "directory off the current directory ($tarprefix from $pname)");
 	    }
 	}
@@ -828,13 +866,13 @@ sub checktarcpio {
 	my $fprefix = substr ($fn, 0, length ($tarprefix));
         my $slash = substr ($fn, length ($tarprefix), 1);
         if ((($slash ne '/') && ($slash ne '')) || ($fprefix ne $tarprefix)) {
-	    &error ("tarfile \`$tarfileread' contains object ($pname) ".
+	    &error ("tarfile `$tarfileread' contains object ($pname) ".
 		    "not in expected directory ($tarprefix)");
 	}
 
 	# need to check for multiple dots on some operating systems
         if ($fn =~ m/[.]{2,}/) {
-            &error ("tarfile \`$tarfileread' contains object with".
+            &error ("tarfile `$tarfileread' contains object with".
 		    " /../ in its name ($pname)");
 	}
         push (@filesinarchive, $fn);
@@ -866,7 +904,7 @@ sub checktarsane {
 	$ENV{'LC_ALL'}= 'C';
         $ENV{'LANG'}= 'C';
         open (STDIN, "<&GZIP") || &syserr ("reopen gzip for tar -t");
-        exec ('tar', '-vvtf', '-'); &syserr ("exec tar -vvtf -");
+        exec ('tar', '-vvtf', '-') or &syserr ("exec tar -vvtf -");
     }
     close (GZIP);
 
@@ -876,14 +914,14 @@ sub checktarsane {
         chomp;
 
         if (! m,^(\S{10})\s,) {
-            &error("tarfile \`$tarfileread' contains unknown object ".
-                   "listed by tar as \`$_'");
+            &error("tarfile `$tarfileread' contains unknown object ".
+                   "listed by tar as `$_'");
 	}
 	my $mode = $1;
 
         $mode =~ s/^([-dpsl])// ||
-            &error("tarfile \`$tarfileread' contains object \`$fn' with ".
-                   "unknown or forbidden type \`".substr($_,0,1)."'");
+            &error("tarfile `$tarfileread' contains object `$fn' with ".
+                   "unknown or forbidden type `".substr($_,0,1)."'");
         my $type = $&;
 
         if ($mode =~ /^l/) { $_ =~ s/ -> .*//; }
@@ -891,7 +929,7 @@ sub checktarsane {
 
 	my @tarfields = split(' ', $_, 6);
 	if (@tarfields < 6) { 
-	    &error ("tarfile \`$tarfileread' contains incomplete entry \`$_'\n");
+	    &error ("tarfile `$tarfileread' contains incomplete entry `$_'\n");
 	}
 
 	my $tarfn = deoctify ($tarfields[5]);
@@ -914,15 +952,15 @@ sub checktarsane {
 		&& (substr ($fn, 0, 99) eq substr ($tarfn, 0, 99))) {
 		# this file doesn't match because cpio truncated the name
 		# to the first 100 characters.  let it slide for now.
-		&warn ("filename \`$pname' was truncated by cpio;" .
+		&warn ("filename `$pname' was truncated by cpio;" .
 		       " unable to check full pathname");
 		# Since it didn't match, later checks will not be able
 		# to stat this file, so we replace it with the filename
 		# fetched from tar.
 		$filesinarchive[$efix-1] = $tarfn;
 	    } else {
-		&error ("tarfile \`$tarfileread' contains unexpected object".
-			" listed by tar as \`$_'; expected \`$pname'");
+		&error ("tarfile `$tarfileread' contains unexpected object".
+			" listed by tar as `$_'; expected `$pname'");
 	    }
 	}
 
@@ -930,21 +968,21 @@ sub checktarsane {
 	# we still can't allow files to expand into /../
 	# need to check for multiple dots on some operating systems
         if ($tarfn =~ m/[.]{2,}/) {
-            &error ("tarfile \`$tarfileread' contains object with".
+            &error ("tarfile `$tarfileread' contains object with".
 		    "/../ in its name ($pname)");
 	}
 
         if ($tarfn =~ /\.dpkg-orig$/) {
-            &error ("tarfile \`$tarfileread' contains file with name ending in .dpkg-orig");
+            &error ("tarfile `$tarfileread' contains file with name ending in .dpkg-orig");
 	}
 
         if ($mode =~ /[sStT]/ && $type ne 'd') {
-            &error ("tarfile \`$tarfileread' contains setuid, setgid".
-		    " or sticky object \`$pname'");
+            &error ("tarfile `$tarfileread' contains setuid, setgid".
+		    " or sticky object `$pname'");
 	}
 
         if ($tarfn eq "$tarprefix/debian" && $type ne 'd') {
-            &error ("tarfile \`$tarfileread' contains object \`debian'".
+            &error ("tarfile `$tarfileread' contains object `debian'".
                    " that isn't a directory");
 	}
 
@@ -953,8 +991,8 @@ sub checktarsane {
         my $dirname = $tarfn;
 
         if (($dirname =~ s,/[^/]+$,,) && (! defined ($dirincluded{$dirname}))) {
-            &warnerror ("tarfile \`$tarfileread' contains object \`$pname' but its containing ".
-		    "directory \`$dirname' does not precede it");
+            &warnerror ("tarfile `$tarfileread' contains object `$pname' but its containing ".
+		    "directory `$dirname' does not precede it");
 	    $dirincluded{$dirname} = 1;
 	}
 	if ($type eq 'd') { $dirincluded{$tarfn} = 1; }
@@ -972,6 +1010,87 @@ sub checktarsane {
 
 no strict 'vars';
 
+# check diff for sanity, find directories to create as a side effect
+sub checkdiff
+{
+    my $diff = shift;
+    if ($diff =~ /\.(gz|bz2)$/) {
+	&forkgzipread($diff);
+	*DIFF = *GZIP;
+    } else {
+	open DIFF, $diff or &error("can't open diff `$diff'");
+    }
+    $/="\n";
+    $_ = <DIFF>;
+
+  HUNK:
+    while (defined($_) || !eof(DIFF)) {
+	# skip cruft leading up to patch (if any)
+	until (/^--- /) {
+	    last HUNK unless defined ($_ = <DIFF>);
+	}
+	# read file header (---/+++ pair)
+	s/\n$// or &error("diff `$diff' is missing trailing newline");
+	s/^--- // or &error("expected ^--- in line $. of diff `$diff'");
+	s/\t.*//;
+	$_ eq '/dev/null' or s!^(\./)?[^/]+/!$expectprefix/! or
+	    &error("diff `$diff' patches file with no subdirectory");
+	/\.dpkg-orig$/ and
+	    &error("diff `$diff' patches file with name ending .dpkg-orig");
+	$fn = $_;
+
+	(defined($_= <DIFF>) and s/\n$//) or
+	    &error("diff `$diff' finishes in middle of ---/+++ (line $.)");
+
+	s/\t.*//;
+	(s/^\+\+\+ // and s!^(\./)?[^/]+/!!)
+	    or &error("line after --- isn't as expected in diff `$diff' (line $.)");
+
+	if ($fn eq '/dev/null') {
+	    $fn = "$expectprefix/$_";
+	} else {
+	    $_ eq substr($fn, length($expectprefix)+1)
+		or &error("line after --- isn't as expected in diff `$diff' (line $.)");
+	}
+
+	$dirname = $fn;
+	if ($dirname =~ s,/[^/]+$,, && !defined($dirincluded{$dirname})) {
+	    $dirtocreate{$dirname} = 1;
+	}
+	defined($notfileobject{$fn}) &&
+	    &error("diff `$diff' patches something which is not a plain file");
+
+	$filepatched{$fn} eq $diff && &error("diff patches file $fn twice");
+	$filepatched{$fn} = $diff;
+
+	# read hunks
+	my $hunk = 0;
+	while (defined($_ = <DIFF>) && !(/^--- / or /^Index:/)) {
+	    # read hunk header (@@)
+	    s/\n$// or &error("diff `$diff' is missing trailing newline");
+	    next if /^\\ No newline/;
+	    /^@@ -\d+(,(\d+))? \+\d+(,(\d+))? @\@$/ or
+		&error("Expected ^\@\@ in line $. of diff `$diff'");
+	    my ($olines, $nlines) = ($1 ? $2 : 1, $3 ? $4 : 1);
+	    ++$hunk;
+	    # read hunk
+	    while ($olines || $nlines) {
+		defined($_ = <DIFF>) or &error("unexpected end of diff `$diff'");
+		s/\n$// or &error("diff `$diff' is missing trailing newline");
+		next if /^\\ No newline/;
+		if (/^ /) { --$olines; --$nlines; }
+		elsif (/^-/) { --$olines; }
+		elsif (/^\+/) { --$nlines; }
+		else { &error("expected [ +-] at start of line $. of diff `$diff'"); }
+	    }
+	}
+	$hunk or &error("expected ^\@\@ at line $. of diff `$diff'");
+    }
+    close(DIFF);
+    
+    &reapgzip if $diff =~ /\.(gz|bz2)$/;
+}
+
 sub extracttar {
     my ($tarfileread,$dirchdir,$newtopdir) = @_;
     &forkgzipread("$tarfileread");
@@ -979,8 +1098,8 @@ sub extracttar {
     if (!$c2) {
         open(STDIN,"<&GZIP") || &syserr("reopen gzip for tar -xkf -");
         &cpiostderr;
-        chdir("$dirchdir") || &syserr("cannot chdir to \`$dirchdir' for tar extract");
-        exec('tar','-xkf','-'); &syserr("exec tar -xkf -");
+        chdir($dirchdir) || &syserr("cannot chdir to `$dirchdir' for tar extract");
+        exec('tar','-xkf','-') or &syserr("exec tar -xkf -");
     }
     close(GZIP);
     $c2 == waitpid($c2,0) || &syserr("wait for tar -xkf -");
@@ -995,13 +1114,15 @@ sub extracttar {
 	    &syserr("Unable to rename $dirchdir/$dirchdirfiles[0] to ".
 	    "$dirchdir/$newtopdir");
     } else {
-	mkdir("$dirchdir/$newtopdir", 0777) ||
-	    &syserr("Unable to mkdir $dirchdir/$newtopdir");
+	mkdir("$dirchdir/$newtopdir.tmp", 0777) or
+	    &syserr("Unable to mkdir $dirchdir/$newtopdir.tmp");
 	for (@dirchdirfiles) {
-	    rename("$dirchdir/$_", "$dirchdir/$newtopdir/$_") ||
+	    rename("$dirchdir/$_", "$dirchdir/$newtopdir.tmp/$_") or
 		&syserr("Unable to rename $dirchdir/$_ to ".
-		"$dirchdir/$newtopdir/$_");
+		"$dirchdir/$newtopdir.tmp/$_");
 	}
+	rename("$dirchdir/$newtopdir.tmp", "$dirchdir/$newtopdir") or
+	    &syserr("Unable to rename $dirchdir/$newtopdir.tmp to $dirchdir/$newtopdir");
     }
 }
 
@@ -1010,14 +1131,6 @@ sub cpiostderr {
         &syserr("reopen stderr for tar to grep out blocks message");
 }
 
-sub setfile {
-    my ($varref) = @_;
-    if (defined ($$varref)) { 
-	&error ("repeated file type - files " . $$varref . " and $file"); 
-    }
-    $$varref = $file;
-}
-
 sub checktype {
     if (!lstat("$origdir/$fn")) {
         &unrepdiff2("nonexistent",$type{$fn});
@@ -1055,7 +1168,7 @@ sub forkgzipwrite {
     if (!$cgz) {
         open(STDIN,"<&GZIPREAD") || &syserr("reopen gzip pipe"); close(GZIPREAD);
         close(GZIP); open(STDOUT,">&GZIPFILE") || &syserr("reopen tar.gz");
-        exec('gzip','-9'); &syserr("exec gzip");
+        exec('gzip','-9') or &syserr("exec gzip");
     }
     close(GZIPREAD);
     $gzipsigpipeok= 0;
@@ -1063,13 +1176,14 @@ sub forkgzipwrite {
 
 sub forkgzipread {
     local $SIG{PIPE} = 'DEFAULT';
+    my $prog = $_[0] =~ /\.gz$/ ? 'gunzip' : 'bunzip2';
     open(GZIPFILE,"< $_[0]") || &syserr("read file $_[0]");
-    pipe(GZIP,GZIPWRITE) || &syserr("pipe for gunzip");
-    defined($cgz= fork) || &syserr("fork for gunzip");
+    pipe(GZIP,GZIPWRITE) || &syserr("pipe for $prog");
+    defined($cgz= fork) || &syserr("fork for $prog");
     if (!$cgz) {
-        open(STDOUT,">&GZIPWRITE") || &syserr("reopen gunzip pipe"); close(GZIPWRITE);
+        open(STDOUT,">&GZIPWRITE") || &syserr("reopen $prog pipe"); close(GZIPWRITE);
         close(GZIP); open(STDIN,"<&GZIPFILE") || &syserr("reopen input file");
-        exec('gunzip'); &syserr("exec gunzip");
+        exec($prog) or &syserr("exec $prog");
     }
     close(GZIPWRITE);
     $gzipsigpipeok= 1;
@@ -1084,11 +1198,11 @@ sub reapgzip {
 
 sub addfile {
     my ($filename)= @_;
-    stat($filename) || &syserr("could not stat output file \`$filename'");
+    stat($filename) || &syserr("could not stat output file `$filename'");
     $size= (stat _)[7];
     my $md5sum= `md5sum <$filename`;
     $? && &subprocerr("md5sum $filename");
-    $md5sum =~ s/^([0-9a-f]{32})\s*-?\s*\n$/$1/ || &failure("md5sum gave bogus output \`$_'");
+    $md5sum =~ s/^([0-9a-f]{32})\s*-?\s*\n$/$1/ || &failure("md5sum gave bogus output `$_'");
     $f{'Files'}.= "\n $md5sum $size $filename";
 }
 
diff --git a/src/Makefile.am b/src/Makefile.am
index bdccc631f..cbc062825 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,14 +25,15 @@ dpkg_SOURCES = \
 	select.c \
 	update.c
 
-dpkg_LDADD = $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS)
+dpkg_LDADD = \
+	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
 
 dpkg_query_SOURCES = \
 	errors.c \
 	filesdb.c filesdb.h \
 	query.c
 
-dpkg_query_LDADD = $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS)
+dpkg_query_LDADD = $(LIBINTL) ../lib/libdpkg.a
 
 
 install-data-local:
diff --git a/src/Makefile.in b/src/Makefile.in
index 19db2106b..c459903dd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -77,23 +77,15 @@ am_dpkg_OBJECTS = archives.$(OBJEXT) cleanup.$(OBJEXT) \
 dpkg_OBJECTS = $(am_dpkg_OBJECTS)
 am__DEPENDENCIES_1 =
 dpkg_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_dpkg_query_OBJECTS = errors.$(OBJEXT) filesdb.$(OBJEXT) \
 	query.$(OBJEXT)
 dpkg_query_OBJECTS = $(am_dpkg_query_OBJECTS)
-dpkg_query_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+dpkg_query_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/archives.Po ./$(DEPDIR)/cleanup.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/configure.Po ./$(DEPDIR)/depcon.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/enquiry.Po ./$(DEPDIR)/errors.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/filesdb.Po ./$(DEPDIR)/help.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/packages.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/processarc.Po ./$(DEPDIR)/query.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/remove.Po ./$(DEPDIR)/select.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/update.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -113,7 +105,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -173,6 +164,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -185,7 +177,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -199,6 +190,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -253,13 +246,15 @@ dpkg_SOURCES = \
 	select.c \
 	update.c
 
-dpkg_LDADD = $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS)
+dpkg_LDADD = \
+	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
+
 dpkg_query_SOURCES = \
 	errors.c \
 	filesdb.c filesdb.h \
 	query.c
 
-dpkg_query_LDADD = $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS)
+dpkg_query_LDADD = $(LIBINTL) ../lib/libdpkg.a
 all: all-am
 
 .SUFFIXES:
@@ -349,16 +344,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
@@ -463,7 +456,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/src/configure.c b/src/configure.c
index fe9da4d1e..a2494c4a3 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -54,7 +54,7 @@ static enum conffopt promptconfaction(const char* cfgfile, const char* realold,
 		const char* realnew, int useredited, int distedited,
 		enum conffopt what);
 
-extern struct pipef *status_pipes, *log_pipes;
+extern struct pipef *status_pipes;
 
 
 void deferred_configure(struct pkginfo *pkg) {
@@ -643,27 +643,8 @@ static enum conffopt promptconfaction(const char* cfgfile, const char* realold,
 
 	} while (!strchr("yino",cc));
 
-	/* if there's a log file, record conffile decision there */
-	if (log_pipes) {
-	  static struct varbuf *log= NULL;
-	  struct pipef *pipef= log_pipes;
-	  char time_str[20];
-	  time_t now;
-	  int r;
-	  if (log == NULL) {
-	    log = nfmalloc(sizeof(struct varbuf));
-	    varbufinit(log);
-	  } else
-	    varbufreset(log);
-	  time(&now);
-	  strftime(time_str, sizeof(time_str), "%Y-%m-%d %H:%M:%S", gmtime(&now));
-	  r= varbufprintf(log, "%s conffile %s %s\n", time_str, cfgfile,
-			  (cc == 'i' || cc == 'y') ? "install" : "keep");
-	  while (pipef) {
-	    write(pipef->fd, log->buf, r);
-	    pipef= pipef->next;
-	  }
-	}
+	log_message("conffile %s %s", cfgfile,
+		    (cc == 'i' || cc == 'y') ? "install" : "keep");
 
 	switch (cc) {
 		case 'i':
diff --git a/src/help.c b/src/help.c
index 6190ae613..2514ea92a 100644
--- a/src/help.c
+++ b/src/help.c
@@ -481,25 +481,7 @@ void ensure_pathname_nonexisting(const char *pathname) {
 }
 
 void log_action(const char *action, struct pkginfo *pkg) {
-  if (log_pipes) {
-    static struct varbuf *log= NULL;
-    struct pipef *pipef= log_pipes;
-    char time_str[20];
-    time_t now;
-    int r;
-    if (log == NULL) {
-      log = nfmalloc(sizeof(struct varbuf));
-      varbufinit(log);
-    } else
-      varbufreset(log);
-    time(&now);
-    strftime(time_str, sizeof(time_str), "%Y-%m-%d %H:%M:%S", gmtime(&now));
-    r= varbufprintf(log, "%s %s %s %s %s\n", time_str, action,
-		    pkg->name, versiondescribe(&pkg->installed.version, vdew_nonambig),
-		    versiondescribe(&pkg->available.version, vdew_nonambig));
-    while (pipef) {
-      write(pipef->fd, log->buf, r);
-      pipef= pipef->next;
-    }
-  }
+  log_message("%s %s %s %s", action, pkg->name,
+	      versiondescribe(&pkg->installed.version, vdew_nonambig),
+	      versiondescribe(&pkg->available.version, vdew_nonambig));
 }
diff --git a/src/main.c b/src/main.c
index 035569499..a9fd65113 100644
--- a/src/main.c
+++ b/src/main.c
@@ -283,30 +283,6 @@ static void setpipe(const struct cmdinfo *cip, const char *value) {
   (*lastpipe)->next= NULL;
 }
 
-static void setfile(const struct cmdinfo *cip, const char *value) {
-  static struct pipef **lastpipe;
-  int v;
-
-  v= open(value, (O_CREAT|O_APPEND|O_WRONLY), 0644);
-  if (v < 0) {
-    if (getuid() || geteuid())
-      return;
-    else
-      fprintf(stderr, _("couldn't open log `%s': %s\n"),
-	      value, strerror(errno));
-  }
-
-  lastpipe= cip->parg;
-  if (*lastpipe) {
-    (*lastpipe)->next= nfmalloc(sizeof(struct pipef));
-    *lastpipe= (*lastpipe)->next;
-  } else {
-    *lastpipe= nfmalloc(sizeof(struct pipef));
-  }
-  (*lastpipe)->fd= v;
-  (*lastpipe)->next= NULL;
-}
-
 static void setforce(const struct cmdinfo *cip, const char *value) {
   const char *comma;
   size_t l;
@@ -366,6 +342,8 @@ Forcing options marked [*] are enabled by default.\n"),
   }
 }
 
+extern const char *log_file;
+
 static const char okpassshortopts[]= "D";
 
 void execbackend(const char *const *argv) NONRETURNING;
@@ -414,7 +392,7 @@ static const struct cmdinfo cmdinfos[]= {
 */
   
   { "status-fd",	  0,   1,  0,              0,  setpipe, 0, &status_pipes },
-  { "log",	  0,   1,  0,              0,  setfile, 0, &log_pipes },
+  { "log",                0,   1,  0, &log_file,       0                             },
   { "pending",           'a',  0,  &f_pending,     0,  0,             1              },
   { "recursive",         'R',  0,  &f_recursive,   0,  0,             1              },
   { "no-act",             0,   0,  &f_noact,       0,  0,             1              },
diff --git a/utils/Makefile.in b/utils/Makefile.in
index a11b04d8c..07afb8381 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -86,8 +86,6 @@ am__DEPENDENCIES_1 =
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/enoent.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/start-stop-daemon.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -107,7 +105,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BZ2_CFLAGS = @BZ2_CFLAGS@
 BZ2_LIBS = @BZ2_LIBS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -167,6 +164,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSD_LIBS = @SSD_LIBS@
@@ -179,7 +177,6 @@ WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
 WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
 WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
 XGETTEXT = @XGETTEXT@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -193,6 +190,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -337,16 +336,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
@@ -451,7 +448,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"