dpkg (1.13.1.0.1) experimental; urgency=low

  * Bin-MU; recompile against Debian unstable, to make dselect actually
    installable.

 -- Scott James Remnant <scott@netsplit.com>  Fri, 11 Mar 2005 09:00:14 +0000

AUTHORS

@@ -0,0 +1,32 @@
+The C implementation of dpkg was originally written by:
+
+	Ian Jackson <ian@chiark.greenend.org.uk>
+
+based on the Perl implementation by:
+
+	Matt Welsh <mdw@sunsite.unc.edu>
+	Carl Streeter <streeter@cae.wisc.edu>
+	Ian Murdock <imurdock@debian.org>
+
+
+It is currently maintained by:
+
+	Scott James Remnant <scott@netsplit.com>
+
+and has previously been maintained by:
+
+	Adam Heath <doogie@brainfood.com> (2001-2003)
+	Wichert Akkerman <wakkerma@debian.org> (1999-2003)
+	Ben Collins <bcollins@debian.org> (1999-2001)
+	Daniel Jacobowitz <dan@debian.org> (1998)
+	J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl> (1998)
+	James Troup <jjtroup@comp.brad.ac.uk> (1998)
+	Nils Rennebarth <nils@debian.org> (1998)
+	Klee Dienes <klee@debian.org> (1997)
+	Guy Maor <maor@ece.utexas.edu> (1997)
+	Heiko Schlittermann <heiko@lotte.sax.de> (1996)
+
+
+Countless other people have contributed to dpkg (see THANKS) and provided
+code for which they claim copyright (see debian/copyright).  Many thanks
+to them all.

COPYING

@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -279,7 +279,7 @@ POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
 
-	Appendix: How to Apply These Terms to Your New Programs
+	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     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
@@ -305,14 +305,15 @@ the "copyright" line and a pointer to where the full notice is found.
 
     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., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year  name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

INSTALL

@@ -1,3 +1,9 @@
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
 Basic Installation
 ==================
 
@@ -8,20 +14,27 @@ various system-dependent variables used during compilation.  It uses
 those values to create a `Makefile' in each directory of the package.
 It may also create one or more `.h' files containing system-dependent
 definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
 
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
 
 The simplest way to compile this package is:
 
@@ -31,7 +44,7 @@ The simplest way to compile this package is:
      `sh ./configure' instead to prevent `csh' from trying to execute
      `configure' itself.
 
-     Running `configure' takes a while.  While running, it prints some
+     Running `configure' takes awhile.  While running, it prints some
      messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
@@ -55,14 +68,16 @@ Compilers and Options
 =====================
 
    Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+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
+is an example:
 
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
@@ -75,11 +90,11 @@ directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
 
 Installation Names
 ==================
@@ -95,6 +110,11 @@ give `configure' the option `--exec-prefix=PATH', the package will use
 PATH 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
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
@@ -117,22 +137,32 @@ you can use the `configure' options `--x-includes=DIR' and
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
+   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:
+
      CPU-COMPANY-SYSTEM
 
-See the file `config.sub' for the possible values of each field.  If
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
+need to know the machine type.
 
-   If you are building compiler tools for cross-compiling, you can also
+   If you are _building_ compiler tools for cross-compiling, you should
 use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
 
 Sharing Defaults
 ================
@@ -145,32 +175,55 @@ default values for variables like `CC', `cache_file', and `prefix'.
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.
 
-Operation Controls
+Defining Variables
 ==================
 
+   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
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
    `configure' recognizes the following options to control how it
 operates.
 
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
 `--help'
+`-h'
      Print a summary of the options to `configure', and exit.
 
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
 `--quiet'
 `--silent'
 `-q'
-     Do not print messages saying which checks are being made.
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
 
 `--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
 

Makefile.am

@@ -0,0 +1,73 @@
+## Process this file with automake to produce Makefile.in
+
+if WITH_DSELECT
+  MAYBE_DSELECT = dselect
+endif
+
+SUBDIRS = \
+	intl \
+	getopt \
+	lib \
+	src \
+	$(MAYBE_DSELECT) \
+	dpkg-deb \
+	dpkg-split \
+	utils \
+	scripts \
+	po \
+	methods \
+	origins \
+	man
+
+ACLOCAL_AMFLAGS = -I m4
+
+
+dist_pkgdata_DATA = archtable
+
+EXTRA_DIST = \
+	debian/changelog \
+	debian/compat \
+	debian/control \
+	debian/copyright \
+	debian/dpkg-dev.install \
+	debian/dpkg.cfg \
+	debian/dpkg.docs \
+	debian/dpkg.install \
+	debian/dpkg.postinst \
+	debian/dpkg.postrm \
+	debian/dpkg.preinst \
+	debian/dpkg.prerm \
+	debian/dselect.cfg \
+	debian/dselect.install \
+	debian/pseudo-tags \
+	debian/rules \
+	debian/shlibs.default \
+	debian/shlibs.override
+
+
+GAIN_ROOT_COMMAND=fakeroot
+TARGET_ARGS=
+DPKG_BUILDPACKAGE_ARGS=
+LINTIAN_ARGS=
+
+package: distdir
+	cd $(distdir) && dpkg-buildpackage \
+		-r$(GAIN_ROOT_COMMAND) \
+		$(TARGET_ARGS) $(DPKG_BUILDPACKAGE_ARGS)
+	$(am__remove_distdir)
+	@set -e; \
+	if test "x$(TARGET_ARGS)" = "x-S"; then \
+	  arch=source; \
+	else \
+	  arch=`dpkg-architecture $(TARGET_ARGS) -qDEB_HOST_ARCH`; \
+	fi; \
+	changes=$(PACKAGE)_$(VERSION)_$$arch.changes; \
+	test -f $$changes || { echo $$changes missing; exit 1;}; \
+	if which lintian >/dev/null; then \
+	  echo lintian $(LINTIAN_ARGS) $$changes; \
+	  lintian $(LINTIAN_ARGS) $$changes || true; \
+	fi; \
+	(echo "$(distdir) package files ready for upload: "; \
+	  echo $$changes; \
+	  sed -e '1,/^Files:/d;/^$$/,$$d;s/.* //g' $$changes) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'

Makefile.conf.in

@@ -1,101 +0,0 @@
-
-# What are we building anyway?
-PACKAGE			= @PACKAGE@
-VERSION			= @VERSION@
-
-# Directory settings
-prefix			= @prefix@
-exec_prefix		= $(prefix)
-sharedir		= $(prefix)/share
-
-docdir			= $(sharedir)/doc/$(PACKAGE)
-copyingfile		= $(docdir)/copyright
-infodir			= @infodir@
-
-datadir			= @datadir@
-localedir		= $(datadir)/locale
-bindir			= @bindir@
-sbindir			= @sbindir@
-
-libdir			= @libdir@
-dpkglibdir		= $(libdir)/$(PACKAGE)
-dpkgsharedir		= $(sharedir)/$(PACKAGE)
-
-methodsdir		= $(dpkglibdir)/methods
-parsechangelogdir	= $(dpkglibdir)/parsechangelog
-
-admindir		= @admindir@
-
-mandir			= @mandir@
-man1dir			= $(mandir)/man1
-man5dir			= $(mandir)/man5
-man8dir			= $(mandir)/man8
-
-sysconfdir		= @sysconfdir@
-dpkgconfdir		= $(sysconfdir)/$(PACKAGE)
-alternativesdir		= $(sysconfdir)/alternatives
-
-abs_builddir		= @abs_builddir@
-abs_top_srcdir		= @abs_top_srcdir@
-ifeq ($(strip $(srcdir)),$(strip $(top_srcdir)))
-subdir =
-else
-subdir = $(patsubst $(top_srcdir)/%,%,$(srcdir))/
-endif
-PERL			= @PERL@
-mkinstalldirs		= $(SHELL) $(top_srcdir)/mkinstalldirs
-LN			= @LN_S@
-INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= @INSTALL_PROGRAM@
-INSTALL_DATA		= @INSTALL_DATA@
-INSTALL_SCRIPT		= @INSTALL_SCRIPT@
-SED			= @SED@
-RM			= @RM@
-
-CC			= @CC@
-CFLAGS			= @CFLAGS@ @CWARNS@
-
-CXX			= @CXX@
-CXXFLAGS		= @CXXFLAGS@
-
-CPPFLAGS		= @CPPFLAGS@
-LD			= @LD@
-LDFLAGS			= @LDFLAGS@ -L../lib -L../optlib
-LIBS			= @LIBS@ -ldpkg -lopt $(ZLIB_LIBS) $(BZ2LIB_LIBS)
-
-RANLIB			= @RANLIB@
-
-DEFS			= @DEFS@ -D_GNU_SOURCE
-INCLUDE_CFLAGS		= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) -I../include -I.. -I. -I$(top_srcdir)/optlib
-
-NLS_CFLAGS		= -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl -I../intl
-NLS_LIBS		= @INTLLIBS@ 
-
-SSD_LIBS		= @SSD_LIBS@
-
-CURSES_LIBS		= @CURSES_LIBS@
-
-ZLIB_CFLAGS		= @ZLIB_CFLAGS@
-ZLIB_LIBS		= @ZLIB_LIBS@
-ZLIB_LIBS_ALSO_STATIC	= @ZLIB_LIBS_ALSO_STATIC@
-
-BZ2LIB_CFLAGS		= @BZ2LIB_CFLAGS@
-BZ2LIB_LIBS		= @BZ2LIB_LIBS@
-BZ2LIB_LIBS_ALSO_STATIC	= @BZ2LIB_LIBS_ALSO_STATIC@
-
-ALL_CFLAGS		= $(CPPFLAGS) $(CFLAGS) $(DEFS) $(NLS_CFLAGS) $(INCLUDE_CFLAGS) $(ZLIB_CFLAGS) $(BZ2LIB_CFLAGS)
-ALL_CXXFLAGS		= $(ALL_CFLAGS) $(CXXFLAGS)
-
-ALSO_STATIC		= @ALSO_STATIC@
-.c.o:
-	$(CC) $(ALL_CFLAGS) -c $<
-
-.cc.o:
-	$(CXX) $(ALL_CXXFLAGS) -c $<
-
-Makefile: $(srcdir)/Makefile.in
-	(cd $(abs_builddir);CONFIG_FILES=$(subdir)$@ $(abs_builddir)/config.status)
-
-foobar:
-	@echo "srcdir='$(srcdir)'"
-	@echo "subdir='$(subdir)'"

Makefile.in

@@ -1,40 +1,728 @@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-top_srcdir	= @top_srcdir@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-VERSION		= $(shell cat version-nr)
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-GENFILES	= version.h
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-default: all
-include Makefile.conf
+@SET_MAKE@
 
-SUBDIRS		= include optlib lib dpkg-deb split scripts utils main \
-		  @DSELECTDIR@ po methods man doc
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+DIST_COMMON = README $(am__configure_deps) $(dist_pkgdata_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(top_srcdir)/configure \
+	$(top_srcdir)/intl/Makefile.in ABOUT-NLS AUTHORS COPYING \
+	ChangeLog INSTALL NEWS THANKS TODO config.guess config.rpath \
+	config.sub depcomp install-sh missing mkinstalldirs
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+	$(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \
+	$(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = intl/Makefile
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_pkgdata_DATA)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = intl getopt lib src dselect dpkg-deb dpkg-split utils \
+	scripts po methods origins man
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BZ2_CFLAGS = @BZ2_CFLAGS@
+BZ2_LIBS = @BZ2_LIBS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@
+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@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+admindir = @admindir@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+@WITH_DSELECT_TRUE@MAYBE_DSELECT = dselect
+SUBDIRS = \
+	intl \
+	getopt \
+	lib \
+	src \
+	$(MAYBE_DSELECT) \
+	dpkg-deb \
+	dpkg-split \
+	utils \
+	scripts \
+	po \
+	methods \
+	origins \
+	man
 
-all: version.h all-recursive
+ACLOCAL_AMFLAGS = -I m4
+dist_pkgdata_DATA = archtable
+EXTRA_DIST = \
+	debian/changelog \
+	debian/compat \
+	debian/control \
+	debian/copyright \
+	debian/dpkg-dev.install \
+	debian/dpkg.cfg \
+	debian/dpkg.docs \
+	debian/dpkg.install \
+	debian/dpkg.postinst \
+	debian/dpkg.postrm \
+	debian/dpkg.preinst \
+	debian/dpkg.prerm \
+	debian/dselect.cfg \
+	debian/dselect.install \
+	debian/pseudo-tags \
+	debian/rules \
+	debian/shlibs.default \
+	debian/shlibs.override
 
-install: all install-recursive
-	$(mkinstalldirs) $(DESTDIR)$(dpkgconfdir)/origins
-	$(mkinstalldirs) $(DESTDIR)$(dpkgsharedir)/origins
-	$(INSTALL_DATA) $(srcdir)/origin $(DESTDIR)$(dpkgconfdir)/origins/debian
-	$(INSTALL_DATA) $(srcdir)/archtable $(DESTDIR)$(dpkgsharedir)/archtable
+GAIN_ROOT_COMMAND = fakeroot
+TARGET_ARGS = 
+DPKG_BUILDPACKAGE_ARGS = 
+LINTIAN_ARGS = 
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
+.SUFFIXES:
+am--refresh:
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+uninstall-info-am:
+install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
+	@$(NORMAL_INSTALL)
+	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|^.*/||'`"; \
+	  echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+	  $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+	done
+
+uninstall-dist_pkgdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	mkdir $(distdir)
+	$(mkdir_p) $(distdir)/debian $(distdir)/intl $(distdir)/m4 $(distdir)/po
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || mkdir "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="../$(top_distdir)" \
+	        distdir="../$(distdir)/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -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
+	$(am__remove_distdir)
+
+dist-bzip2: distdir
+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    --with-included-gettext \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+distuninstallcheck:
+	@cd $(distuninstallcheck_dir) \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA) config.h
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
-	rm -f $(GENFILES)
 
-distclean: clean distclean-recursive
-	rm -f Makefile.conf Makefile config.cache config.h config.log config.status
-	rm -f automake/gettext.m4 automake/progtest.m4 automake/lcmessage.m4
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-dist_pkgdataDATA
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am
 
-version.h: version-nr
-	echo "#define DPKG_VERSION \"$(VERSION)\" /* This line modified by Makefile */" > version.h
+uninstall-info: uninstall-info-recursive
 
-all-recursive install-recursive clean-recursive distclean-recursive: %-recursive:
-	$(MAKE) $(MFLAGS) $(patsubst %,$*-%,$(SUBDIRS))
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+	check-am clean clean-generic clean-recursive ctags \
+	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
+	dist-tarZ dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-recursive distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dist_pkgdataDATA install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_pkgdataDATA \
+	uninstall-info-am
 
-$(foreach target,all install clean distclean,$(patsubst %,$(target)-%,$(SUBDIRS))):
-	$(MAKE) $(MFLAGS) -C "$(shell echo "$@" | sed 's/[^-]*-//')" "$(shell echo "$@" | sed 's/-.*//')"
 
-.PHONY: all install clean distclean 
-.PHONY: all-recursive install-recursive clean-recursive distclean-recursive
+package: distdir
+	cd $(distdir) && dpkg-buildpackage \
+		-r$(GAIN_ROOT_COMMAND) \
+		$(TARGET_ARGS) $(DPKG_BUILDPACKAGE_ARGS)
+	$(am__remove_distdir)
+	@set -e; \
+	if test "x$(TARGET_ARGS)" = "x-S"; then \
+	  arch=source; \
+	else \
+	  arch=`dpkg-architecture $(TARGET_ARGS) -qDEB_HOST_ARCH`; \
+	fi; \
+	changes=$(PACKAGE)_$(VERSION)_$$arch.changes; \
+	test -f $$changes || { echo $$changes missing; exit 1;}; \
+	if which lintian >/dev/null; then \
+	  echo lintian $(LINTIAN_ARGS) $$changes; \
+	  lintian $(LINTIAN_ARGS) $$changes || true; \
+	fi; \
+	(echo "$(distdir) package files ready for upload: "; \
+	  echo $$changes; \
+	  sed -e '1,/^Files:/d;/^$$/,$$d;s/.* //g' $$changes) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

NEWS

@@ -0,0 +1 @@
+See debian/changelog for major changes between dpkg releases.

README

@@ -0,0 +1,5 @@
+This is dpkg, Debian's package maintenance system.
+
+The primary interface for the dpkg suite is the `dselect' program;
+a more low-level and less user-friendly interface is available in
+the form of the `dpkg' command.

archtable

@@ -1,66 +1,36 @@
-# This file contains a table of known architecture strings, with
-# things to map them to.
+# This file contains the table of known architecture strings.
 #
-# Column 1 contains the $target_cpu-$target_os string as determined
-# by configure.
-# Column 2 contains the Debian architecture string, which is
-# returned by `dpkg --print-installation-architecture'.
-# Column 3 is returned by `dpkg --print-architecture'.
+# Column 1 is determined by dpkg's configure script based on the output
+# of the config.guess script.
+# Column 2 contains the Debian name for the architecture, which is returned
+# by ‘dpkg --print-installation-architecture’.
+# 
+# <cpu-os>			<Debian name>
+i386-linux			i386
+ia64-linux			ia64
+alpha-linux			alpha
+x86_64-linux			amd64
+arm-linux			arm
+hppa-linux			hppa
+m32r-linux			m32r
+m68k-linux			m68k
+mips-linux			mips
+mipsel-linux			mipsel
+powerpc-linux			powerpc
+s390-linux			s390
+s390x-linux			s390x
+sh3-linux			sh3
+sh3eb-linux			sh3eb
+sh4-linux			sh4
+sh4eb-linux			sh4eb
+sparc-linux			sparc
 
-i386-linux-gnu			i386		i486
-i486-linux-gnu			i386		i486
-i586-linux-gnu			i386		i486
-i686-linux-gnu			i386		i486
-pentium-linux-gnu		i386		i486
-sparc-linux-gnu			sparc		sparc
-sparc64-linux-gnu		sparc		sparc
-alpha-linux-gnu			alpha		alpha
-alphaev4-linux-gnu		alpha		alpha
-alphaev5-linux-gnu		alpha		alpha
-alphaev56-linux-gnu		alpha		alpha
-alphapca56-linux-gnu		alpha		alpha
-alphaev6-linux-gnu		alpha		alpha
-alphaev67-linux-gnu		alpha		alpha
-alphaev68-linux-gnu		alpha		alpha
-m68k-linux-gnu			m68k		m68k
-arm-linux-gnu			arm		arm
-armv3l-linux-gnu		arm		arm
-armv4l-linux-gnu		arm		arm
-ppc-linux-gnu			powerpc		powerpc
-powerpc-linux-gnu		powerpc		powerpc
-powerpc				powerpc		powerpc
-mips-linux-gnu			mips		mips
-mipsel-linux-gnu		mipsel		mipsel
-mipseb-linux-gnu		mips		mips
-i386-gnu			hurd-i386	undefined
-i386-gnu0.2			hurd-i386	undefined
-i386-gnu0.3			hurd-i386	undefined
-i486-gnu0.3			hurd-i386	undefined
-i586-gnu0.3			hurd-i386	undefined
-i686-gnu0.3			hurd-i386	undefined
-ia64-linux-gnu			ia64		ia64
-ia64-unknown-linux		ia64		ia64
-ia64-unknown-linux-gnu		ia64		ia64
-x86_64-linux-gnu		amd64		x86_64
-sh3-linux-gnu			sh3		sh3
-sh4-linux-gnu			sh4		sh4
-sh3eb-linux-gnu			sh3eb		sh3eb
-sh4eb-linux-gnu			sh4eb		sh4eb
-hppa-linux-gnu			hppa		hppa
-hppa1.1-linux-gnu		hppa		hppa
-hppa2.0-linux-gnu		hppa		hppa
-hppa64-linux-gnu		hppa		hppa
-i386-freebsd			freebsd-i386	freebsd-i386
-i386-kfreebsd-gnu		kfreebsd-i386	kfreebsd-i386
-i386-netbsdelf-gnu		netbsd-i386	netbsd-i386
-i386-knetbsd-gnu		knetbsd-i386	knetbsd-i386
-s390-linux-gnu			s390		s390
-s390-ibm-linux-gnu		s390		s390
-s390-unknown-linux-gnu		s390		s390
-i386-openbsd			openbsd-i386	openbsd-i386
-i386-unknown-openbsd		openbsd-i386	openbsd-i386
-powerpc-darwin			darwin-powerpc	darwin-powerpc
-i386-darwin			darwin-i386	darwin-i386
-s390x-linux-gnu			s390x		s390x
-s390x-ibm-linux-gnu		s390x		s390x
-s390x-unknown-linux-gnu		s390x		s390x
+i386-darwin			darwin-i386
+powerpc-darwin			darwin-powerpc
+i386-freebsd			freebsd-i386
+i386-gnu			hurd-i386
+i386-kfreebsd-gnu		kfreebsd-i386
+x86_64-kfreebsd-gnu		kfreebsd-amd64
+i386-knetbsd-gnu		knetbsd-i386
+i386-netbsd			netbsd-i386
+i386-openbsd			openbsd-i386

automake/dpkg.m4

@@ -1,68 +0,0 @@
-dnl DPKG_CACHED_TRY_COMPILE(<description>,<cachevar>,<include>,<program>,<ifyes>,<ifno>)
-AC_DEFUN(DPKG_CACHED_TRY_COMPILE,[
- AC_MSG_CHECKING($1)
- AC_CACHE_VAL($2,[
-  AC_TRY_COMPILE([$3],[$4],[$2=yes],[$2=no])
- ])
- if test "x$$2" = xyes; then
-  true
-  $5
- else
-  true
-  $6
- fi
-])
-
-dnl DPKG_C_GCC_ATTRIBUTE(<short-label>,<cachevar>,<func-params>,<attribute>,<HAVE>,<desc>,[<true-cmds>],[<false-cmds>])
-AC_DEFUN(DPKG_C_GCC_ATTRIBUTE,[
-  DPKG_CACHED_TRY_COMPILE(__attribute__(($1)),dpkg_cv_c_attribute_$2,,
-   [extern int testfunction($3) __attribute__(($4))],
-   AC_MSG_RESULT(yes)
-   AC_DEFINE(HAVE_GNUC25_$5,,$6)
-   $7,
-   AC_MSG_RESULT(no)
-   $8)
-])
-
-dnl DPKG_C_GCC_TRY_WARNS(<warnings>,<cachevar>)
-AC_DEFUN(DPKG_C_GCC_TRY_WARNS,[
- AC_MSG_CHECKING([GCC warning flag(s) $1])
- if test "${GCC-no}" = yes
- then
-  AC_CACHE_VAL($2,[
-    if $CC $1 -c /dev/null 2>/dev/null; then
-      $2=yes
-    else
-      $2=
-    fi
-  ])
-  if test "x$$2" = xyes; then
-   CWARNS="${CWARNS} $1"
-   AC_MSG_RESULT(ok)
-  else
-   AC_MSG_RESULT(no)
-  fi
- else
-  AC_MSG_RESULT(no, not using GCC)
- fi
-])
-dnl DPKG_CACHED_TRY_COMPILE(<description>,<cachevar>,<include>,<program>,<ifyes>,<ifno>)
-
-
-dnl Check if a #define is present in an include file
-AC_DEFUN(DPKG_CHECK_DEFINE,
-  [AC_CACHE_CHECK(if $1 is defined in $2,
-     ac_cv_define_$1,
-     [AC_TRY_COMPILE([
-#include <$2>
-        ],[
-int i = $1;
-        ],
-        ac_cv_define_$1=yes,
-        ac_cv_define_$1=no)
-     ])
-   if test "$ac_cv_define_$1" = yes ; then
-    AC_DEFINE(HAVE_$1,,[define if $1 is defined])
-  fi
-])
-

automake/tl_canon.m4

@@ -1,209 +0,0 @@
-# Our own versions of the other canonicalizing stuff
-
-dnl replace AC_CANONICAL_xxx
-
-undefine([AC_CANONICAL_HOST])
-define([AC_CANONICAL_HOST], [tl_CANONICAL_HOST])
-undefine([AC_CANONICAL_BUILD])
-define([AC_CANONICAL_BUILD], [tl_CANONICAL_BUILD])
-undefine([AC_CANONICAL_TARGET])
-define([AC_CANONICAL_TARGET], [tl_CANONICAL_TARGET])
-undefine([AC_CANONICAL_SYSTEM])
-define([AC_CANONICAL_SYSTEM], [tl_CANONICAL_SYSTEM])
-
-dnl Canonicalize the host, target, and build system types.
-AC_DEFUN(tl_CANONICAL_SYSTEM,
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_PROVIDE([AC_CANONICAL_SYSTEM])dnl
-AC_BEFORE([$0], [AC_ARG_PROGRAM])
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) AC_MSG_ERROR(can only configure for one host and one target at a time) ;;
-esac
-
-tl_CANONICAL_HOST
-tl_CANONICAL_TARGET
-tl_CANONICAL_BUILD
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-AC_CHECK_TOOL_PREFIX
-])
-
-dnl Subroutines of tl_CANONICAL_SYSTEM.
-
-AC_DEFUN(tl_CANONICAL_HOST,
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_PROVIDE([AC_CANONICAL_HOST])dnl
-
-# Make sure we can run config.sub.
-if $ac_config_sub sun4 >/dev/null 2>&1; then :
-else AC_MSG_ERROR(can not run $ac_config_sub)
-fi
-
-AC_MSG_CHECKING(host system type)
-
-dnl Set host_alias.
-
-if test "${GCC-no}" = "yes"; then
-changequote(, )dnl
-  libgcc="`${CC} --print-libgcc-file-name`"
-  host_alias="`echo ${libgcc} |
-	sed -e 's,^.*/gcc-lib/,,; s,/libgcc\.a$,,; s,/egcs-,/,; s,/[0-9.][0-9.]*$,,'`"
-  case ${host_alias} in
-   *-linux{,elf,aout})
-    host_alias="`echo ${host_alias} | sed 's/\([^-]*\)-linux.*/\1/'`"
-changequote([, ])dnl
-    if ar p "${libgcc}" __main.o 2>/dev/null | file - 2>/dev/null | grep ELF >/dev/null; then
-      host_alias="${host_alias}-linux"
-    else
-      host_alias="${host_alias}-linuxaout"
-    fi ;;
-  esac
-else
-  host_alias=$host
-  case "$host_alias" in
-  NONE)
-    case "$nonopt" in
-    NONE)
-      if host_alias=`$ac_config_guess`; then host_guessed=y
-      else AC_MSG_ERROR(can not guess host type; you must specify one)
-      fi ;;
-    *) host_alias=$nonopt ;;
-    esac ;;
-  esac
-fi
-
-dnl Set the other host vars.
-changequote(<<, >>)dnl
-host=`$ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-changequote([, ])dnl
-AC_MSG_RESULT($host)
-AC_SUBST(host)dnl
-AC_SUBST(host_alias)dnl
-AC_SUBST(host_cpu)dnl
-AC_SUBST(host_vendor)dnl
-AC_SUBST(host_os)dnl
-])
-
-dnl Internal use only.
-AC_DEFUN(tl_CANONICAL_TARGET,
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_PROVIDE([AC_CANONICAL_TARGET])dnl
-AC_MSG_CHECKING(target system type)
-
-dnl Set target_alias.
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-  target_cpu="`dpkg --print-architecture`"
-  if test "$target_cpu" = ""; then
-   target_alias=$host_alias
-  else
-   target_alias="`echo ${host_alias} | sed 's/[^-]*-/${target_cpu}-/'`"
-  fi
-  ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-dnl Set the other target vars.
-if test $target_alias = $host_alias; then
-  target=$host
-  target_cpu=$host_cpu
-  target_vendor=$host_vendor
-  target_os=$host_os
-elif test $target_alias = "$build_alias"; then
-  target=$build
-  target_cpu=$build_cpu
-  target_vendor=$build_vendor
-  target_os=$build_os
-else
-changequote(<<, >>)dnl
-  target=`$ac_config_sub $target_alias`
-  target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-  target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-  target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-changequote([, ])dnl
-fi
-AC_MSG_RESULT($target)
-AC_SUBST(target)dnl
-AC_SUBST(target_alias)dnl
-AC_SUBST(target_cpu)dnl
-AC_SUBST(target_vendor)dnl
-AC_SUBST(target_os)dnl
-])
-
-AC_DEFUN(tl_CANONICAL_BUILD,
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_PROVIDE([AC_CANONICAL_BUILD])dnl
-
-# Make sure we can run config.sub.
-#if $ac_config_sub sun4 >/dev/null 2>&1; then :
-#else AC_MSG_ERROR(can not run $ac_config_sub)
-#fi
-
-AC_MSG_CHECKING(build system type)
-
-dnl Set build_alias.
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if test "$host_guessed" = "y"; then
-      build_alias=$host_alias
-    else
-      if build_alias=`$ac_config_guess`; then :
-      else build_alias=$host_alias
-      fi
-    fi ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-dnl Set the other build vars.
-if test $build_alias = $host_alias; then
-  build=$host
-  build_cpu=$host_cpu
-  build_vendor=$host_vendor
-  build_os=$host_os
-else
-changequote(<<, >>)dnl
-  build=`$ac_config_sub $build_alias`
-  build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-  build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-  build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-changequote([, ])dnl
-fi
-AC_MSG_RESULT($build)
-AC_SUBST(build)dnl
-AC_SUBST(build_alias)dnl
-AC_SUBST(build_cpu)dnl
-AC_SUBST(build_vendor)dnl
-AC_SUBST(build_os)dnl
-])

automake/tools.m4

@@ -1,233 +0,0 @@
-# tl_CHECK_TOOL_PREFIX will work _BEFORE_ AC_CANONICAL_HOST, etc., has been
-# called. It should be called again after these have been called.
-#
-# Basically we want to check if the host alias specified by the user is
-# different from the build alias. The rules work like this:-
-#
-# If host is not specified, it defaults to NONOPT
-# If build is not specified, it defaults to NONOPT
-# If nonopt is not specified, we guess all other values
-
-dnl Replace AC_CHECK_TOOL_PREFIX
-undefine([AC_CHECK_TOOL_PREFIX])
-define([AC_CHECK_TOOL_PREFIX], [tl_CHECK_TOOL_PREFIX])
-
-AC_DEFUN(tl_CHECK_TOOL_PREFIX,
-[AC_PROVIDE([AC_CHECK_TOOL_PREFIX])
-AC_BEFORE([AC_CANONICAL_HOST])
-AC_BEFORE([AC_CANONICAL_BUILD])
-dnl Quick check
-if test "$host_alias" = ""; then
-  if test $host = NONE && test $build != NONE; then
-    thost=$nonopt
-  else
-    thost=$host
-  fi
-
-  if test $thost != $build && test $thost != NONE; then
-    ac_tool_prefix=${thost}-
-    ac_tool_dir=${thost}
-  else
-    ac_tool_prefix=
-    ac_tool_dir=
-  fi
-else
-  if test $host != $build; then
-    ac_tool_prefix=${host_alias}-
-    ac_tool_dir=${host_alias}
-  else
-    ac_tool_prefix=
-    ac_tool_dir=
-  fi
-fi
-])
-
-dnl replacement for AC_CHECK_TOOL
-undefine([AC_CHECK_TOOL])
-define([AC_CHECK_TOOL], [tl_CHECK_TOOL($1, $2, $3, $4)])
-
-dnl tl_CHECK_TOOL - AC_CHECK_TOOL, with a couple of extra checks
-dnl tl_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH
-dnl [, REJECT]])
-AC_DEFUN(tl_CHECK_TOOL,
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])
-AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2,
-	      ifelse([$3], , [$2], ), $4, $5)
-if test "$ac_tool_dir" != ""; then
-  if test -z "$ac_cv_prog_$1" && test "$5" != "/usr/${ac_tool_dir}/bin/$2" &&
-	test "$5" != "/usr/local/${ac_tool_dir}/bin/$2"; then
-    if test -f /usr/${ac_tool_dir}/bin/$2; then $1="/usr/${ac_tool_dir}/bin/$2"
-    elif test -f /usr/local/${ac_tool_dir}/bin/$2; then $1="/usr/local/${ac_tool_dir}/bin/$2"
-    fi
-  fi
-fi
-ifelse([$3], , , [
-if test -z "$ac_cv_prog_$1"; then
-if test -n "$ac_tool_prefix"; then
-  AC_CHECK_PROG($1, $2, $2, $3, $4, $5)
-else
-  $1="$3"
-fi
-fi])
-])
-
-dnl tl_CHECK_TOOLS -
-dnl  do a tl_CHECK_TOOL for multiple tools (like AC_CHECK_PROGS)
-dnl tl_CHECK_TOOLS(VARIABLE, PROGS-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND
-dnl		   [, PATH]])
-AC_DEFUN(tl_CHECK_TOOLS,
-[for ac_tool in $2
-do
-tl_CHECK_TOOL($1, [$]ac_tool, [$]ac_tool, , $4)
-test -n "[$]$1" && break
-done
-ifelse([$3], , , [test -n "[$]$1" || $1="$3"
-])])
-
-dnl replace AC_PROG_CC and AC_PROG_CXX
-undefine([AC_PROG_CC])
-define([AC_PROG_CC], [tl_PROG_CC])
-undefine([AC_PROG_CXX])
-define([AC_PROG_CXX], [tl_PROG_CXX])
-
-dnl tl_PROG_CC, tl_PROG_CXX - same as old AC_PROG_CC and AC_PROG_CXX, but
-dnl use AC_CHECK_TOOL/tl_CHECK_TOOLS instead of AC_CHECK_PROG, etc.
-AC_DEFUN(tl_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_PROVIDE([AC_PROG_CC])dnl
-tl_CHECK_TOOL(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_TOOL(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-if test -n "$ac_tool_prefix" &&
-   test "`echo $CC | grep '$ac_tool_prefix'`" = "" &&
-   test "`echo $CC | grep -- '-b'`" = ""; then
-  if $CC -v 2>&1 | grep -q gcc; then
-    AC_CACHE_CHECK([if $CC -b${ac_tool_dir} works], tl_cv_prog_cc_bhost,[
-    old_cc="${CC}"
-    CC="${CC} -b${ac_tool_dir}"
-    AC_LANG_SAVE
-    AC_LANG_C
-    AC_TRY_COMPILER([main(){return(0);}], tl_cv_prog_cc_bhost, ac_cv_prog_cc_cross)
-    AC_LANG_RESTORE])
-    if test $tl_cv_prog_cc_bhost = "yes"; then
-      ac_cv_prog_cc_works=yes
-      cctest=yes
-    else
-      CC="${old_cc}"
-    fi
-  fi
-fi
-
-if test "$cctest" != "yes"; then
-  tl_PROG_CC_WORKS
-fi
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-AC_DEFUN(tl_PROG_CXX,
-[AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
-AC_PROVIDE([AC_PROG_CXX])dnl
-tl_CHECK_TOOLS(CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
-if test -n "$CXX"; then
-  if test -n "$ac_tool_prefix" &&
-     test "`echo $CXX | grep '$ac_tool_prefix'`" = "" &&
-     test "`echo $CXX | grep -- '-b'`" = ""; then
-    if $CXX -v 2>&1 | grep -q gcc; then
-      AC_CACHE_CHECK([if $CXX -b${ac_tool_dir} works], tl_cv_prog_cxx_bhost,[
-      old_cxx="${CXX}"
-      CXX="${CXX} -b${ac_tool_dir}"
-      AC_LANG_SAVE
-      AC_LANG_CPLUSPLUS
-      AC_TRY_COMPILER([main(){return(0);}], tl_cv_prog_cxx_bhost, ac_cv_prog_cxx_cross)
-      AC_LANG_RESTORE])
-      if test $tl_cv_prog_cxx_bhost = "yes"; then
-	ac_cv_prog_cxx_works=yes
-	cxxtest=yes
-      else
-	CXX="${old_cxx}"
-      fi
-    fi
-  fi
-  
-  if test "$cxxtest" != "yes"; then
-    tl_PROG_CXX_WORKS
-  fi
-  AC_PROG_CXX_GNU
-  
-  if test $ac_cv_prog_gxx = yes; then
-    GXX=yes
-dnl Check whether -g works, even if CXXFLAGS is set, in case the package
-dnl plays around with CXXFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-    ac_test_CXXFLAGS="${CXXFLAGS+set}"
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS=
-    AC_PROG_CXX_G
-    if test "$ac_test_CXXFLAGS" = set; then
-      CXXFLAGS="$ac_save_CXXFLAGS"
-    elif test $ac_cv_prog_cxx_g = yes; then
-      CXXFLAGS="-g -O2"
-    else
-      CXXFLAGS="-O2"
-    fi
-  else
-    GXX=
-    test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
-  fi
-fi
-])
-
-AC_DEFUN(tl_PROG_CC_WORKS,
-[AC_PROVIDE(AC_PROG_CC_WORKS)
-AC_CACHE_CHECK([whether the C compiler ($CC $CFLAGS $LDFLAGS) works],
-	ac_cv_prog_cc_works, [
-AC_LANG_SAVE
-AC_LANG_C
-AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross)
-AC_LANG_RESTORE
-if test $ac_cv_prog_cc_works = no; then
-  AC_MSG_ERROR([installation or configuration problem: C compiler cannot create executables.])
-fi])
-AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler])
-AC_MSG_RESULT($ac_cv_prog_cc_cross)
-cross_compiling=$ac_cv_prog_cc_cross
-])
-
-AC_DEFUN(tl_PROG_CXX_WORKS,
-[AC_PROVIDE(AC_PROG_CXX_WORKS)
-AC_CACHE_CHECK([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works],
-	ac_cv_prog_cxx_works, [
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross)
-AC_LANG_RESTORE
-if test $ac_cv_prog_cxx_works = no; then
-  AC_MSG_ERROR([installation or configuration problem: C++ compiler cannot create executables.])
-fi])
-AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler])
-AC_MSG_RESULT($ac_cv_prog_cxx_cross)
-cross_compiling=$ac_cv_prog_cxx_cross
-])

config.guess

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2004-11-12'
+timestamp='2004-03-12'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -203,15 +203,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     cats:OpenBSD:*:*)
 	echo arm-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -227,12 +227,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    pegasos:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     sun3:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -298,6 +307,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
+	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -319,9 +331,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit 0 ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
 	exit 0 ;;
@@ -345,7 +354,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
 	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+    DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
 	esac ;;
@@ -755,7 +764,7 @@ EOF
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -778,7 +787,21 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	# Determine whether the default compiler uses glibc.
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#if __GLIBC__ >= 2
+	LIBC=gnu
+	#else
+	LIBC=
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -827,12 +850,6 @@ EOF
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit 0 ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit 0 ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -1079,9 +1096,9 @@ EOF
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
 	exit 0 ;;
-    M68*:*:R3V[5678]*:*)
+    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1179,10 +1196,9 @@ EOF
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
+	case `uname -p` in
 	    *86) UNAME_PROCESSOR=i686 ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
+	    powerpc) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
@@ -1244,16 +1260,6 @@ EOF
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

config.h.in

@@ -1,80 +1,174 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Set this to the canonical Debian architecture string for this CPU type. */
 #undef ARCHITECTURE
 
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+#undef CRAY_STACKSEG_END
+
+/* Define to 1 if using `alloca.c'. */
+#undef C_ALLOCA
+
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 #undef ENABLE_NLS
 
+/* Define to 1 if you have `alloca', as a function or macro. */
+#undef HAVE_ALLOCA
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+#undef HAVE_ALLOCA_H
+
 /* Define to 1 if you have the `alphasort' function. */
 #undef HAVE_ALPHASORT
 
-/* Define if alphasort is declared. */
-#undef HAVE_ALPHASORT_DECLARATION
+/* Define to 1 if you have the <argz.h> header file. */
+#undef HAVE_ARGZ_H
+
+/* Define to 1 if you have the `asprintf' function. */
+#undef HAVE_ASPRINTF
+
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
 
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
+/* Define to 1 if the compiler supports C99. */
+#undef HAVE_C99
 
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+/* Define to 1 if compiler supports `__attribute__', 0 otherwise. */
+#undef HAVE_C_ATTRIBUTE
 
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT
 
+/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
+   don't. */
+#undef HAVE_DECL_FEOF_UNLOCKED
+
+/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
+   you don't. */
+#undef HAVE_DECL_FGETS_UNLOCKED
+
+/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
+   don't. */
+#undef HAVE_DECL_GETC_UNLOCKED
+
 /* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
    don't. */
 #undef HAVE_DECL_SYS_SIGLIST
 
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
+/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL__SNPRINTF
+
+/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL__SNWPRINTF
 
 /* Define to 1 if you have the <error.h> header file. */
 #undef HAVE_ERROR_H
 
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
+/* Define to 1 if you have the `fwprintf' function. */
+#undef HAVE_FWPRINTF
+
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
 
-/* Define if function attributes a la GCC 2.5 and higher are available. */
-#undef HAVE_GNUC25_ATTRIB
+/* Define to 1 if you have the `getegid' function. */
+#undef HAVE_GETEGID
 
-/* Define if constant functions a la GCC 2.5 and higher are available. */
-#undef HAVE_GNUC25_CONST
+/* Define to 1 if you have the `geteuid' function. */
+#undef HAVE_GETEUID
 
-/* Define if nonreturning functions a la GCC 2.5 and higher are available. */
-#undef HAVE_GNUC25_NORETURN
+/* Define to 1 if you have the `getgid' function. */
+#undef HAVE_GETGID
 
-/* Define if printf-format argument lists a la GCC are available. */
-#undef HAVE_GNUC25_PRINTFFORMAT
+/* Define to 1 if you have the `getpagesize' function. */
+#undef HAVE_GETPAGESIZE
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
 
-/* Define if unused variables la GCC 2.5 and higher are available. */
-#undef HAVE_GNUC25_UNUSED
+/* Define to 1 if you have the `getuid' function. */
+#undef HAVE_GETUID
 
 /* Define if you have the iconv() function. */
 #undef HAVE_ICONV
 
-/* Define if inline functions a la GCC are available. */
-#undef HAVE_INLINE
+/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
+#undef HAVE_INTMAX_T
 
-/* Define to 1 if you have the <inttypes.h> header file. */
+/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
 #undef HAVE_INTTYPES_H
 
+/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
+   declares uintmax_t. */
+#undef HAVE_INTTYPES_H_WITH_UINTMAX
+
+/* Define to 1 if you have the `isascii' function. */
+#undef HAVE_ISASCII
+
+/* Define to 1 if you have the <kvm.h> header file. */
+#undef HAVE_KVM_H
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#undef HAVE_LANGINFO_CODESET
+
 /* Define to 1 if you have the `lchown' function. */
 #undef HAVE_LCHOWN
 
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
+/* Define if you have the 'long double' type. */
+#undef HAVE_LONG_DOUBLE
+
+/* Define if you have the 'long long' type. */
+#undef HAVE_LONG_LONG
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the `mempcpy' function. */
+#undef HAVE_MEMPCPY
+
+/* Define to 1 if you have a working `mmap' system call. */
+#undef HAVE_MMAP
+
+/* Define to 1 if you have the `munmap' function. */
+#undef HAVE_MUNMAP
+
+/* Define to 1 if you have the <nl_types.h> header file. */
+#undef HAVE_NL_TYPES_H
+
+/* Define if your printf() function supports format strings with positions. */
+#undef HAVE_POSIX_PRINTF
+
+/* Define to 1 if you have the `putenv' function. */
+#undef HAVE_PUTENV
+
 /* Define to 1 if you have the `scandir' function. */
 #undef HAVE_SCANDIR
 
-/* Define if setlocale is available. */
+/* Define to 1 if you have the `setenv' function. */
+#undef HAVE_SETENV
+
+/* Define to 1 if you have the `setlocale' function. */
 #undef HAVE_SETLOCALE
 
 /* Define to 1 if you have the `setsid' function. */
@@ -89,9 +183,22 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
+   uintmax_t. */
+#undef HAVE_STDINT_H_WITH_UINTMAX
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
+/* Define to 1 if you have the `stpcpy' function. */
+#undef HAVE_STPCPY
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define to 1 if you have the `strdup' function. */
+#undef HAVE_STRDUP
+
 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
@@ -107,41 +214,69 @@
 /* Define to 1 if you have the `strtoul' function. */
 #undef HAVE_STRTOUL
 
-/* Define to 1 if you have the <syslog.h> header file. */
-#undef HAVE_SYSLOG_H
-
 /* Define to 1 if you have the <sys/cdefs.h> header file. */
 #undef HAVE_SYS_CDEFS_H
 
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* define if TIOCNOTTY is defined */
+/* Define to 1 if you have the macro `TIOCNOTTY' in `sys/ioctl.h', and to 0 if
+   you don't. */
 #undef HAVE_TIOCNOTTY
 
+/* Define to 1 if you have the `tsearch' function. */
+#undef HAVE_TSEARCH
+
+/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
+#undef HAVE_UINTMAX_T
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
 /* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Whether the va_copy macro exists */
-#undef HAVE_VA_COPY
+/* Define if you have the 'unsigned long long' type. */
+#undef HAVE_UNSIGNED_LONG_LONG
 
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
+/* Define to 1 if the `va_copy' macro exists */
+#undef HAVE_VA_COPY
 
 /* Define to 1 if you have the `vsnprintf' function. */
 #undef HAVE_VSNPRINTF
 
-/* Defined to the $(libdir) location */
-#undef LLIBDIR
+/* Define if you have the 'wchar_t' type. */
+#undef HAVE_WCHAR_T
+
+/* Define to 1 if you have the `wcslen' function. */
+#undef HAVE_WCSLEN
+
+/* Define if you have the 'wint_t' type. */
+#undef HAVE_WINT_T
 
-/* Defined to $(localstatedir) dir location */
-#undef LOCALSTATEDIR
+/* Define to 1 if you have the `__argz_count' function. */
+#undef HAVE___ARGZ_COUNT
+
+/* Define to 1 if you have the `__argz_next' function. */
+#undef HAVE___ARGZ_NEXT
+
+/* Define to 1 if you have the `__argz_stringify' function. */
+#undef HAVE___ARGZ_STRINGIFY
+
+/* Define to 1 if you have the `__fsetlocking' function. */
+#undef HAVE___FSETLOCKING
+
+/* Define as const if the declaration of iconv() needs const. */
+#undef ICONV_CONST
+
+/* Define if integer division by zero raises signal SIGFPE. */
+#undef INTDIV0_RAISES_SIGFPE
 
 /* Name of package */
 #undef PACKAGE
@@ -161,21 +296,36 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
+#undef PRI_MACROS_BROKEN
+
 /* The size of a `unsigned int', as computed by sizeof. */
 #undef SIZEOF_UNSIGNED_INT
 
 /* The size of a `unsigned long', as computed by sizeof. */
 #undef SIZEOF_UNSIGNED_LONG
 
+/* Define as the maximum value of type 'size_t', if the system doesn't define
+   it. */
+#undef SIZE_MAX
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
+#undef STACK_DIRECTION
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Define if start-stop-daemon is compiled. */
-#undef USE_START_STOP_DAEMON
-
 /* Version number of package */
 #undef VERSION
 
+/* Define to 1 if start-stop-daemon is compiled. */
+#undef WITH_START_STOP_DAEMON
+
 /* 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
@@ -183,6 +333,11 @@
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
@@ -198,176 +353,25 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef mode_t
 
+/* Define to `long' if <sys/types.h> does not define. */
+#undef off_t
+
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
-/* Define to `int' if <sys/types.h> does not define. */
+/* Define to `int' if <malloc.h> does not define. */
 #undef ptrdiff_t
 
+/* Define to empty if the C compiler doesn't support this keyword. */
+#undef signed
+
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-
-/* Use the definitions: */
-
-/* Give us an unsigned 32-bit data type. */
-#if SIZEOF_UNSIGNED_LONG==4
-#define UWORD32 unsigned long
-#elif SIZEOF_UNSIGNED_INT==4
-#define UWORD32 unsigned int
-#else
-#error I do not know what to use for a UWORD32.
-#endif
-
-/* The maximum length of a #! interpreter displayed by dpkg-deb. */
-#ifdef PATH_MAX
-#define INTERPRETER_MAX PATH_MAX
-#else
-#define INTERPRETER_MAX 1024
-#endif
-
-/* GNU C attributes. */
-#ifndef FUNCATTR
-#ifdef HAVE_GNUC25_ATTRIB
-#define FUNCATTR(x) __attribute__(x)
-#else
-#define FUNCATTR(x)
-#endif
-#endif
-
-/* GNU C printf formats, or null. */
-#ifndef ATTRPRINTF
-#ifdef HAVE_GNUC25_PRINTFFORMAT
-#define ATTRPRINTF(si,tc) format(printf,si,tc)
-#else
-#define ATTRPRINTF(si,tc)
-#endif
-#endif
-#ifndef PRINTFFORMAT
-#define PRINTFFORMAT(si,tc) FUNCATTR((ATTRPRINTF(si,tc)))
-#endif
-
-/* GNU C nonreturning functions, or null. */
-#ifndef ATTRNORETURN
-#ifdef HAVE_GNUC25_NORETURN
-#define ATTRNORETURN noreturn
-#else /* ! HAVE_GNUC25_NORETURN */
-#define ATTRNORETURN
-#endif /* HAVE_GNUC25_NORETURN */
-#endif /* ATTRNORETURN */
-
-#ifndef NONRETURNING
-#define NONRETURNING FUNCATTR((ATTRNORETURN))
-#endif /* NONRETURNING */
-
-/* Combination of both the above. */
-#ifndef NONRETURNPRINTFFORMAT
-#define NONRETURNPRINTFFORMAT(si,tc) FUNCATTR((ATTRPRINTF(si,tc),ATTRNORETURN))
-#endif
-
-/* GNU C constant functions, or null. */
-#ifndef ATTRCONST
-#ifdef HAVE_GNUC25_CONST
-#define ATTRCONST const
-#else
-#define ATTRCONST
-#endif
-#endif
-#ifndef CONSTANT
-#define CONSTANT FUNCATTR((ATTRCONST))
-#endif
-
-/* GNU C unused functions, or null. */
-#ifndef ATTRUNUSED
-#ifdef HAVE_GNUC25_UNUSED
-#define ATTRUNUSED
-#else
-#define ATTRUNUSED
-#endif
-#endif
-#ifndef UNUSED
-#define UNUSED FUNCATTR((ATTRUNUSED))
-#endif
-
-/* Declare strerror if we don't have it already. */
-#ifndef HAVE_STRERROR
-const char *strerror(int);
-#endif
-
-/* Declare strsignal if we don't have it already. */
-#ifndef HAVE_STRSIGNAL
-const char *strsignal(int);
-#endif
-
-/* Declare scandir if we don't have it already. */
-#ifndef HAVE_SCANDIR
-struct dirent;
-int scandir(const char *dir, struct dirent ***namelist,
-            int (*select)(const struct dirent *),
-            int (*compar)(const void*, const void*));
-#endif
-
-/* Declare alphasort if we don't have it already. */
-#if !defined(HAVE_ALPHASORT) || !defined(HAVE_ALPHASORT_DECLARATION)
-struct dirent;
-int alphasort(const struct dirent *a, const struct dirent *b);
-#endif
-
-/* Declare unsetenv if we don't have it already. */
-#ifndef HAVE_UNSETENV
-void unsetenv(const char *x);
-#endif
-
-/* Define strtoul if we don't have it already. */
-#ifndef HAVE_STRTOUL
-#define strtoul strtol
-#endif
-
-#ifndef HAVE_VA_COPY
-#define va_copy(dest,src)	(dest) = (src)
-#endif
-
-/* Define WCOREDUMP if we don't have it already - coredumps won't be
- * detected, though.
- */
-#ifndef WCOREDUMP
-#define WCOREDUMP(x) 0
-#endif
-
-/* Set BUILDOLDPKGFORMAT to 1 to build old-format archives by default.
- */
-#ifndef BUILDOLDPKGFORMAT
-#define BUILDOLDPKGFORMAT 0
-#endif
-
-/* Take care of NLS matters.  */
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#if !HAVE_SETLOCALE
-# define setlocale(Category, Locale) /* empty */
-#endif
-
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-# define N_(Text) Text
-#else
-# undef bindtextdomain
-# define bindtextdomain(Domain, Directory) /* empty */
-# undef textdomain
-# define textdomain(Domain) /* empty */ 
-# define _(Text) Text
-# define N_(Text) Text
-# define gettext(Text) Text
-#endif
-
+/* Define to unsigned long or unsigned long long if <stdint.h> and
+   <inttypes.h> don't define. */
+#undef uintmax_t
 
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+   code using `volatile' can become incorrect without. Disable with care. */
+#undef volatile

config.rpath

@@ -2,13 +2,28 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2005 Free Software Foundation, Inc.
+#   Copyright 1996-2003 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
-#   This file is free software; the Free Software Foundation gives
-#   unlimited permission to copy and/or distribute it, with or without
-#   modifications, as long as this notice is preserved.
+#   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 of the License, 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 to the GNU General Public License, if you
+#   distribute this file as part of a program that contains a
+#   configuration script generated by Autoconf, you may include it under
+#   the same distribution terms that you use for the rest of that program.
 #
 # The first argument passed to this file is the canonical host specification,
 #    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
@@ -35,8 +50,6 @@ host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
-
 # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
 
 wl=
@@ -47,13 +60,6 @@ else
     aix*)
       wl='-Wl,'
       ;;
-    darwin*)
-      case "$cc_basename" in
-        xlc*)
-          wl='-Wl,'
-          ;;
-      esac
-      ;;
     mingw* | pw32* | os2*)
       ;;
     hpux9* | hpux10* | hpux11*)
@@ -65,19 +71,13 @@ else
     newsos6)
       ;;
     linux*)
-      case $cc_basename in
-        icc* | ecc*)
-          wl='-Wl,'
-          ;;
-        pgcc | pgf77 | pgf90)
+      case $CC in
+        icc|ecc)
           wl='-Wl,'
           ;;
-        ccc*)
+        ccc)
           wl='-Wl,'
           ;;
-        como)
-          wl='-lopt='
-          ;;
       esac
       ;;
     osf3* | osf4* | osf5*)
@@ -96,9 +96,6 @@ else
       ;;
     sysv4*MP*)
       ;;
-    unicos*)
-      wl='-Wl,'
-      ;;
     uts4*)
       ;;
   esac
@@ -141,7 +138,7 @@ if test "$with_gnu_ld" = yes; then
       # that the semantics of dynamic libraries on AmigaOS, at least up
       # to version 4, is to share data among multiple programs linked
       # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we cannot use
+      # behavior of shared libraries on other platforms, we can use
       # them.
       ld_shlibs=no
       ;;
@@ -176,13 +173,6 @@ if test "$with_gnu_ld" = yes; then
     sunos4*)
       hardcode_direct=yes
       ;;
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
@@ -276,7 +266,7 @@ else
       # see comment about different semantics on the GNU ld section
       ld_shlibs=no
       ;;
-    bsdi[45]*)
+    bsdi4*)
       ;;
     cygwin* | mingw* | pw32*)
       # When not using gcc, we currently assume that we are using
@@ -287,17 +277,8 @@ else
       libext=lib
       ;;
     darwin* | rhapsody*)
-      hardcode_direct=no
-      if test "$GCC" = yes ; then
-        :
-      else
-        case "$cc_basename" in
-          xlc*)
-            ;;
-          *)
-            ld_shlibs=no
-            ;;
-        esac
+      if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+        hardcode_direct=no
       fi
       ;;
     dgux*)
@@ -314,7 +295,7 @@ else
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
@@ -457,7 +438,7 @@ case "$host_os" in
     ;;
   beos*)
     ;;
-  bsdi[45]*)
+  bsdi4*)
     ;;
   cygwin* | mingw* | pw32*)
     shrext=.dll
@@ -469,8 +450,6 @@ case "$host_os" in
     ;;
   freebsd1*)
     ;;
-  kfreebsd*-gnu)
-    ;;
   freebsd*)
     ;;
   gnu*)
@@ -507,13 +486,11 @@ case "$host_os" in
     ;;
   linux*)
     ;;
-  knetbsd*-gnu)
-    ;;
   netbsd*)
     ;;
   newsos6)
     ;;
-  nto-qnx*)
+  nto-qnx)
     ;;
   openbsd*)
     ;;
@@ -542,7 +519,7 @@ escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
 shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
-LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
 
 # How to pass a linker flag through the compiler.
 wl="$escaped_wl"

config.sub

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2004-11-30'
+timestamp='2004-03-12'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -145,7 +145,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
@@ -267,7 +267,7 @@ case $basic_machine in
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xscale | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -300,7 +300,7 @@ case $basic_machine in
 	| avr-* \
 	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| clipper-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
@@ -326,9 +326,8 @@ case $basic_machine in
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
 	| msp430-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@@ -343,8 +342,8 @@ case $basic_machine in
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -446,10 +445,6 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
 	cr16c)
 		basic_machine=cr16c-unknown
 		os=-elf
@@ -457,9 +452,6 @@ case $basic_machine in
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
@@ -489,10 +481,6 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -671,6 +659,10 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -751,6 +743,10 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -1033,10 +1029,6 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1067,9 +1059,6 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1305,9 +1294,6 @@ case $os in
 	-kaos*)
 		os=-kaos
 		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
 	-none)
 		;;
 	*)
@@ -1388,9 +1374,6 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
-		os=-mmixware
-		;;
 	*-wec)
 		os=-proelf
 		;;

configure.ac

@@ -0,0 +1,123 @@
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.59)
+AC_INIT([dpkg], [1.13.1], [debian-dpkg@lists.debian.org])
+AC_CONFIG_SRCDIR([lib/dpkg.h])
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_CANONICAL_SYSTEM
+AC_GNU_SOURCE
+
+AM_INIT_AUTOMAKE([1.8 gnu])
+
+AM_GNU_GETTEXT_VERSION(0.14.1)
+AM_GNU_GETTEXT()
+
+# Allow compilation without dselect
+AC_ARG_WITH(dselect,
+	AS_HELP_STRING([--without-dselect],
+		       [don't build dselect package-management frontend]),
+	[build_dselect=$with_dselect],
+	[build_dselect=yes])
+AM_CONDITIONAL(WITH_DSELECT, [test "x$build_dselect" = "xyes"])
+
+# Allow compilation without start-stop-daemon
+AC_ARG_WITH(start-stop-daemon,
+	AS_HELP_STRING([--without-start-stop-daemon],
+		       [don't build or use start-stop-daemon]),
+	[build_start_stop_daemon=$with_start_stop_daemon],
+	[build_start_stop_daemon=yes])
+AM_CONDITIONAL(WITH_START_STOP_DAEMON,
+	[test "x$build_start_stop_daemon" = "xyes"])
+if test "x$build_start_stop_daemon" = "xyes"; then
+   AC_DEFINE(WITH_START_STOP_DAEMON, 1,
+	[Define to 1 if start-stop-daemon is compiled.])
+else
+   AC_DEFINE(WITH_START_STOP_DAEMON, 0)
+fi
+
+# Allow alternate admin directory
+admindir="${localstatedir}/${PACKAGE_NAME}"
+AC_ARG_WITH(admindir,
+	AS_HELP_STRING([--with-admindir=DIR],
+		       [dpkg database directory [[LOCALSTATEDIR/dpkg]]]),
+[case "$with_admindir" in
+      "") AC_MSG_ERROR([invalid admindir specified]) ;;
+      *) admindir="$with_admindir" ;;
+esac])
+AC_SUBST(admindir)
+
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_RANLIB
+DPKG_PROG_PERL
+
+# Checks for operating system services and capabilities.
+AC_SYS_LARGEFILE
+DPKG_ARCHITECTURE
+
+# Checks for libraries.
+DPKG_LIB_ZLIB
+DPKG_LIB_BZ2
+if test "x$build_dselect" = "xyes"; then
+   DPKG_LIB_CURSES
+fi
+if test "x$build_start_stop_daemon" = "xyes"; then
+   DPKG_LIB_SSD
+fi
+
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS([error.h sys/cdefs.h kvm.h])
+DPKG_CHECK_DEFINE(TIOCNOTTY, [sys/ioctl.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_BIGENDIAN
+AC_C_CONST
+AC_C_INLINE
+AC_C_VOLATILE
+DPKG_C_C99
+AC_TYPE_MODE_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+DPKG_TYPE_PTRDIFF_T
+AC_CHECK_SIZEOF(unsigned int)
+AC_CHECK_SIZEOF(unsigned long)
+DPKG_DECL_SYS_SIGLIST
+DPKG_C_ATTRIBUTE
+
+# Checks for library functions.
+DPKG_FUNC_VA_COPY
+AC_CHECK_FUNCS([vsnprintf snprintf strerror strsignal scandir alphasort])
+AC_CHECK_FUNCS([unsetenv lchown setsid bcopy isascii memcpy]) 
+
+SJR_COMPILER_WARNINGS
+SJR_COMPILER_OPTIMISATIONS
+SJR_LINKER_OPTIMISATIONS
+
+AC_CONFIG_FILES([ Makefile
+		  dpkg-deb/Makefile
+		  dpkg-split/Makefile
+		  dselect/Makefile
+		  getopt/Makefile
+		  intl/Makefile
+		  lib/Makefile
+		  man/Makefile
+		  man/C/Makefile
+		  man/de/Makefile
+		  man/es/Makefile
+		  man/fr/Makefile
+		  man/ja/Makefile
+		  man/pt_BR/Makefile
+		  man/ru/Makefile
+		  man/sv/Makefile
+		  methods/Makefile
+		  origins/Makefile
+		  po/Makefile.in
+		  scripts/Makefile
+		  src/Makefile
+		  utils/Makefile ])
+AC_CONFIG_HEADERS([config.h])
+AC_OUTPUT

configure.in

@@ -1,513 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.53])
-
-AC_INIT(include/dpkg.h.in)
-AC_CONFIG_HEADER(config.h)
-
-ALSO_STATIC=
-AC_ARG_WITH(static-progs,
-[  --with-static-progs     compile static versions of certain binaries as well],
-[case "$withval" in
-  "true" | "yes" )
-    ALSO_STATIC=1
-    ;;
- esac])
-AC_SUBST(ALSO_STATIC)
-
-DSELECTDIR="dselect"
-AC_ARG_WITH(dselect,
-[  --with-dselect          the dselect package-management frontend],
-[case "$withval" in
-  "false" | "no" )
-    DSELECTDIR=""
-    ;;
- esac])
-AC_SUBST(DSELECTDIR)
-
-USE_START_STOP_DAEMON="true"
-AC_ARG_WITH(start-stop-daemon,
-[  --with-start-stop-daemon
-                          start and stop system daemons],
-[case "$withval" in
-  "false" | "no" )
-    USE_START_STOP_DAEMON=""
-    ;;
- esac])
-AC_SUBST(USE_START_STOP_DAEMON)
-if test "$USE_START_STOP_DAEMON" != ""; then
-    AC_DEFINE(USE_START_STOP_DAEMON,,[Define if start-stop-daemon is compiled.])
-fi
-
-USE_SGML_DOC="true"
-AC_ARG_WITH(sgml-doc,
-[  --with-sgml-doc         SGML documentation converted to HTML],
-[case "$withval" in
-  "false" | "no" )
-    USE_SGML_DOC=""
-    ;;
- esac])
-AC_SUBST(USE_SGML_DOC)
-
-admindir="$libdir/db"
-AC_ARG_WITH(admindir,
-[  --with-admindir=DIR     store dpkg database in DIR [LIBDIR/db]],
-[case "$withval" in
-  "" )
-    AC_MSG_ERROR(invalid admindir specified)
-    ;;
-  * )
-    admindir="$withval"
-    ;;
- esac])
-
-
-AC_CHECK_TOOL_PREFIX
-AC_CANONICAL_SYSTEM
-
-AC_CHECK_TOOL(CC, gcc)
-AC_PROG_CC
-AC_PROG_CXX
-AM_CONDITIONAL(HAVE_CPLUSPLUS, [test "$CXX" != ""])
-
-AC_CHECK_TOOL(LD, ld, ld)
-
-PACKAGE=dpkg
-AC_SUBST(PACKAGE)
-VERSION=`cat $srcdir/version-nr`
-AC_SUBST(VERSION)
-
-AC_SYS_LARGEFILE
-
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])
-AC_ARG_PROGRAM
-AC_PROG_MAKE_SET
-
-AC_MSG_CHECKING(dpkg version)
-AC_MSG_RESULT($VERSION)
-
-AC_PREFIX_DEFAULT(/usr)
-
-# OpenBSD has decided to be odd and includ a version number
-# in the final field of the GNU system type.
-# This code strips it out in a generic way.
-os_type=''
-AC_MSG_CHECKING(Operating system type)
-case $target_os in 
-        *linux-gnu* )
-          os_type="linux-gnu";;
-        *linux* )
-          os_type="linux-gnu";;
-        *openbsd* )
-          os_type="openbsd";;
-        *knetbsd*-gnu* )
-          os_type="knetbsd-gnu";;
-        *netbsd* )
-          os_type="netbsd";;
-        *kfreebsd*-gnu* )
-          os_type="kfreebsd-gnu";;
-        *freebsd* )
-          os_type="freebsd";;
-        gnu )
-          os_type="hurd";;
-esac
-if test "x$os_type" = "x"; then
- os_type=$target_os 
-fi
-AC_MSG_RESULT([$os_type])
-AC_SUBST(os_type)
-
-dpkg_archset=''
-AC_MSG_CHECKING(Debian architecture)
-dpkg_archset="`awk '$1 == "'$target_cpu-$os_type'" { print $2 }' $srcdir/archtable`"
-# Finish off
-if test "x$dpkg_archset" = "x"; then
- AC_MSG_RESULT([$target_cpu-$os_type, but not found in archtable])
- dpkg_archset=$target_cpu-$os_type
- else
- AC_MSG_RESULT($dpkg_archset)
-fi
-AC_DEFINE_UNQUOTED(ARCHITECTURE, "${dpkg_archset}", [Set this to the canonical Debian architecture string for this CPU type.])
-
-dnl gettext
-
-ALL_LINGUAS="bs ca cs da de el es eu fr gl he id it ja ko nb nl nn pl pt pt_BR ro ru sk sv tl zh_CN zh_TW"
-AM_GNU_GETTEXT([external])
-AM_PO_SUBDIRS
-if test "x$HAVE_LOCALE_H" = "x"; then
- AC_MSG_CHECKING([whether setlocale() is available])
- HAVE_SETLOCALE=''
- AC_TRY_COMPILE([#include <locale.h>],[ setlocale(0, "bar");], HAVE_SETLOCALE=1;
-  AC_DEFINE(HAVE_SETLOCALE,1,[Define if setlocale is available.])
- )
- if test "x$HAVE_SETLOCALE" = x; then
-  AC_MSG_RESULT(no)
- else
-  AC_MSG_RESULT(yes)
- fi
-fi
-
-dnl Other stuff
-
-AC_STDC_HEADERS
-AC_PROG_RANLIB
-AC_PROG_LN_S
-AC_CHECK_PROG(RM,rm,rm -f)
-AC_CHECK_PROG(SED,sed,sed)
-AC_PROG_INSTALL
-AC_PATH_PROG(PERL,perl,/usr/bin/perl)
-AC_MODE_T
-AC_PID_T
-AC_SIZE_T
-AC_VPRINTF
-AC_C_CONST
-AC_C_BIGENDIAN
-AC_C_INLINE
-AC_CHECK_SIZEOF(unsigned long)
-AC_CHECK_SIZEOF(unsigned int)
-AC_CHECK_TYPE(ptrdiff_t,int)
-AC_CHECK_FUNCS(unsetenv alphasort scandir strerror strsignal strtoul setsid)
-AC_CHECK_FUNCS(vsnprintf lchown snprintf)
-AC_CHECK_HEADERS(sys/cdefs.h syslog.h stddef.h)
-AC_CHECK_HEADERS(error.h locale.h)
-AC_DECL_SYS_SIGLIST
-AC_CHECK_LIB(ihash, ihash_create, SSD_LIBS="-lihash $SSD_LIBS")
-AC_CHECK_LIB(ps, proc_stat_list_create, SSD_LIBS="-lps $SSD_LIBS")
-AC_CHECK_LIB(shouldbeinlibc, fmt_past_time, SSD_LIBS="-lshouldbeinlibc $SSD_LIBS")
-AC_CHECK_LIB(kvm, kvm_openfiles, SSD_LIBS="-lkvm $SSD_LIBS")
-AC_SUBST(SSD_LIBS)
-
-# check for the proper curses library. This can be either
-# -lcurses or -lncurses, we need to check for either one.
-AC_CHECK_LIB(ncurses,initscr, CURSES_LIBS="-lncurses $CURSES_LIBS", AC_CHECK_LIB(curses,initscr, CURSES_LIBS="-lcurses $CURSES_LIBS"))
-if test "x$CURSES_LIBS" = "x"; then
- AC_MSG_WARN(no curses library found)
-fi
-AC_SUBST(CURSES_LIBS)
-
-DPKG_CHECK_DEFINE(TIOCNOTTY,sys/ioctl.h)
-
-ZLIB_CFLAGS=
-ZLIB_LIBS=
-ZLIB_LIBS_ALSO_STATIC=
-AC_ARG_WITH(zlib,
-[  --with-zlib             use zlib for decompression of some gzip files],
-	[use_zlib=$withval],
-	[uze_zlib=no])
-if test "$use_zlib" != "no" ; then
-	ZLIB_CFLAGS=-DUSE_ZLIB
-	if test "$use_zlib" = "static"  ; then
-		ZLIB_LIBS="-Wl,-Bstatic -lz -Wl,-Bdynamic"
-		if test "$ALSO_STATIC"; then
-			ZLIB_LIBS_ALSO_STATIC="-lz"
-		fi
-	else
-		ZLIB_LIBS=-lz
-		ZLIB_LIBS_ALSO_STATIC="-lz"
-	fi
-fi
-AC_SUBST(ZLIB_CFLAGS)
-AC_SUBST(ZLIB_LIBS)
-AC_SUBST(ZLIB_LIBS_ALSO_STATIC)
-
-BZ2LIB_CFLAGS=
-BZ2LIB_LIBS=
-BZ2LIB_LIBS_ALSO_STATIC=
-AC_ARG_WITH(bz2lib,
-[  --with-bz2lib           use bz2lib for decompression of some bzip2 files],
-	[use_bz2lib=$withval],
-	[uze_bz2lib=no])
-if test "$use_bz2lib" != "no" ; then
-	BZ2LIB_CFLAGS=-DUSE_BZ2LIB
-	if test "$use_bz2lib" = "static"  ; then
-		BZ2LIB_LIBS="-Wl,-Bstatic -lbz2 -Wl,-Bdynamic"
-		if test "$ALSO_STATIC"; then
-			BZ2LIB_LIBS_ALSO_STATIC="-lbz2"
-		fi
-	else
-		BZ2LIB_LIBS=-lbz2
-		BZ2LIB_LIBS_ALSO_STATIC="-lbz2"
-	fi
-fi
-AC_SUBST(BZ2LIB_CFLAGS)
-AC_SUBST(BZ2LIB_LIBS)
-AC_SUBST(BZ2LIB_LIBS_ALSO_STATIC)
-
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <dirent.h>
-], alphasort, AC_DEFINE(HAVE_ALPHASORT_DECLARATION,,[Define if alphasort is declared.]))
-
-AC_TRY_COMPILE(,[
-} inline int foo (int x) {], AC_DEFINE(HAVE_INLINE,,[Define if inline functions a la GCC are available.]))
-
-AC_MSG_CHECKING([for va_copy])
-# OpenBSD passes AC_TRY_COMPILE for va_copy even though 
-# it doesn't seem to exist, which is odd. We need to use
-# AC_TRY_RUN.
-AC_TRY_RUN([
-#include <stdarg.h>
-main(){
-va_list v1,v2;
-va_copy(v1, v2);
-exit(0);}
-], [AC_MSG_RESULT(yes)
-AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])],[AC_MSG_RESULT(no)
-AC_MSG_CHECKING([for va_list assignment copy])
-AC_TRY_COMPILE([
-#include <stdarg.h>
-],[
-va_list v1,v2;
-v1 = v2;
-], AC_MSG_RESULT(yes),AC_MSG_ERROR(no))])
-
-DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attributes a la GCC 2.5 and higher are available.],
-  DPKG_C_GCC_ATTRIBUTE(noreturn,noreturn,[int x],noreturn,NORETURN,[Define if nonreturning functions a la GCC 2.5 and higher are available.])
-  DPKG_C_GCC_ATTRIBUTE(const,const,[int x],const,CONST,[Define if constant functions a la GCC 2.5 and higher are available.])
-  DPKG_C_GCC_ATTRIBUTE(unused,unused,[int x],unused,UNUSED,[Define if unused variables la GCC 2.5 and higher are available.])
-  DPKG_C_GCC_ATTRIBUTE(format...,format,[char *y, ...],[format(printf,1,2)],PRINTFFORMAT,[Define if printf-format argument lists a la GCC are available.]))
-
-AC_MSG_CHECKING(whether to use -Werror)
-AC_ARG_WITH(Werror,
-[  --with-Werror           use -Werror when compiling],
-	[warn=-Werror]
-	AC_MSG_RESULT(yes)
-	DPKG_C_GCC_TRY_WARNS(-Werror, dpkg_cv_c_gcc_warn_error),
-	[warn=all]
-	AC_MSG_RESULT(no))
-
-DPKG_C_GCC_TRY_WARNS(-Wall , dpkg_cv_c_gcc_warn_all)
-DPKG_C_GCC_TRY_WARNS(-Wwrite-strings, dpkg_cv_c_gcc_warn_writestrings)
-DPKG_C_GCC_TRY_WARNS(-Wpointer-arith, dpkg_cv_c_gcc_warn_pointerarith)
-DPKG_C_GCC_TRY_WARNS(-Wimplicit -Wnested-externs, dpkg_cv_c_gcc_warn_implicit)
-DPKG_C_GCC_TRY_WARNS(-Wstrict-prototypes, dpkg_cv_c_gcc_strict_prototypes)
-DPKG_C_GCC_TRY_WARNS(-Wmissing-prototypes, dpkg_cv_c_gcc_missing_prototypes)
-DPKG_C_GCC_TRY_WARNS(-Wmissing-declarations, dpkg_cv_c_gcc_missing_declarations)
-DPKG_C_GCC_TRY_WARNS(-Wbad-function-cast, dpkg_cv_c_gcc_func_cast)
-DPKG_C_GCC_TRY_WARNS(-Wcast-qual -Wcast-align, dpkg_cv_c_gcc_cast_qual)
-DPKG_C_GCC_TRY_WARNS(-Winline, dpkg_cv_c_gcc_inline)
-DPKG_C_GCC_TRY_WARNS(-Wmissing-noreturn, dpkg_cv_c_gcc_noreturn)
-DPKG_C_GCC_TRY_WARNS(-Wsign-compare, dpkg_cv_c_gcc_comp_conv)
-AC_SUBST(CWARNS)
-
-dnl fix up patchs. We can not use variable references paths since 
-dnl that breaks DocBook
-expandvar() { echo $(eval echo $1) ; }
-
-test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
-LLIBDIR=`eval echo $libdir`
-LLIBDIR=`eval echo $LLIBDIR`
-LOCALSTATEDIR="$(expandvar $localstatedir)"
-AC_DEFINE_UNQUOTED(LLIBDIR, "$LLIBDIR", [Defined to the $(libdir) location])
-AC_DEFINE_UNQUOTED(LOCALSTATEDIR, "$LOCALSTATEDIR", [Defined to $(localstatedir) dir location])
-
-admindir=$(expandvar "$admindir")
-bindir=$(expandvar "$bindir")
-datadir=$(expandvar "$datadir")
-includedirdir=$(expandvar "$includedirdir")
-libdir=$(expandvar "$libdir")
-libexecdir=$(expandvar "$libexecdir")
-localstatedir=$(expandvar "$localstatedir")
-mandir=$(expandvar "$mandir")
-sbindir=$(expandvar "$sbindir")
-sharedstatedir=$(expandvar "$sharedstatedir")
-sysconfdir=$(expandvar "$sysconfdir")
-infodir=$(expandvar "$infodir")
-
-AC_SUBST(admindir)
-
-AH_BOTTOM([#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-
-/* Use the definitions: */
-
-/* Give us an unsigned 32-bit data type. */
-#if SIZEOF_UNSIGNED_LONG==4
-#define UWORD32 unsigned long
-#elif SIZEOF_UNSIGNED_INT==4
-#define UWORD32 unsigned int
-#else
-#error I do not know what to use for a UWORD32.
-#endif
-
-/* The maximum length of a #! interpreter displayed by dpkg-deb. */
-#ifdef PATH_MAX
-#define INTERPRETER_MAX PATH_MAX
-#else
-#define INTERPRETER_MAX 1024
-#endif
-
-/* GNU C attributes. */
-#ifndef FUNCATTR
-#ifdef HAVE_GNUC25_ATTRIB
-#define FUNCATTR(x) __attribute__(x)
-#else
-#define FUNCATTR(x)
-#endif
-#endif
-
-/* GNU C printf formats, or null. */
-#ifndef ATTRPRINTF
-#ifdef HAVE_GNUC25_PRINTFFORMAT
-#define ATTRPRINTF(si,tc) format(printf,si,tc)
-#else
-#define ATTRPRINTF(si,tc)
-#endif
-#endif
-#ifndef PRINTFFORMAT
-#define PRINTFFORMAT(si,tc) FUNCATTR((ATTRPRINTF(si,tc)))
-#endif
-
-/* GNU C nonreturning functions, or null. */
-#ifndef ATTRNORETURN
-#ifdef HAVE_GNUC25_NORETURN
-#define ATTRNORETURN noreturn
-#else /* ! HAVE_GNUC25_NORETURN */
-#define ATTRNORETURN
-#endif /* HAVE_GNUC25_NORETURN */
-#endif /* ATTRNORETURN */
-
-#ifndef NONRETURNING
-#define NONRETURNING FUNCATTR((ATTRNORETURN))
-#endif /* NONRETURNING */
-
-/* Combination of both the above. */
-#ifndef NONRETURNPRINTFFORMAT
-#define NONRETURNPRINTFFORMAT(si,tc) FUNCATTR((ATTRPRINTF(si,tc),ATTRNORETURN))
-#endif
-
-/* GNU C constant functions, or null. */
-#ifndef ATTRCONST
-#ifdef HAVE_GNUC25_CONST
-#define ATTRCONST const
-#else
-#define ATTRCONST
-#endif
-#endif
-#ifndef CONSTANT
-#define CONSTANT FUNCATTR((ATTRCONST))
-#endif
-
-/* GNU C unused functions, or null. */
-#ifndef ATTRUNUSED
-#ifdef HAVE_GNUC25_UNUSED
-#define ATTRUNUSED
-#else
-#define ATTRUNUSED
-#endif
-#endif
-#ifndef UNUSED
-#define UNUSED FUNCATTR((ATTRUNUSED))
-#endif
-
-/* Declare strerror if we don't have it already. */
-#ifndef HAVE_STRERROR
-const char *strerror(int);
-#endif
-
-/* Declare strsignal if we don't have it already. */
-#ifndef HAVE_STRSIGNAL
-const char *strsignal(int);
-#endif
-
-/* Declare scandir if we don't have it already. */
-#ifndef HAVE_SCANDIR
-struct dirent;
-int scandir(const char *dir, struct dirent ***namelist,
-            int (*select)(const struct dirent *),
-            int (*compar)(const void*, const void*));
-#endif
-
-/* Declare alphasort if we don't have it already. */
-#if !defined(HAVE_ALPHASORT) || !defined(HAVE_ALPHASORT_DECLARATION)
-struct dirent;
-int alphasort(const struct dirent *a, const struct dirent *b);
-#endif
-
-/* Declare unsetenv if we don't have it already. */
-#ifndef HAVE_UNSETENV
-void unsetenv(const char *x);
-#endif
-
-/* Define strtoul if we don't have it already. */
-#ifndef HAVE_STRTOUL
-#define strtoul strtol
-#endif
-
-#ifndef HAVE_VA_COPY
-#define va_copy(dest,src)	(dest) = (src)
-#endif
-
-/* Define WCOREDUMP if we don't have it already - coredumps won't be
- * detected, though.
- */
-#ifndef WCOREDUMP
-#define WCOREDUMP(x) 0
-#endif
-
-/* Set BUILDOLDPKGFORMAT to 1 to build old-format archives by default.
- */
-#ifndef BUILDOLDPKGFORMAT
-#define BUILDOLDPKGFORMAT 0
-#endif
-
-/* Take care of NLS matters.  */
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#if !HAVE_SETLOCALE
-# define setlocale(Category, Locale) /* empty */
-#endif
-
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-# define N_(Text) Text
-#else
-# undef bindtextdomain
-# define bindtextdomain(Domain, Directory) /* empty */
-# undef textdomain
-# define textdomain(Domain) /* empty */ 
-# define _(Text) Text
-# define N_(Text) Text
-# define gettext(Text) Text
-#endif
-
-])
-
-AC_OUTPUT( po/Makefile.in 
-Makefile.conf
-Makefile
-include/Makefile
-dpkg-deb/Makefile
-split/Makefile
-lib/Makefile
-optlib/Makefile
-doc/Makefile
-man/Makefile
-man/paths.ent
-man/de/Makefile
-man/en/Makefile
-man/es/Makefile
-man/fr/Makefile
-man/ja/Makefile
-man/pt_BR/Makefile
-man/ru/Makefile
-man/sv/Makefile
-scripts/Makefile
-main/Makefile
-dselect/Makefile
-methods/Makefile
-utils/Makefile)

debian/README.compile

@@ -1,16 +0,0 @@
-To compile this package you need to have some less-then-standard packages
-installed. Here's a list:
-
-perl
-debiandoc-sgml
-dpkg-perl
-libpaperg
-lout
-psutils
-sgml-base
-sgml-data
-sgml-tools
-sgmlspm
-sp
-tetex-base
-tetex-bin

debian/changelog

@@ -1,20 +1,64 @@
-dpkg (1.10.28) unstable; urgency=low
+dpkg (1.13.1.0.1) experimental; urgency=low
+
+  * Bin-MU; recompile against Debian unstable, to make dselect actually
+    installable.
+
+ -- Scott James Remnant <scott@netsplit.com>  Fri, 11 Mar 2005 09:00:14 +0000
+
+dpkg (1.13.1) experimental; urgency=low
   
-  The "Awh, yeah?  Ripper!" Release.
+  The "Livin' like a good boy oughta" Release.
+  
+  * Removed dpkg --print-gnu-build-architecture option.  Use variables
+    defined by dpkg-architecture instead.
+  * Soft-deprecated dpkg --print-installation-architecture.  Use
+    dpkg --print-architecture instead, which now does the same thing.
+  * Removed third field from /usr/share/dpkg/archtable.
+
+  * Now we no-longer pre-depend on dselect, check the upgrade will work
+    in preinst and give the user a chance to abort if they haven't yet
+    installed dselect and need to.  Closes: #282335.
+  * Fix handling of GNU longname and longlink when a tarfile entry has
+    both.  Closes: #128388.
+  * md5sum no longer outputs "-" when no argument is supplied.
+    Closes: #164591, #164889.
+  * Add darcs metadirectory to dpkg-source diff ignore list.  Closes: #289760.
+  * Add new '-f' short option to dpkg-query as equivalent to --show-format.
+    Closes: #281627.
+  * Report conffile conflicts and per-package errors on the status-fd.
+    Closes: #297880.
+  * Correct typo in dpkg-architecture.  Closes: #282701.
+  * Fix start-stop-daemon's support for GNU/kFreeBSD.  Closes: #258051.
 
-  * New Translations (Christian Perrier):
-    - Romanian (Eddy Petrisor).  Closes: #309714.
-    - Tagalog (Eric Pareja).  Closes: #296407.
+  * Architecture Support:
+    - Added kfreebsd-amd64.  Closes: #280693.
+    - Added m32r.  Closes: #280710.
+    - Clean up of archtable.  Closes: #118910, #286898.
+    - Clean up of dpkg-architecture.  Closes: #256323.
   * Updated Translations (Christian Perrier):
-    - French (Christian Perrier).
-    - Greek (Konstantinos Margaritis).  Closes: #295922
-    - Indonesian (Arief S Fitrianto).  Closes: #296733
-  * Updated Manpage Translations (Christian Perrier):
-    - French (Philippe Batailler).
-    - Syntax error corrected in Brazilian Portuguese man page for
-      update-alternatives.  Closes: #300646
+    - French (French Team).
+    - Greek (Konstantinos Margaritis).  Closes: #295922.
+
+ -- Scott James Remnant <scott@netsplit.com>  Thu,  3 Mar 2005 12:09:07 +0000
 
- -- Scott James Remnant <scott@netsplit.com>  Thu, 26 May 2005 18:18:10 +0100
+dpkg (1.13.0) experimental; urgency=low
+  
+  The "Three banana strategy" Release.
+
+  * Remove the /usr/info or /usr/info/dir symlinks we used to create.
+    Closes: #206063, #288415.
+  * Fix cast in lvalue assignment that gcc 4.0 doesn't like.
+    Closes: #282669, #284797.
+  * Correct bashism in disk method update script.  Closes: #260568.
+
+  * Scorched-earth reimplementation of the build process and control files
+    with debhelper and automake.  Closes: #217946, #229629, #260568, #266995,
+    #283640, #292973, #293041.
+  * Remove SGML and POD documentation formats due to both licensing and
+    sanity issues.  Closes: #285086.
+  * The dpkg-doc and dpkg-static packages are no more.
+  
+ -- Scott James Remnant <scott@netsplit.com>  Fri, 14 Jan 2005 19:28:00 +0000
 
 dpkg (1.10.27) unstable; urgency=low
 
@@ -22,7 +66,7 @@ dpkg (1.10.27) unstable; urgency=low
 
   * New Translations (Christian Perrier):
     - Indonesian (Arief S Fitrianto).
-    - Norwegian Bokmal (Bjorn Steensrud).
+    - Norwegian Bokmål (Bjorn Steensrud).
   * Updated Translations (Christian Perrier):
     - Dutch (confusing option corrected by Christian Perrier).
     - Galician (Jacobo Tarrio).

debian/compat

@@ -0,0 +1 @@
+4

debian/control

@@ -5,52 +5,29 @@ Maintainer: Dpkg Development <debian-dpkg@lists.debian.org>
 Uploaders: Scott James Remnant <scott@netsplit.com>
 Origin: debian
 Bugs: debbugs://bugs.debian.org
-Standards-Version: 3.5.8
-Build-Depends: debiandoc-sgml, sgml-base (>= 1.9.1), sgmltools-lite, libncurses-dev, gettext (>= 0.12.1-3), zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, autotools-dev
+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
 
 Package: dpkg
 Architecture: any
 Essential: yes
-Pre-Depends: dselect, ${shlibs:Pre-Depends}
+Pre-Depends: ${shlibs:Depends}
 Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg-static, dpkg-dev (<< 1.10)
 Replaces: dpkg-doc-ja, dpkg-static, manpages-de (<= 0.4-3)
+Suggests: apt
 Description: Package maintenance system for Debian
- This package contains the programs which handle the installation and
- removal of packages on your system.
- .
- The primary interface for the dpkg suite is the `dselect' program;
- a more low-level and less user-friendly interface is available in
- the form of the `dpkg' command.
- .
- In order to unpack and build Debian source packages you will need to
- install the developers' package `dpkg-dev' as well as this one.
-
-Package: dpkg-static
-Architecture: any
-Priority: optional
-Pre-Depends: dselect, ${shlibs:Pre-Depends}
-Replaces: dpkg-doc-ja, dpkg, manpages-de (<= 0.4-3)
-Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg, dpkg-dev (<< 1.10)
-Provides: dpkg
-Description: Package maintenance system for Debian (static compile)
- This package contains the programs which handle the installation and
- removal of packages on your system.
- .
- The primary interface for the dpkg suite is the `dselect' program;
- a more low-level and less user-friendly interface is available in
- the form of the `dpkg' command.
+ This package contains the low-level commands for handling the installation
+ and removal of packages on your system.
  .
  In order to unpack and build Debian source packages you will need to
  install the developers' package `dpkg-dev' as well as this one.
- .
- This version has a dpkg binary that is linked statically.
 
 Package: dpkg-dev
 Section: utils
 Priority: standard
 Architecture: all
-Depends: perl5, perl-modules, cpio (>= 2.4.2-2), patch (>= 2.2-1), make, binutils
-Recommends: c-compiler
+Depends: dpkg (>= 1.13.1), perl5, perl-modules, cpio (>= 2.4.2-2), patch (>= 2.2-1), make, binutils
+Recommends: gcc | c-compiler
 Suggests: gnupg, debian-keyring
 Conflicts: dpkgname
 Replaces: dpkgname, dpkg (<< 1.4.1.8), dpkg-doc-ja
@@ -61,22 +38,13 @@ Description: Package building tools for Debian
  Most Debian source packages will require additional tools to build -
  for example, most packages need the `make' and the C compiler `gcc'.
 
-Package: dpkg-doc
-Section: doc
-Priority: optional
-Architecture: all
-Replaces: dpkg-dev (<<1.4.1.19)
-Description: Dpkg Internals Documentation
- This document describes the internal operations of the dpkg program. It
- covers building as well as the internals functions. If you are interested
- in creating your own packages, then you may be more interested in the
- debian-policy package.
-
 Package: dselect
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, dpkg (>= 1.13.1)
 Replaces: dpkg (<< 1.10.3)
 Description: a user tool to manage Debian packages
- dselect is the primary user interface for installing, removing and
- managing Debian packages. It is a front-end to dpkg.
-
+ dselect is an interface for managing the installation and removal of
+ packages on your system.
+ .
+ Many users find dselect intimidating and new users may prefer to use
+ `apt'-based user interfaces.

debian/copyright

@@ -1,46 +1,54 @@
 This is Debian's package maintenance system.
 
-To build your own packages install the `dpkg-dev' package and read the
-manuals which it installs in /usr/share/doc/dpkg and look at the `hello'
-example package.
-
-
-Copyright (C) 2004 Scott James Remnant <scott@netsplit.com>
-Copyright (C) 1994-1999 Ian Jackson <ian@chiark.greenend.org.uk>
-Copyright (C) 1999 Richard Kettlewell <rjk@sfere.greenend.org.uk>
-Copyright (C) 1999-2002 Wichert Akkerman <wakkerma@debian.org>
-Copyright (C) 1999 Ben Collins <bcollins@debian.org>
-Copyright (C) 1997-1998 Juho Vuori <javuori@cc.helsinki.fi>
-Copyright (C) 1998 Nils Rennebarth <nils@debian.org>
-Copyright (C) 1996,1998 Miquel van Smoorenburg <miquels@cistron.nl>
-Copyright (C) 1998 Juan Cespedes <cespedes@debian.org>
-Copyright (C) 1998 Jim Van Zandt <jrv@vanzandt.mv.com>
-copyright (C) 1997 Charles Briscoe-Smith <cpbs@debian.org>
-Copyright (C) 1995,1996 Erick Branderhorst <branderhorst@heel.fgg.eur.nl>
-Copyright (C) 1996 Kim-Minh Kaplan <kkaplan@cdfhp3.in2p3.fr>
-Copyright (C) 1996 Michael Shields <shields@crosslink.net>
-Copyright (C) 1995 Bruce Perens <bruce@pixar.com>
-Copyright (C) 1994 Carl Streeter <streeter@cae.wisc.edu>
-Copyright (C) 1994 Matt Welsh <mdw@sunsite.unc.edu>
-Copyright (C) 1994 Ian Murdock <imurdock@debian.org>
-Parts written by Colin Plumb and Branko Lankester in 1993.
-
-
-This 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 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 with
-your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with
-the dpkg source package as the file COPYING.  If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+Copyright © 2004-2005 Scott James Remnant <scott@netsplit.com>
+Copyright © 2004-2005 Canonical Ltd.
+Copyright © 1999-2002 Wichert Akkerman <wakkerma@debian.org>
+Copyright © 1999-2001 Marcus Brinkmann <brinkmd@debian.org>
+Copyright © 2001 Joey Hess <joeyh@debian.org>
+Copyright © 1994-1999 Ian Jackson <ian@chiark.greenend.org.uk>
+Copyright © 1999 Richard Kettlewell <rjk@sfere.greenend.org.uk>
+Copyright © 1999 Ben Collins <bcollins@debian.org>
+Copyright © 1999 Roderick Shertler <roderick@argon.org>
+Copyright © 1996-1998 Miquel van Smoorenburg <miquels@cistron.nl>
+Copyright © 1997-1998 Juho Vuori <javuori@cc.helsinki.fi>
+Copyright © 1997-1998 Charles Briscoe-Smith <cpbs@debian.org>
+Copyright © 1998 Nils Rennebarth <nils@debian.org>
+Copyright © 1998 Juan Cespedes <cespedes@debian.org>
+Copyright © 1998 Jim Van Zandt <jrv@vanzandt.mv.com>
+Copyright © 1998 Koichi Sekido <sekido@mbox.kyoto-inet.or.jp>
+Copyright © 1995-1996 Erick Branderhorst <branderhorst@heel.fgg.eur.nl>
+Copyright © 1996 Kim-Minh Kaplan <kkaplan@cdfhp3.in2p3.fr>
+Copyright © 1996 Klee Dienes <klee@debian.org>
+Copyright © 1996 Michael Shields <shields@crosslink.net>
+Copyright © 1995 Bruce Perens <bruce@pixar.com>
+Copyright © 1994 Carl Streeter <streeter@cae.wisc.edu>
+Copyright © 1994 Matt Welsh <mdw@sunsite.unc.edu>
+Copyright © 1994 Ian Murdock <imurdock@debian.org>
+
+Includes public domain MD5 code:
+	lib/md5.c and lib/md5.h originally written by Colin Plumb,
+	utils/md5sum.c originally written by Branko Lankester.
+
+Includes code from ‘getopt’ and ‘gettext’:
+	Copyright © 1984-2002 Free Software Foundation, Inc.
+
+
+Licence:
+
+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 of the License, 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.
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License can be found in ‘/usr/share/common-licenses/GPL’ or in the dpkg
+source as the file ‘COPYING’
+
 
 /usr/bin/md5sum is compiled from md5.[ch] (written by Colin Plumb in
 1993 and modified by Ian Jackson in 1995) and md5sum.c (written by

debian/dpkg-dev.conffiles

@@ -1,2 +0,0 @@
-/etc/dpkg/shlibs.default
-/etc/dpkg/shlibs.override

debian/dpkg-dev.install

@@ -0,0 +1,50 @@
+../shlibs.default etc/dpkg
+../shlibs.override etc/dpkg
+
+usr/bin/822-date
+usr/bin/dpkg-architecture
+usr/bin/dpkg-buildpackage
+usr/bin/dpkg-checkbuilddeps
+usr/bin/dpkg-distaddfile
+usr/bin/dpkg-genchanges
+usr/bin/dpkg-gencontrol
+usr/bin/dpkg-name
+usr/bin/dpkg-parsechangelog
+usr/bin/dpkg-scanpackages
+usr/bin/dpkg-scansources
+usr/bin/dpkg-shlibdeps
+usr/bin/dpkg-source
+usr/lib/dpkg/controllib.pl
+usr/lib/dpkg/parsechangelog
+usr/share/man/*/*/822-date.1
+usr/share/man/*/822-date.1
+usr/share/man/*/*/deb-control.5
+usr/share/man/*/deb-control.5
+usr/share/man/*/*/deb-old.5
+usr/share/man/*/deb-old.5
+usr/share/man/*/*/deb.5
+usr/share/man/*/deb.5
+usr/share/man/*/*/dpkg-architecture.1
+usr/share/man/*/dpkg-architecture.1
+usr/share/man/*/*/dpkg-buildpackage.1
+usr/share/man/*/dpkg-buildpackage.1
+usr/share/man/*/*/dpkg-checkbuilddeps.1
+usr/share/man/*/dpkg-checkbuilddeps.1
+usr/share/man/*/*/dpkg-distaddfile.1
+usr/share/man/*/dpkg-distaddfile.1
+usr/share/man/*/*/dpkg-genchanges.1
+usr/share/man/*/dpkg-genchanges.1
+usr/share/man/*/*/dpkg-gencontrol.1
+usr/share/man/*/dpkg-gencontrol.1
+usr/share/man/*/*/dpkg-name.1
+usr/share/man/*/dpkg-name.1
+usr/share/man/*/*/dpkg-parsechangelog.1
+usr/share/man/*/dpkg-parsechangelog.1
+usr/share/man/*/*/dpkg-scanpackages.1
+usr/share/man/*/dpkg-scanpackages.1
+usr/share/man/*/*/dpkg-scansources.1
+usr/share/man/*/dpkg-scansources.1
+usr/share/man/*/*/dpkg-shlibdeps.1
+usr/share/man/*/dpkg-shlibdeps.1
+usr/share/man/*/*/dpkg-source.1
+usr/share/man/*/dpkg-source.1

debian/dpkg-doc.doc-base

@@ -1,11 +0,0 @@
-Document: dpkg-internals
-Title: dpkg Internals Guide
-Author: Klee Dienes <klee@mit.edu>
-Abstract: This manual describes the internal structure of the
- dpkg package management system.
-Section: Apps/System
-
-Format: HTML
-Index: /usr/share/doc/dpkg-doc/internals/index.html
-Files: /usr/share/doc/dpkg-doc/internals/*.html
-

debian/dpkg-doc.postinst

@@ -1,11 +0,0 @@
-#! /bin/sh
-set -e
-
-if [ "$1" = configure ]; then
-    if command -v install-docs >/dev/null 2>&1; then
-	echo -n "Registering DPKG documentation..."
-	install-docs -i /usr/share/doc-base/dpkg-doc
-	echo "done."
-    fi
-fi
-

debian/dpkg-doc.prerm

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    remove|deconfigure|upgrade)
-	if command -v install-docs >/dev/null 2>&1; then
-	    echo -n "Unregistering DPKG documentation..."
-	    install-docs -r dpkg-internals || true
-	    echo "done."
-	fi
-	;;
-esac
-

debian/dpkg.cfg

@@ -1,12 +1,6 @@
 # dpkg configuration file
 #
-# This file can contain default options for dpkg. All commandline
-# options are allowed. Values can be specific by putting them after
-# the option, seperated by whitespace and/or an `=' sign.
+# This file can contain default options for dpkg.  All command-line
+# options are allowed.  Values can be specified by putting them after
+# the option, separated by whitespace and/or an `=' sign.
 #
-# Do not enable debsign by default; since Debian does not use embedded
-# signature debsign would reject all packages.
-no-debsig
-#
-# Allow file overlaps between packages. 
-force-overwrite

debian/dpkg.conffiles

@@ -1,2 +0,0 @@
-/etc/dpkg/origins/debian
-/etc/alternatives/README

debian/dpkg.docs

@@ -0,0 +1,3 @@
+AUTHORS
+THANKS
+debian/pseudo-tags

debian/dpkg.install

@@ -0,0 +1,43 @@
+../dpkg.cfg etc/dpkg
+
+etc/alternatives
+etc/dpkg/origins
+usr/bin/dpkg
+usr/bin/dpkg-deb
+usr/bin/dpkg-query
+usr/bin/dpkg-split
+usr/bin/md5sum
+usr/lib/dpkg/enoent
+usr/lib/dpkg/mksplit
+usr/sbin/start-stop-daemon sbin
+usr/sbin
+usr/share/dpkg
+usr/share/locale
+usr/share/man/*/*/cleanup-info.8
+usr/share/man/*/cleanup-info.8
+usr/share/man/*/*/dpkg-deb.1
+usr/share/man/*/dpkg-deb.1
+usr/share/man/*/*/dpkg-divert.8
+usr/share/man/*/dpkg-divert.8
+usr/share/man/*/*/dpkg-query.1
+usr/share/man/*/dpkg-query.1
+usr/share/man/*/*/dpkg-split.1
+usr/share/man/*/dpkg-split.1
+usr/share/man/*/*/dpkg-statoverride.8
+usr/share/man/*/dpkg-statoverride.8
+usr/share/man/*/*/dpkg.cfg.5
+usr/share/man/*/dpkg.cfg.5
+usr/share/man/*/*/dpkg.1
+usr/share/man/*/dpkg.1
+usr/share/man/*/*/install-info.8
+usr/share/man/*/install-info.8
+usr/share/man/*/*/md5sum.1
+usr/share/man/*/md5sum.1
+usr/share/man/*/*/start-stop-daemon.8
+usr/share/man/*/start-stop-daemon.8
+usr/share/man/*/*/update-alternatives.8
+usr/share/man/*/update-alternatives.8
+var/lib/dpkg/alternatives
+var/lib/dpkg/info
+var/lib/dpkg/parts
+var/lib/dpkg/updates

debian/dpkg.postinst

@@ -1,141 +1,166 @@
-#!/bin/sh
+#!/bin/sh -e
+# This script can be called in the following ways:
+#
+# After the package was installed:
+#	<postinst> configure <old-version>
+#
+#
+# If prerm fails during upgrade or fails on failed upgrade:
+#	<old-postinst> abort-upgrade <new-version>
+#
+# If prerm fails during deconfiguration of a package:
+#	<postinst> abort-deconfigure in-favour <new-package> <version>
+#		   removing <old-package> <version>
+#
+# If prerm fails during replacement due to conflict:
+#	<postinst> abort-remove in-favour <new-package> <version>
 
-set -e
 
-dupdaemonhelp () {
-	cat <<EOF
+# Create the database files if they don't already exist
+create_database() {
+    admindir=/var/lib/dpkg
 
-Some daemons and similar services whose scripts have links in the
-/etc/rcN.d directories have both start (S) and stop (K) links in
-some runlevels.  Thus these services get stopped and immediately
-restarted at some runlevel changes, which is probably not what
-you want.  I can remove the probably-spurious K links if you like.
+    for file in diversions statoverride status; do
+	if [ ! -f "$admindir/$file" ]; then
+	    touch "$admindir/$file"
+	fi
+    done
+}
 
-Type Y to remove then, N to leave them, or L to list them.
-If you don't know what to do you can say N now and then delete
-them by hand later.
 
-EOF
+# Move the info directory from /usr/info to /usr/share/info
+move_info_directory() {
+    if [ -d /usr/info ] && [ ! -L /usr/info ] \
+	&& [ -f /usr/info/dir ] && [ ! -L /usr/info/dir ]
+    then
+	echo "Moving /usr/info/dir to /usr/share/info/dir ..."
+	mv /usr/info/dir /usr/share/info/dir
+	if [ -f /usr/info/dir.old ]; then
+	    mv /usr/info/dir.old /usr/share/info/dir.old
+	fi
+    fi
 }
 
-if [ "x$1" = xconfigure ]; then
-	if [ -z "$2" ] && [ ! -f /etc/dpkg/dpkg.cfg ] ; then
-		cp /usr/share/doc/dpkg/dpkg.cfg /etc/dpkg
-	fi
 
-	case "$2" in
-	0.* | 1.0.* | 1.1.0 | 1.1.0[^0-9]* | '' )
-		for f in 0 1 2 3 4 5 6
-		do
-			cd /etc/rc$f.d
-			for g in K[0-9][0-9]*
-			do
-				if [ -n "`echo \"x$g\" | tr -d 0-9A-Za-z_-`" ]
-				then
-					continue
-				fi
-				h="`echo $g | sed -e 's/^K/S/'`"
-				if ! [ -L $h ] && [ -L $g ] \
-				  || [ "`ls -Li $g 2>/dev/null | awk '{print $1}'`" != \
-				       "`ls -Li $h 2>/dev/null | awk '{print $1}'`" ]
-				then
-					continue
-				fi
-				removes="$removes rc$f.d/$g"
-			done
-		done
-		if [ -n "$removes" ]
-		then
-			cd /etc
-			dupdaemonhelp
-			while [ -n "$removes" ]
-			do
-				echo -n 'y=remove, n=leave, l=list, h=help ?  '
-				read response
-				case "$response" in
-				[Yy]*)
-					echo "Removing duplicate K links ..."
-					rm -v $removes
-					removes=""
-					;;
-				[Nn]*)
-					echo -e "OK, leaving them.\n"
-					removes=""
-					;;
-				[Ll]*)
-					echo
-					echo $removes
-					echo
-					;;
-				[Hh]*)
-					dupdaemonhelp
-					;;
-				esac
-			done
-		fi
-		;;
-	1.1.6 | 1.1.6elf | 1.2.[0123] | 1.2.[0123]elf )
-		response=''
-		while [ -z "$response" ]; do
-			echo -n '
-The version of dpkg you'\''re upgrading from had a problem with the
+# Remove the /usr/info symlinks we used to generate
+remove_info_symlink() {
+    if [ -L /usr/info ]; then
+	echo "Removing /usr/info symlink ..."
+	rm /usr/info
+    elif [ -L /usr/info/dir ]; then
+	echo "Removing /usr/info/dir symlink ..."
+	rm /usr/info/dir
+    fi
+}
+
+
+# Repair damage to /usr/info caused by broken install-info
+fix_damaged_info() {
+    echo -n "
+The version of dpkg you're upgrading from had a problem with the
 install-info program used to maintain the /usr/info/dir file.  It may
 have corrupted the file, for example by placing new entries for the
-menu in it before the `* Menu'\'' line (thus making them ineffective) or
+menu in it before the \`* Menu' line (thus making them ineffective) or
 by creating several identical sections.
 
 I can try to sort these problems out, but beware that this process is
 not guaranteed not to mess up a dir file which has things that look
 like menu entries in the introductory paragraphs.  The distributed dir
-files do not do this, so if you haven'\''t edited /usr/info/dir it'\''s
-almost certainly safe to say `yes'\'' to the next question.
-
-If you say `no'\'' you may wish to check and/or edit /usr/info/dir yourself.
-
-Try to check/repair /usr/info/dir automatically ?  [y/n]  '
-			read response
-			case "$response" in
-			[Yy]* | '')	response=yes ;;
-			[Nn]*)		response=no ;;
-			*)		response='' ;;
-			esac
-		done
-		if [ "$response" = yes ]; then
-			echo "
-Checking/repairing /usr/info/dir ..."
-			cleanup-info --unsafe
-			echo
-		else
-			echo "
-OK.
-"
-		fi
+files do not do this, so if you haven't edited /usr/info/dir it's
+almost certainly safe to say \"yes\" to the next question.
+
+If you say \"no\" you may wish to check and/or edit /usr/info/dir yourself.
+
+Try to check/repair /usr/info/dir automatically ? [y/n] "
+    read response
+    case "$response" in
+	[yY]*|"")
+            echo "Checking/repairing /usr/info/dir ..."
+	    cleanup-info --unsafe
+	    ;;
+	*)
+	    echo "OK, leaving it alone."
+	    ;;
+    esac
+}
+
+
+# Remove stop links from runlevels which also have start links
+# Dates back to the days when update-rc.d was part of dpkg.
+remove_duplicate_daemons() {
+    for lvl in 0 1 2 3 4 5 6; do
+	cd /etc/rc$lvl.d
+	for kill in K[0-9][0-9]*; do
+	    if [ -n "`echo \"x$kill\" | tr -d 0-9A-Za-z_-`" ]; then
+		continue
+	    fi
+
+	    start="`echo $kill | sed -e 's/^K/S/'`"
+	    if ! [ -L $start ] && [ -L $kill ] \
+		|| [ "`ls -Li $kill 2>/dev/null | awk '{print $1}'`" != \
+		"`ls -Li $start 2>/dev/null | awk '{print $1}'`" ]
+	    then
+		continue
+	    fi
+
+	    removes="$removes rc$lvl.d/$kill"
+	done
+    done
+
+    if [ -n "$removes" ]; then
+	echo -n "
+Some daemons and similar services whose scripts have links in the
+/etc/rcN.d directories have both start (S) and stop (K) links in
+some runlevels.  Thus these services get stopped and immediately
+restarted at some runlevel changes, which is probably not what
+you want.
+
+I can remove these probably-spurious K links if you like:
+  $removes
+
+If you're not sure what to do, say \"no\", and then run delete them
+by hand later.
+
+Shall I remove these links ? [y/n] "
+	read response
+	case "$response" in
+	    [yY]*|"")
+                echo "Removing duplicate K links ..."
+		cd /etc
+		rm $removes
+		;;
+	    *)
+	        echo "OK, leaving them."
 		;;
 	esac
-fi
+    fi
+}
 
-if [ -d /usr/info ] && [ ! -L /usr/info ] && [ ! -L /usr/info/dir ] \
-		&& [ -f /usr/info/dir ]; then              
-	echo Moving /usr/info/dir to /usr/share/info/dir.
-	mv /usr/info/dir /usr/share/info/dir
-	if [ -f /usr/info/dir.old ]; then
-		mv /usr/info/dir.old /usr/share/info/dir.old
-	fi
-	if [ "`find /usr/info -empty`" = "/usr/info" ]; then
-		echo Making /usr/info a symlink to /usr/share/info.
-		rmdir /usr/info
-		ln -s share/info /usr/info
-	else
-		echo Making /usr/info/dir a symlink to /usr/share/info/dir.
-		ln -sf ../share/info/dir /usr/info/dir
-	fi
-fi
 
+case "$1" in
+    configure)
+	case "$2" in
+	    0.* | 1.0.* | 1.1.0 | 1.1.0[^0-9]* | '' )
+	        remove_duplicate_daemons
+		;;
+	    1.1.6 | 1.1.6elf | 1.2.[0123] | 1.2.[0123]elf)
+	        fix_damaged_info
+	        ;;
+	esac
+
+	create_database
+	move_info_directory
+	remove_info_symlink
+	;;
 
-cd /var/lib/dpkg
-for f in diversions statoverride status ; do
-	if [ ! -f "$f" ] ; then
-		touch "$f"
-	fi
-done
+    abort-upgrade|abort-deconfigure|abort-remove)
+	;;
+
+    *)
+	echo "$0 called with unknown argument \`$1'" 1>&2
+	exit 1
+	;;
+esac
 
+#DEBHELPER#
+exit 0

debian/dpkg.postrm

@@ -1,10 +1,48 @@
-#!/bin/sh
+#!/bin/sh -e
+# This script can be called in the following ways:
+#
+# After the package was removed:
+#	<postrm> remove
+#
+# After the package was purged:
+#	<postrm> purge
+#
+# After the package was upgraded:
+#	<old-postrm> upgrade <new-version>
+# if that fails:
+#	<new-postrm> failed-upgrade <old-version>
+#
+#
+# After all of the packages files have been replaced:
+#	<postrm> disappear <overwriting-package> <version>
+#
+#
+# If preinst fails during install:
+#	<new-postrm> abort-install
+#
+# If preinst fails during upgrade of removed package:
+#	<new-postrm> abort-install <old-version>
+#
+# If preinst fails during upgrade:
+#	<new-postrm> abort-upgrade <old-version>
 
-set -e
 
-if [ "$1" = "purge" ] ; then
-	rm -f /etc/dpkg/dpkg.cfg
-fi
+case "$1" in
+    remove)
+	;;
+
+    purge)
+	;;
+
+    upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)
+	;;
 
-exit 0
 
+    *)
+	echo "$0 called with unknown argument \`$1'" 1>&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+exit 0

debian/dpkg.preinst

@@ -1,86 +1,175 @@
-#!/bin/sh -
-
-if [ "$1" != "upgrade" ]; then exit 0; fi
-
-set -e
-# i386elf: [ "$2" = "1.4.0.6" ] || dpkg --assert-support-predepends
-
-oldver="$2"
-
-case "$oldver" in
-	0.93.[01234]* | - )	;;
-	* )			exit 0 ;;
-esac
-
-echo '
-contemplating upgrade of dpkg from pre-0.93.50 version ...'
-
-trap 'es=$?; rm -f /var/lib/dpkg/bp.$$; exit $es' 0
-
-perl -000 -ne 'print $x if m/^Package:\s+(\S+\n)/im &&
-			  ($x=$1) ne "dpkg\n" &&
-			  m/^Status:.*(unpacked|postinst)/im' \
-	/var/lib/dpkg/status >/var/lib/dpkg/bp.$$
-
-if test -s /var/lib/dpkg/bp.$$
-then
-	echo '
-
+#!/bin/sh -e
+# This script can be called in the following ways:
+#
+# Before the package is installed:
+#	<new-preinst> install
+#
+# Before removed package is upgraded:
+#	<new-preinst> install <old-version>
+#
+# Before the package is upgraded:
+#	<new-preinst> upgrade <old-version>
+#
+#
+# If postrm fails during upgrade or fails on failed upgrade:
+#	<old-preinst> abort-upgrade <new-version>
+
+
+# Confirm that users are aware that conffile changes will be lost
+confirm_conffile_stomp() {
+    tempfile=/var/lib/dpkg/bp.$$
+
+    trap 'status=$?; rm -f $tempfile; exit $status' 0
+    perl -000 -ne 'print $x if m/^Package:\s+(\S+\n)/im &&
+                               ($x=$1) ne "dpkg\n" &&
+                               m/^Status:.*(unpacked|postinst)/im' \
+        /var/lib/dpkg/status >$tempfile
+
+    if [ -s $tempfile ]; then
+	echo "
 WARNING - have you read the release notes for this upgrade ?
 
-The following packages have been unpacked but not yet configured:'
-	echo '' `cat /var/lib/dpkg/bp.$$`
-	echo -n '
+The following packages have been unpacked but not yet configured:"
+	echo "  "`cat $tempfile`
+
+	echo -n "
 If you proceed with the dpkg upgrade with these packages in this state
 you will LOSE ANY CONFIGURATION CHANGES that have been made to their
 configuration files.  I recommend that you back out of the upgrade
 now (see below) and then configure each of these packages using:
- dpkg --configure --force-hold <package>
+  dpkg --configure --force-hold <package>
 
 If you do this and it fails for some packages they are broken anyway, in
-which case you probably don'"'"'t have that much to lose by going ahead
+which case you probably don't have that much to lose by going ahead
 with the upgrade.
 
-Type "yes" to confirm that you really want to do the upgrade in
-spite of my warning above; if you give any other response we'"'"'ll back
+Type \"yes\" to confirm that you really want to do the upgrade in
+spite of my warning above; if you give any other response we'll back
 off the upgrade to give you a chance to fix things.
 
-Continue with upgrade despite probable loss of config data ? '
+Continue with upgrade despite probable loss of config data ? "
+
 	read response
 	case "$response" in
-	[Yy][Ye][Ss] )	echo OK ... ;;
-	* )		echo 'Aborting dpkg upgrade.'; exit 1 ;;
+	    [Yy][Ee][Ss])
+                echo "OK, going ahead."
+		;;
+	    *)
+	        echo "Aborting dpkg upgrade."
+		exit 1
+		;;
 	esac
-fi
+    fi
 
-echo -n '
+    rm -f $tempfile
+}
+
+
+# Confirm that the user isn't upgrading anything else at the same time
+confirm_singleton() {
+    echo -n "
 IMPORTANT - you must install this upgrade on its own, not together in
 the same dpkg run as any other packages.  Otherwise you risk losing
 configuration information.
 
-If you say "no" to the question below we'"'"'ll back off the upgrade now,
+If you say \"no\" to the question below we'll back off the upgrade now,
 and you can then do it later using:
- dpkg --install dpkg-0.93.51.deb
-If you'"'"'re not sure what to do, say "no", and then run that command
+  dpkg --install dpkg-0.93.51.deb
+
+If you're not sure what to do, say \"no\", and then run that command
 (with the appropriate dpkg-*.deb filename) from a root shell prompt.
 
-Are you installing only the dpkg upgrade in this dpkg run ? [y/n] '
-read response
-case "$response" in
-[yY]* | '' )
-	echo 'OK, going ahead.'
+Are you installing only the dpkg upgrade in this dpkg run ? [y/n] "
+    read response
+    case "$response" in
+	[yY]*|"")
+            echo "OK, going ahead."
+	    ;;
+	*)
+	    echo "Aborting dpkg upgrade."
+	    exit 1
+	    ;;
+    esac
+}
+
+
+# Confirm that dselect got split into it's own package
+confirm_dselect_split() {
+    if ! grep "^Package: *dselect$" /var/lib/dpkg/status >/dev/null; then
+	echo -n "
+IMPORTANT - if you are upgrading this package from within dselect you
+_MUST_ install the dselect package first.
+
+The dselect frontend has been split into a separate \`dselect' package,
+which has not yet been unpacked onto your system.  Continuing the upgrade
+will mean that dselect will temporarily be removed from your system, if
+this happens within dselect the upgrade will fail.
+
+Type \"yes\" to confirm that you really want to do the upgrade in
+spite of my warning above (because you're not running dselect, for
+example); if you give any other response we'll back off the upgrade to
+give you a change to install the dselect package first.
+
+Continue with upgrade despite separation of dselect ? "
+
+	read response
+	case "$response" in
+	    [Yy][Ee][Ss])
+                echo "OK, going ahead."
+		;;
+	    *)
+	        echo "Aborting dpkg upgrade."
+		exit 1
+		;;
+	esac
+    fi
+}
+
+
+# Remove obsolete hd method scripts
+remove_hd_method() {
+    methoddir=/usr/lib/dpkg/methods/hd
+
+    if [ -d $methoddir ]; then
+	echo "Removing obsolete $methoddir ..."
+	rm -r $methoddir
+    fi
+}
+
+
+case "$1" in
+    install)
 	;;
-* )
-	echo '
-Aborting dpkg upgrade (you will see error messages from dpkg about this).'
+
+    upgrade)
+	case "$2" in
+	    # Upgrade from non-C dpkg (pre-0.93.50)
+	    0.93.[01234]* | -)
+	        echo ""
+		echo "Contemplating upgrade of dpkg from pre-0.93.50 version ..."
+
+		confirm_conffile_stomp
+		confirm_singleton
+		confirm_dselect_split
+	        remove_hd_method
+		;;
+	    
+	    # Upgrade from pre-dselect split
+	    0.93.[5678][0-9]* | 1.[023456789]* | 1.1.* | 1.10 | 1.10.[12] )
+	        confirm_dselect_split
+		;;
+	esac
+	;;
+
+    abort-upgrade)
+	;;
+
+
+    *)
+	echo "$0 called with unknown argument \`$1'" 1>&2
 	exit 1
 	;;
 esac
 
-if [ -d /usr/lib/dpkg/methods/hd ]
-then
-	echo 'Removing obsolete /usr/lib/dpkg/methods/hd ...'
-	rm -r /usr/lib/dpkg/methods/hd
-fi
-
+#DEBHELPER#
 exit 0

debian/dpkg.prerm

@@ -1,15 +1,35 @@
-#!/bin/sh
+#!/bin/sh -e
+# This script can be called in the following ways:
+#
+# Before the package is removed:
+#	<prerm> remove
+#
+# Before an upgrade:
+#	<old-prerm> upgrade <new-version>
+# if that fails:
+#	<new-prerm> failed-upgrade <old-version>
+#
+#
+# Before package is deconfigured while dependency is replaced due to conflict:
+#	<prerm> deconfigure in-favour <new-package> <version>
+#		removing <old-package> <version>
+#
+# Before the package is replaced due to conflict:
+#	<prerm> remove in-favour <new-package> <version>
 
-set -e
 
-if [ ! "$1" = "upgrade" ] && [ ! "$1" = "remove" ]; then
-	exit 0
-fi
+case "$1" in
+    remove|upgrade)
+	;;
 
-cd /usr/bin
+    failed-upgrade|deconfigure)
+	;;
 
-install-info --quiet --remove /usr/info/Guidelines
-install-info --quiet --remove /usr/info/debian-guidelines
-install-info --quiet --remove /usr/info/guidelines
-install-info --quiet --remove /usr/info/debian-guidelines.info.gz
-install-info --quiet --remove /usr/info/guidelines.info.gz
+    *)
+	echo "$0 called with unknown argument \`$1'" 1>&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+exit 0

debian/dselect.cfg

@@ -1,7 +1,6 @@
 # dselect configuration file
 #
-# This file can contain default options for dselect. All commandline
-# options are allowed. Values can be specific by putting them after
-# the option, seperated by whitespace and/or an `=' sign.
+# This file can contain default options for dselect.  All command-line
+# options are allowed.  Values can be specified by putting them after
+# the option, separated by whitespace and/or an `=' sign.
 #
-

debian/dselect.conffiles

@@ -1 +0,0 @@
-/etc/dpkg/dselect.cfg

debian/dselect.install

@@ -0,0 +1,9 @@
+../dselect.cfg etc/dpkg
+
+usr/bin/dselect
+usr/lib/dpkg/methods
+usr/share/man/*/*/dselect.cfg.5
+usr/share/man/*/dselect.cfg.5
+usr/share/man/*/*/dselect.1
+usr/share/man/*/dselect.1
+var/lib/dpkg/methods

debian/pseudo-tags

@@ -1,48 +1,54 @@
-Below are the list of pseudo-tags we, the Dpkg Team, are using in the
-Debian BTS.  Place as many of the following as apply in the subject(title)
-of your bug report.
+To make management of bugs against the dpkg suite easier we add as many of
+the following “pseudo-tags” to the start of the subject (title) as apply
+to the bug.
 
-[DOC]			Documentation bugs, including --help, manpages, and
-			others
-[ARCH]			Archtable updates, porting patches
-[INTL]			Translation updates, or bugs
-[ASSERT]		assert errors
-[UTF-8]			conversion to utf-8 encoding
-[SEGFAULT]		segfaults
-[CONFFILE]		any issues with conffile handling
-[PERF]			performance related issues
-[TRIVIAL]		bug is trivial/simple to fix
+When filing bugs, please do the same to aid triage.
 
-Also, each program that dpkg produces(in any of it's debs) has a
-pseudo-tag for it.
+[ASSERT]		Errors caused by assert().
+[SEGFAULT]		Errors that cause segmentation faults.
+[CONFFILE]		Issues with configuration file handling.
+[DEPENDS]		Issues with dependency relationship handling.
+[TRIVIAL]		Bug should be trivial to fix.
+[PERF]			Performance problems.
+[DOC]			Documentation bugs, including --help and manpages.
+[UTF-8]			Conversion to the UTF-8 encoding.
+[ARCH]			Updates to ‘archtable’ and porting patches.  Include
+			the dpkg architecture name in the tag,
+			e.g. [ARCH:sparc]
+[INTL]			New or updated translations and bugs affecting
+			translation.  Include the language code in the tag,
+			e.g. [INTL:cy_GB]
 
-dpkg.deb:
-[DPKG-SPLIT]
-[DPKG-QUERY]
+
+Each program in the dpkg suite has its own pseudo-tag:
+
+dpkg:
 [DPKG]
 [DPKG-DEB]
-[MD5SUM]
-[U-A]			update-alternatives
-[INSTALL-INFO]
 [DPKG-DIVERT]
+[DPKG-QUERY]
+[DPKG-SPLIT]
 [DPKG-STATOVERRIDE]
-[CLEANUP-INFO]
+[MD5SUM]
 [S-S-D]			start-stop-daemon
+[CLEANUP-INFO]
+[INSTALL-INFO]
+[U-A]			update-alternatives
 
-dpkg-dev.deb:
-[DPKG-NAME]
-[DPKG-SOURCE]
-[DPKG-GENCHANGES]
-[DPKG-GENCONTROL]
-[DPKG-SHLIBDEPS]
+dpkg-dev:
+[822-DATE]
+[DPKG-ARCHITECTURE]
 [DPKG-BUILDPACKAGE]
+[DPKG-CHECKBUILDDEPS]
 [DPKG-DISTADDFILE]
-[822-DATE]
+[DPKG-GENCHANGES]
+[DPKG-GENCONTROL]
+[DPKG-NAME]
+[DPKG-PARSECHANGELOG]
 [DPKG-SCANPACKAGES]
 [DPKG-SCANSOURCES]
-[DPKG-ARCHITECTURE]
-[DPKG-PARSECHANGELOG]
-[DPKG-CHECKBUILDDEPS]
+[DPKG-SHLIBDEPS]
+[DPKG-SOURCE]
 
-dselect.deb:
+dselect:
 [DSELECT]

debian/rules

@@ -1,324 +1,116 @@
 #!/usr/bin/make -f
-# vim: nowrap ts=8
+# debian/rules for the dpkg suite.
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
 
-# Build locations
-BUILD		:= $(CURDIR)/build
-TMP		:= $(CURDIR)/debian/tmp
-INSTALL_TMP	:= $(TMP)/install
-TMP_DPKG	:= $(TMP)/dpkg
-TMP_DPKG_DEV	:= $(TMP)/dpkg-dev
-TMP_DPKG_DOC	:= $(TMP)/dpkg-doc
-TMP_DSELECT 	:= $(TMP)/dselect
+CFLAGS = -Wall -g
+CXXFLAGS = -Wall -g
 
-# We should really get this in a different way...
-DEB_BUILD_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE 2> /dev/null || true)
-DEB_HOST_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE 2> /dev/null || true)
-arch			:= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-GENCONTROL	:= perl -I $(CURDIR)/scripts $(BUILD)/scripts/dpkg-gencontrol -isp
-SHLIBDEPS	:= perl -I $(CURDIR)/scripts $(BUILD)/scripts/dpkg-shlibdeps
-
-ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-  config_arg	:= --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+# Disable optimisations if ‘noopt’ found in $DEB_BUILD_OPTIONS
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+	CXXFLAGS += -O0
 else
-  config_arg	:=
+	CFLAGS += -O2
+	CXXFLAGS += -O2
 endif
 
-BUILD-DIRS	:= $(BUILD) $(BUILD)-static
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# Hacky, but effective
-MANDIRS := $(shell sed -n -e '/^SUBDIRS/{s/.*= *//;s/ en / /;p}' $(CURDIR)/man/Makefile.in)
-
-aclocal.m4: $(wildcard automake/*.m4)
-	aclocal -I automake
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
 
-# The following 2 rules should only be run, if their dependants have
-# been modified.  For clean builds, this won't happen.  Only if the
-# builder has modified these files after extraction.
 
-configure: configure.in aclocal.m4
-	autoconf
+# Create configure script if necessary, automake handles rebuilding it.
+configure:
+	dh_testdir
 
-config.h.in: configure.in
-	autoheader
+	autoreconf -v -i
 
-config.guess config.sub: %: /usr/share/misc/%
-	cp -a $< $@.new
-	mv $@.new $@
+# Configure the build tree
+build-tree/config.status: configure
+	dh_testdir
 
-# Setup the buildlocation
-$(BUILD)/configure-stamp: configure config.h.in config.guess config.sub
-	$(checkdir)
-	install -d $(@D)
-	cd $(@D) && LDFLAGS="$(LDFLAGS)" $(shell echo "$(patsubst $(CURDIR)/%,%,$(@D))" | sed -e 's,^[^/][^/]*$$,..,;s,/[^/][^/]*,/..,g' )/configure \
+	install -d build-tree
+	cd build-tree && ../configure $(confflags) \
+		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 		--prefix=/usr \
-		--datadir=/usr/share \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
+		--mandir=\$${datadir}/man \
+		--infodir=\$${datadir}/info \
 		--sysconfdir=/etc \
-		--sharedstatedir=/var/lib \
 		--localstatedir=/var/lib \
-		--with-admindir=/var/lib/dpkg \
 		--with-zlib=static \
-		--with-bz2lib=static \
-		--with-static-progs \
-		$(config_arg)
-	touch $@
-
-clean:
-	$(checkdir)
-	rm -f debian/files debian/substvars
-	rm -f debian/dpkg.substvars debian/dpkg-static.substvars
-	rm -fr autom4te.cache
-	rm -fr $(BUILD-DIRS) $(TMP)
-	rm -f po/{cat-id-tbl.c,stamp-cat-id,*.gmo}
-	rm -f stamp-build stamp-binary
+		--with-bz2=static
 
-build: stamp-build
+# Build the package in build-tree
+build: build-tree/build-stamp
+build-tree/build-stamp: build-tree/config.status
+	dh_testdir
 
-stamp-build: $(BUILD)/configure-stamp
-	$(MAKE) $(MFLAGS) -C $(BUILD)
-#	touch $@
-
-binary-static: binary-arch-static
-binary: binary-arch binary-indep
-
-stamp-binary-static: stamp-binary
-stamp-binary: stamp-build
-	$(checkdir)
-	test "`id -u`" -eq 0
-	rm -rf $(TMP)
-	$(MAKE) $(MFLAGS) -C $(BUILD)$* \
-		DESTDIR=$(INSTALL_TMP) \
-		install
-	find $(TMP) -type d | xargs chmod 755
+	cd build-tree && $(MAKE)
 	touch $@
 
-binary-dpkg-static-most:	TMP_DPKG=$(TMP)/dpkg-static
-binary-dpkg-static-most:	static=-static
-binary-dpkg-static:		TMP_DPKG=$(TMP)/dpkg-static
-binary-dpkg-static:		static=-static
-
-binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary%
-	rm -rf $(TMP_DPKG)
-	install -d -m 755 -o root -g root $(TMP_DPKG)
-	chmod g-s $(TMP_DPKG)
-	install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/doc/dpkg$(static)
-	install -d -m 755 -o root -g root $(TMP_DPKG)/usr/lib/dpkg
-	install -d -m 755 -o root -g root $(TMP_DPKG)/usr/bin
-	install -d -m 755 -o root -g root $(TMP_DPKG)/sbin
-	install -d -m 755 -o root -g root $(TMP_DPKG)/var/lib/dpkg
-	-test -d $(INSTALL_TMP)/etc && cp -a $(INSTALL_TMP)/etc $(TMP_DPKG)/
-	set -e ; for i in info alternatives parts updates ; do \
-		cp -a $(INSTALL_TMP)/var/lib/dpkg/$$i $(TMP_DPKG)/var/lib/dpkg/ ; \
-	done
-	cp -a $(INSTALL_TMP)/usr/sbin $(TMP_DPKG)/usr/
-	mv $(TMP_DPKG)/usr/sbin/start-stop-daemon $(TMP_DPKG)/sbin/
-	cp -a $(INSTALL_TMP)/usr/lib/dpkg/mksplit $(TMP_DPKG)/usr/lib/dpkg/
-	cp -a $(INSTALL_TMP)/usr/lib/dpkg/enoent $(TMP_DPKG)/usr/lib/dpkg/
-	cp -a $(INSTALL_TMP)/usr/share/locale $(TMP_DPKG)/usr/share/
-	cp -a $(INSTALL_TMP)/usr/share/dpkg $(TMP_DPKG)/usr/share/
-	set -e ; for i in dpkg-split dpkg-query ; do \
-		cp -a $(INSTALL_TMP)/usr/bin/$$i $(TMP_DPKG)/usr/bin/ ; \
-	done
-	set -e ; for i in dpkg dpkg-deb md5sum ; do \
-		cp -a $(INSTALL_TMP)/usr/bin/$$i$(static) $(TMP_DPKG)/usr/bin/$$i ; \
-	done
-	set -e ; for i in ChangeLog THANKS TODO copyright; do \
-		cp -a $(INSTALL_TMP)/usr/share/doc/dpkg/$$i $(TMP_DPKG)/usr/share/doc/dpkg$(static)/ ; \
-	done
-	cp -a debian/pseudo-tags $(TMP_DPKG)/usr/share/doc/dpkg$(static)/
-	set -e ; for i in "" $(MANDIRS) ; do \
-		install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/man/$$i/man1 ; \
-		for m in md5sum.1 dpkg-deb.1 ; do \
-			if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m ] ; then \
-				cp -a $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m $(TMP_DPKG)/usr/share/man/$$i/man1/$$m ; \
-			fi ; \
-		done ; \
-		install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/man/$$i/man5 ; \
-		for m in dpkg.cfg.5 ; do \
-			if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m ] ; then \
-				cp -a $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m $(TMP_DPKG)/usr/share/man/$$i/man5/$$m ; \
-			fi ; \
-		done ; \
-		install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/man/$$i/man8 ; \
-		for m in dpkg.8 dpkg-query.8 dpkg-split.8 start-stop-daemon.8 \
-		    	cleanup-info.8 dpkg-divert.8 dpkg-statoverride.8 \
-			install-info.8 update-alternatives.8 ; do \
-			if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man8/$$m ] ; then \
-				cp -a $(INSTALL_TMP)/usr/share/man/$$i/man8/$$m $(TMP_DPKG)/usr/share/man/$$i/man8/$$m ; \
-			fi ; \
-		done ; \
-	done
-
-# Now that dpkg has been installed, Debianize it
-# Policy stuff
-	find $(TMP_DPKG)/usr/share/man -type f | xargs gzip -9f
-	strip --remove-section=.comment --remove-section=.note \
-		--strip-unneeded $(TMP_DPKG)/usr/bin/* $(TMP_DPKG)/sbin/* \
-		$(TMP_DPKG)/usr/lib/dpkg/enoent
-	mv $(TMP_DPKG)/usr/share/doc/dpkg$(static)/ChangeLog \
-		$(TMP_DPKG)/usr/share/doc/dpkg$(static)/changelog
-
-	install -p -m 644 -o root -g root debian/changelog \
-		$(TMP_DPKG)/usr/share/doc/dpkg$(static)/changelog.Debian
-	rm -f $(TMP_DPKG)/usr/share/doc/dpkg$(static)/copyright
-	gzip -9 $(TMP_DPKG)/usr/share/doc/dpkg$(static)/*
-	install -p -m 644 -o root -g root debian/dpkg.cfg \
-		$(TMP_DPKG)/usr/share/doc/dpkg$(static)/
-	install -p -m 644 -o root -g root debian/copyright \
-		$(TMP_DPKG)/usr/share/doc/dpkg$(static)/
-
-# Final package creation
-	install -d -m 755 -o root -g root $(TMP_DPKG)/DEBIAN
-	install -p -m 644 -o root -g root debian/dpkg.conffiles $(TMP_DPKG)/DEBIAN/conffiles
-	install -p -m 755 -o root -g root debian/dpkg.preinst $(TMP_DPKG)/DEBIAN/preinst
-	install -p -m 755 -o root -g root debian/dpkg.prerm $(TMP_DPKG)/DEBIAN/prerm
-	install -p -m 755 -o root -g root debian/dpkg.postinst $(TMP_DPKG)/DEBIAN/postinst
-	install -p -m 755 -o root -g root debian/dpkg.postrm $(TMP_DPKG)/DEBIAN/postrm
-
-	$(SHLIBDEPS) -dPre-Depends -Tdebian/dpkg$(static).substvars \
-		$(TMP_DPKG)/sbin/start-stop-daemon \
-		`test -z "$(static)" && echo $(TMP_DPKG)/usr/bin/dpkg $(TMP_DPKG)/usr/bin/md5sum $(TMP_DPKG)/usr/bin/dpkg-deb`
 
-binary-dpkg binary-dpkg-static: %: %-most
-	$(GENCONTROL) -Tdebian/dpkg$(static).substvars -pdpkg$(static) -P$(TMP_DPKG)
-	dpkg --build $(TMP_DPKG) ..
+# Install the package underneath debian/tmp
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	cd build-tree && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
+
+# Put together the dpkg and dselect packages
+binary-arch: install
+	dh_testdir -a
+	dh_testroot -a
+	dh_install --sourcedir=debian/tmp -a
+
+	dh_installchangelogs -pdpkg ChangeLog
+	dh_installdocs -pdpkg
+	install -d debian/dselect/usr/share/doc
+	ln -s dpkg debian/dselect/usr/share/doc/dselect
+
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+# Put together the dpkg-dev package
+binary-indep: install
+	dh_testdir -i
+	dh_testroot -i
+	dh_install --sourcedir=debian/tmp -i
+
+	install -d debian/dpkg-dev/usr/share/doc
+	ln -s dpkg debian/dpkg-dev/usr/share/doc/dpkg-dev
+
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
-binary-dpkg-dev: stamp-binary
-	rm -rf $(TMP_DPKG_DEV)
-	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)
-	chmod g-s $(TMP_DPKG_DEV)
-	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/etc/dpkg
-	install -p -m 644 -o root -g root debian/shlibs.default \
-		$(TMP_DPKG_DEV)/etc/dpkg/
-	install -p -m 644 -o root -g root debian/shlibs.override \
-		$(TMP_DPKG_DEV)/etc/dpkg/
-	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/lib/dpkg
-	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share
-	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/bin
-	mv $(INSTALL_TMP)/usr/lib/dpkg/parsechangelog $(TMP_DPKG_DEV)/usr/lib/dpkg/
-	mv $(INSTALL_TMP)/usr/lib/dpkg/controllib.pl $(TMP_DPKG_DEV)/usr/lib/dpkg/
-	set -e ; for i in dpkg-name dpkg-source dpkg-genchanges dpkg-gencontrol \
-		dpkg-shlibdeps dpkg-buildpackage dpkg-distaddfile 822-date \
-		dpkg-scanpackages dpkg-scansources dpkg-architecture \
-		dpkg-parsechangelog dpkg-checkbuilddeps ; do \
-		mv $(INSTALL_TMP)/usr/bin/$$i $(TMP_DPKG_DEV)/usr/bin/ ; \
-	done
-	set -e ; for i in "" $(MANDIRS) ; do \
-		install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/man/$$i/man1 ; \
-		for m in dpkg-name.1 dpkg-source.1 822-date.1 dpkg-architecture.1 \
-			dpkg-buildpackage.1 dpkg-distaddfile.1 dpkg-genchanges.1 \
-			dpkg-gencontrol.1 dpkg-parsechangelog.1 dpkg-shlibdeps.1 \
-			dpkg-checkbuilddeps.1 dpkg-scanpackages.1 dpkg-scansources.1; do \
-			if [ -e $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m ] ; then \
-				mv $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m $(TMP_DPKG_DEV)/usr/share/man/$$i/man1/$$m ; \
-			fi ; \
-		done ; \
-		install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/man/$$i/man5 ; \
-		for m in deb.5 deb-control.5 deb-old.5 ; do \
-			if [ -e $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m ] ; then \
-				mv $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m $(TMP_DPKG_DEV)/usr/share/man/$$i/man5/$$m ; \
-			fi ; \
-		done ; \
-	done
-# Now that dpkg-dev has been installed, Debianize it
-# Policy stuff
-	find $(TMP_DPKG_DEV)/usr/share/man -type f | xargs gzip -9f
-	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/doc
-	ln -s dpkg $(TMP_DPKG_DEV)/usr/share/doc/dpkg-dev
-
-# Final package creation
-	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/DEBIAN
-	install -p -m 644 -o root -g root debian/dpkg-dev.conffiles $(TMP_DPKG_DEV)/DEBIAN/conffiles
-
-	$(GENCONTROL) -Tdebian/dpkg-dev.substvars -pdpkg-dev -P$(TMP_DPKG_DEV)
-	dpkg --build $(TMP_DPKG_DEV) ..
-
-binary-dselect: stamp-binary
-	rm -rf $(TMP_DSELECT)
-	install -d -m 755 -o root -g root $(TMP_DSELECT)
-	chmod g-s $(TMP_DSELECT)
-
-	install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/bin
-	mv $(INSTALL_TMP)/usr/bin/dselect $(TMP_DSELECT)/usr/bin/
-
-	install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/lib/dpkg
-	mv $(INSTALL_TMP)/usr/lib/dpkg/methods $(TMP_DSELECT)/usr/lib/dpkg/
-
-	install -d -m 755 -o root -g root $(TMP_DSELECT)/var/lib/dpkg
-	mv $(INSTALL_TMP)/var/lib/dpkg/methods $(TMP_DSELECT)/var/lib/dpkg/
-
-	set -e ; for i in "" $(MANDIRS) ; do \
-		install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/share/man/$$i/man5 ; \
-		for m in dselect.cfg.5 ; do \
-			if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m ] ; then \
-				cp -a $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m $(TMP_DSELECT)/usr/share/man/$$i/man5/$$m ; \
-			fi ; \
-		done ; \
-		install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/share/man/$$i/man8 ; \
-		for m in dselect.8 ; do \
-			if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man8/$$m ] ; then \
-				cp -a $(INSTALL_TMP)/usr/share/man/$$i/man8/$$m $(TMP_DSELECT)/usr/share/man/$$i/man8/$$m ; \
-			fi ; \
-		done ; \
-	done
-
-	install -d -m 755 -o root -g root $(TMP_DSELECT)/etc/dpkg
-	install -p -m 644 -o root -g root debian/dselect.cfg \
-		$(TMP_DSELECT)/etc/dpkg/
-
-# Now do the usual Debian stuff
-	find $(TMP_DSELECT)/usr/share/man -type f | xargs gzip -9f
-	install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/share/doc
-	ln -s dpkg $(TMP_DSELECT)/usr/share/doc/dselect
-	strip --remove-section=.comment --remove-section=.note \
-		--strip-unneeded $(TMP_DSELECT)/usr/bin/* 
-
-# Final package creation
-	install -d -m 755 -o root -g root $(TMP_DSELECT)/DEBIAN
-	install -p -m 644 -o root -g root debian/dselect.conffiles $(TMP_DSELECT)/DEBIAN/conffiles
-
-	$(SHLIBDEPS) -Tdebian/dselect.substvars \
-		$(TMP_DSELECT)/usr/bin/dselect 
-	$(GENCONTROL) -Tdebian/dselect.substvars -pdselect -P$(TMP_DSELECT)
-	dpkg --build $(TMP_DSELECT) ..
-
-binary-dpkg-doc: stamp-binary
-	rm -rf $(TMP_DPKG_DOC)
-	install -d -m 755 -o root -g root $(TMP_DPKG_DOC)
-	chmod g-s $(TMP_DPKG_DOC)
-	install -d -m 755 -o root -g root $(TMP_DPKG_DOC)/usr/share/doc/dpkg
-	mv $(INSTALL_TMP)/usr/share/doc/dpkg/internals $(TMP_DPKG_DOC)/usr/share/doc/dpkg/
-	mv $(INSTALL_TMP)/usr/share/doc/dpkg/ChangeLog.manuals \
-		$(TMP_DPKG_DOC)/usr/share/doc/dpkg/changelog.manuals
-
-# Now that dpkg-doc has been installed, Debianize it
-# Policy stuff
-	gzip -9f $(TMP_DPKG_DOC)/usr/share/doc/dpkg/[!i]*
-	ln -s dpkg $(TMP_DPKG_DOC)/usr/share/doc/dpkg-doc
-
-# Register documentation with doc-base
-	install -d -m 755 -o root -g root $(TMP_DPKG_DOC)/usr/share/doc-base
-	install -p -m 644 -o root -g root debian/dpkg-doc.doc-base \
-		$(TMP_DPKG_DOC)/usr/share/doc-base/dpkg-doc
-	
-# Final package creation
-	install -d -m 755 -o root -g root $(TMP_DPKG_DOC)/DEBIAN
-	install -p -m 755 -o root -g root debian/dpkg-doc.prerm $(TMP_DPKG_DOC)/DEBIAN/prerm
-	install -p -m 755 -o root -g root debian/dpkg-doc.postinst $(TMP_DPKG_DOC)/DEBIAN/postinst
+binary: binary-arch binary-indep
 
-	$(GENCONTROL) -Tdebian/dpkg-doc.substvars -pdpkg-doc -P$(TMP_DPKG_DOC)
-	dpkg --build $(TMP_DPKG_DOC) ..
 
-binary-arch-static: binary-dpkg-static
-binary-arch: binary-dpkg binary-dpkg-static-most binary-dselect
+# Clean up the mess we made
+clean:
+	dh_testdir
 
-binary-indep: binary-dpkg-dev binary-dpkg-doc
+	rm -rf build-tree
+	dh_clean
 
-define checkdir
-	test -f include/dpkg.h.in
-endef
 
-.PHONY: clean build binary binary-arch binary-indep binary-dpkg binary-dpkg-dev
-.PHONY: binary-dpkg-doc binary-nondebbin
+.PHONY: build install binary-arch binary-indep binary clean

debian/shlibs.default

@@ -1,12 +1,7 @@
-# Dpkg shlibs defaults file
+# dpkg shlibs defaults file
 #
 # This file contains shlibs entries that are used as a last resort when
-# no matching entries are found elsewhere. For more information see the
-# dpkg-shlibdeps manual page. 
-#
-# The format used is:
-#   <library-name> <version-or-soname> <dependencies ...>
-#
-# Example:
-#   libfoo     1    libfoo1 (>= 1.0-1)
+# no matching entries are found elsewhere.  For more information see the
+# dpkg-shlibdeps(1) manual page. 
 #
+# <library name>	<version/soname>	<dependencies>

debian/shlibs.override

@@ -1,13 +1,8 @@
-# Dpkg shlibs override file
+# dpkg shlibs override file
 #
 # Entries in this file will override all others, only use if you
 # are really sure that is what you want!
 # 
-# For more information see the dpkg-shlibdeps manual page. 
-#
-# The format used is:
-#   <library-name> <version-or-soname> <dependencies ...>
-#
-# Example:
-#   libfoo     1    libfoo1 (>= 1.0-1)
+# For more information see the dpkg-shlibdeps(1) manual page. 
 #
+# <library name>	<version/soname>	<dependencies>

depcomp

@@ -0,0 +1,526 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2004-04-25.13
+
+# Copyright (C) 1999, 2000, 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
+# 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 to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit 0
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit 0
+    ;;
+esac
+
+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
+
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+  stat=$?
+
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+
+  if test -f "$tmpdepfile"; then
+    outname="$stripped.o"
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   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.
+      tmpdepfile1="$dir.libs/$base.lo.d"
+      tmpdepfile2="$dir.libs/$base.o.d"
+      tmpdepfile3="$dir.libs/$base.d"
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile2="$dir$base.d"
+      tmpdepfile3="$dir$base.d"
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+      exit $stat
+   fi
+
+   if test -f "$tmpdepfile1"; then
+      tmpdepfile="$tmpdepfile1"
+   elif test -f "$tmpdepfile2"; then
+      tmpdepfile="$tmpdepfile2"
+   else
+      tmpdepfile="$tmpdepfile3"
+   fi
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:

doc/ChangeLog

@@ -1,153 +0,0 @@
-debian-manuals (2.1.2.3) unstable;
-
-  * internals.sgml: converted to debiandoc format
-
- -- Ben Collins <bcollins@debian.org>  Sat, 23 Oct 1999 23:32:48 -0400
-
-debian-manuals (2.1.2.2) frozen unstable;
-
-  * Fixed even more typographical and grammatical errors in Policy and 
-  Programmer's manual
-  * Corrected the contact email addresses again.
-  * Added a paragraph to Policy 6.3 on taking over an old package (Guy Maor)
-  * Added a paragraph to Programmer 4.2.14 on listing distributions to load
-  a package into. (Guy Maor)
-  * Further clarification of use of absolute pathnames in scripts in 
-  Programmer 6.1. 
-
- -- David Morris <bweaver@worf.netins.net>  Tue, 3 Dec 1996 23:28:04 -0600
-
-debian-manuals (2.1.2.1) frozen unstable;
-  
-  * Many editorial and formatting revisions with suggestions from Ian Jackson,
-  Guy Maor and others	
-  * correction of chiark address in Policy 6.2
-  * footnote in Programmers chapter 2 pointing to deb(5) manpage for 
-  description of deb file format.
-  * addition of more dpkg examples in Programmer chapter 2 
-  * Replace paragraph in Policy 4.1 outlining compiling parameters for 
-  shared libraries.
-  * Added paragraph in Programmer 6.1 on paths in maintainer scripts
-  (Bug #2481)
-  * Cleaned up language and formatting of Programmer's 12.2, shlibs
-  * Corrected contact addresses for listmaster and override-change
-
- -- David Morris <bweaver@worf.netins.net>  Wed, 27 Nov 1996 08:17:16 -0600
-
-debian-manuals (2.1.2.0) frozen unstable;
-
-  * Mostly editorial changes in Policy Manual.
-  * Added summary of distribution criteria to Introduction
-  * Added section headings for copyright criteria
-  * Fixed typos (Bugs #4485, #4622)
-  * Added paragraph in Compilation Options related to use of shared and 
-    static libraries. (Bug #5299)
-  * Paragraph added about where to find PGP and other export restricted 
-    packages in section on Procedure
-  * Change in List administrator and in the contact address for becoming 
-    a package maintainer
-  * A paragraph added related to who to contact for package maintainer changes.
-  * Changed where to send upload announcements: uploads destined for unstable,
-    frozen, or experimental go to debian-devel-changes.
-
-  * Made some mostly editorial changes to Programmers Manual.
-  * Added a recommendation to debmake in Introduction.
-  * A further interpretation of the various Distributions is added with
-    the intent of helping people decide which one to choose. (section 4.2.14)
-  * Section 12 on Shared Libraries expanded with further technical information
-    on various shlib files
-  * Section in 2.2 on format of shlib file moved to new subsection within 12.
-  * Paragraph on adding a symlink without version number added to Shared 
-    Library Section (Guy Maor, Bug #5299)
-
- -- David Morris <bweaver@worf.netins.net>  Fri, 22 Nov 1996 23:41:39 -0600
-
-debian-manuals (2.1.1.0) unstable;
-
-  * Hard links are forbidden in source packages (they didn't work anyway,
-    and can't easily be made to work reliably).
-  * Do not use dpkg-divert or update-alternatives without consultation.
-
-  * Do not need to declare dependencies on Essential packages.
-  * Restrictions on Pre-Depends stated in policy manual.
-  * debian/substvars file is now almost always auto-generated.
-  * Shared libraries must be installed stripped.
-  * Essential and Pre-Depends put together in policy manual.
-
-  * Explained component-wise (file-wise) vs. package-wise dependencies.
-
- -- Ian Jackson <ian@chiark.greenend.org.uk>  Thu, 12 Sep 1996 01:00:41 +0100
-
-debian-manuals (2.1.0.0) unstable;
-
-  * Upstream changelog must be installed too (was just recommended).
-
-  * Modification to use dpkg-shlibdeps added to conversion instructions.
-  * Packages which are buggy and orphaned but which are preserved for
-    compatibility go in contrib.
-
-  * Programmers' manual source package section refers to conversion
-    instructions in policy manual.
-  * Make it clear that recommending a non-free or contrib package puts a
-    package in contrib.
-
- -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Sun, 1 Sep 1996 17:47:18 +0100
-
-debian-manuals (2.0.1.0) unstable;
-
-  * varargs.h and libtermcap are obsolete - use stdarg.h and ncurses.
-  * Shared library link/library ordering corrected (aargh).
-  * When to byte-compile Elisp files.
-  * Missing final newlines not represented by dpkg-source.
-
-  * Must post upload announcements to debian-changes.
-  * Moved some sections into new `configuring and building' chapter.
-  * Typo fixes.
-
- -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Sat, 31 Aug 1996 20:07:22 +0100
-
-debian-manuals (2.0.0.0) unstable;
-
-  * Footnote added OK'ing copyrights which require name changes.
-  * More detail about changelog format names.
-
-  * Problematic licence restrictions are formatted as lists.
-  * Mentioned 822-date utility as way to generate RFC822 format dates.
-  * Typos corrected.
-  * Released.
-
- -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Mon, 26 Aug 1996 14:27:34 +0100
-
-debian-manuals (0.2.1.1) unstable;
-
-  * Can't overwrite directories in one package with files in another.
-
- -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Sat, 24 Aug 1996 18:44:54 +0100
-
-debian-manuals (0.2.1.0) unstable;
-
-  * Policy says when and how to include original source in upload.
-
-  * Need -sa on dpkg-genchanges/dpkg-buildpackage when converting.
-
-  * Use minor patchlevel for meaning changes which don't affect packages.
-  * More verbosity about netiquette.
-  * Reorganised participation and upload policy: merged with mailing lists.
-
- -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Fri, 23 Aug 1996 12:48:09 +0100
-
-debian-manuals (0.2.0.1) experimental;
-
-  * Said that system administrators' manual does not exist.
-
- -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Fri, 23 Aug 1996 04:05:36 +0100
-
-debian-manuals (0.2.0.0) experimental;
-
-  * Draft releases.
-
- -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Wed, 21 Aug 1996 15:07:53 +0100
-
-Local variables:
-mode: debian-changelog
-End:

doc/Makefile.in

@@ -1,49 +0,0 @@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-top_srcdir	= @top_srcdir@
-
-default: all
-
-include ../Makefile.conf
-
-ifeq (@USE_SGML_DOC@, true)
-all: internals.html/index.html
-else
-all: 
-endif
-
-clean: 
-	$(RM) $(srcdir)/manuals-version
-	$(RM) -rf internals.html/
-
-distclean: clean 
-	$(RM) Makefile
-
-install: install-doc
-
-manuals-version: $(top_srcdir)/version-nr
-	set -e ; v=`sed -ne '1s/.*(\(.*\)).*/\1/' $(srcdir)/ChangeLog` ; \
-	echo "<!entity manuals-version \"$$v\">" > $@
-	echo "<!entity dpkg-version \"$(VERSION)\">" >> $@
-
-internals.html/index.html: internals.sgml manuals-version
-	debiandoc2html -n -D. $<
-
-install-doc: 
-ifeq (@USE_SGML_DOC@, true)
-	$(mkinstalldirs) $(DESTDIR)$(docdir)/internals/
-	set -e ; for i in internals.html/* ; do \
-		bn=`basename $$i` ; \
-		$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/internals/$$bn ; \
-	done
-endif
-	$(mkinstalldirs) $(DESTDIR)$(docdir)/
-	$(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(docdir)/ChangeLog.manuals
-	set -e ; for i in ChangeLog THANKS TODO ; do \
-		$(INSTALL_DATA) $(top_srcdir)/$$i $(DESTDIR)$(docdir) ; \
-	done
-	$(INSTALL_DATA) $(top_srcdir)/COPYING $(DESTDIR)$(copyingfile)
-
-
-.PHONY: all clean distclean install install-doc
-.PHONY: install-doc-recursive

doc/database-structure.fig

@@ -1,487 +0,0 @@
-#FIG 2.1
-80 2
-6 59 74 199 169
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 69 129 199 129 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 69 149 199 149 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 69 129 69 169 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 59 109 199 109 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 139 129 139 169 9999 9999
-2 2 0 1 -1 0 0 0 0.000 0 0 0
-	 199 169 199 89 59 89 59 169 199 169 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 139 89 139 109 9999 9999
-4 0 12 10 0 -1 0 0.000 4 5 24 64 104 name

-4 0 12 10 0 -1 0 0.000 4 9 84 64 122 pkginfoperfile

-4 0 12 10 0 -1 0 0.000 4 9 42 74 144 depends

-4 0 12 10 0 -1 0 0.000 4 9 48 74 162 depended

-4 0 12 10 0 -1 0 0.000 4 9 42 59 84 pkginfo

--6
-6 59 394 199 489
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 69 449 199 449 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 69 469 199 469 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 69 449 69 489 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 59 429 199 429 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 139 449 139 489 9999 9999
-2 2 0 1 -1 0 0 0 0.000 0 0 0
-	 199 489 199 409 59 409 59 489 199 489 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 139 409 139 429 9999 9999
-4 0 12 10 0 -1 0 0.000 4 5 24 64 424 name

-4 0 12 10 0 -1 0 0.000 4 9 84 64 442 pkginfoperfile

-4 0 12 10 0 -1 0 0.000 4 9 42 74 464 depends

-4 0 12 10 0 -1 0 0.000 4 9 48 74 482 depended

-4 0 12 10 0 -1 0 0.000 4 9 42 59 404 pkginfo

--6
-6 59 234 199 329
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 69 289 199 289 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 69 309 199 309 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 69 289 69 329 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 59 269 199 269 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 139 289 139 329 9999 9999
-2 2 0 1 -1 0 0 0 0.000 0 0 0
-	 199 329 199 249 59 249 59 329 199 329 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 139 249 139 269 9999 9999
-4 0 12 10 0 -1 0 0.000 4 5 24 64 264 name

-4 0 12 10 0 -1 0 0.000 4 9 84 64 282 pkginfoperfile

-4 0 12 10 0 -1 0 0.000 4 9 42 74 304 depends

-4 0 12 10 0 -1 0 0.000 4 9 48 74 322 depended

-4 0 12 10 0 -1 0 0.000 4 9 42 59 244 pkginfo

--6
-6 559 74 699 169
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 569 129 699 129 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 569 149 699 149 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 569 129 569 169 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 559 109 699 109 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 639 129 639 169 9999 9999
-2 2 0 1 -1 0 0 0 0.000 0 0 0
-	 699 169 699 89 559 89 559 169 699 169 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 639 89 639 109 9999 9999
-4 0 12 10 0 -1 0 0.000 4 5 24 564 104 name

-4 0 12 10 0 -1 0 0.000 4 9 84 564 122 pkginfoperfile

-4 0 12 10 0 -1 0 0.000 4 9 42 574 144 depends

-4 0 12 10 0 -1 0 0.000 4 9 48 574 162 depended

-4 0 12 10 0 -1 0 0.000 4 9 42 559 84 pkginfo

--6
-6 399 119 499 214
-2 2 0 1 -1 0 0 0 0.000 0 0 0
-	 499 214 499 134 399 134 399 214 499 214 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 399 154 499 154 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 399 174 499 174 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 399 194 499 194 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 439 134 439 214 9999 9999
-4 0 12 10 0 -1 0 0.000 4 7 12 404 149 up

-4 0 12 10 0 -1 0 0.000 4 7 24 404 169 next

-4 0 12 10 0 -1 0 0.000 4 7 24 404 189 list

-4 0 12 10 0 -1 0 0.000 4 9 24 404 209 type

-4 0 12 10 0 -1 0 0.000 4 9 60 399 129 dependency

--6
-6 654 224 754 319
-2 2 0 1 -1 0 0 0 0.000 0 0 0
-	 754 319 754 239 654 239 654 319 754 319 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 654 259 754 259 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 654 279 754 279 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 654 299 754 299 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 694 239 694 319 9999 9999
-4 0 12 10 0 -1 0 0.000 4 7 12 659 254 up

-4 0 12 10 0 -1 0 0.000 4 7 24 659 274 next

-4 0 12 10 0 -1 0 0.000 4 7 24 659 294 list

-4 0 12 10 0 -1 0 0.000 4 9 24 659 314 type

-4 0 12 10 0 -1 0 0.000 4 9 60 654 234 dependency

--6
-6 164 294 174 304
-2 1 0 1 1 0 0 0 0.000 7 0 0
-	 164 294 174 304 9999 9999
-2 1 0 1 1 0 0 0 0.000 7 0 0
-	 164 304 174 294 9999 9999
--6
-6 164 454 174 464
-2 1 0 1 1 0 0 0 0.000 7 0 0
-	 164 454 174 464 9999 9999
-2 1 0 1 1 0 0 0 0.000 7 0 0
-	 164 464 174 454 9999 9999
--6
-6 464 159 474 169
-2 1 0 1 1 0 0 0 0.000 7 0 0
-	 464 159 474 169 9999 9999
-2 1 0 1 1 0 0 0 0.000 7 0 0
-	 464 169 474 159 9999 9999
--6
-6 719 264 729 274
-2 1 0 1 1 0 0 0 0.000 7 0 0
-	 719 264 729 274 9999 9999
-2 1 0 1 1 0 0 0 0.000 7 0 0
-	 719 274 729 264 9999 9999
--6
-6 164 154 174 164
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 164 154 174 164 9999 9999
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 164 164 174 154 9999 9999
--6
-6 354 339 364 349
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 354 339 364 349 9999 9999
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 354 349 364 339 9999 9999
--6
-6 269 259 389 394
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 269 294 389 294 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 269 314 389 314 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 269 334 389 334 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 269 354 389 354 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 329 274 329 394 9999 9999
-2 2 0 1 -1 0 0 0 0.000 0 0 0
-	 389 394 389 274 269 274 269 394 389 394 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 269 374 389 374 9999 9999
-4 0 12 10 0 -1 0 0.000 4 9 48 269 269 deppossi

-4 0 12 10 0 -1 0 0.000 4 7 12 274 289 up

-4 0 12 10 0 -1 0 0.000 4 7 24 274 309 next

-4 0 12 10 0 -1 0 0.000 4 7 12 274 329 ed

-4 0 12 10 0 -1 0 0.000 4 7 42 274 389 version

-4 0 12 10 0 -1 0 0.000 4 7 42 274 349 nextrev

-4 0 12 10 0 -1 0 0.000 4 7 42 274 369 backrev

--6
-6 354 359 364 369
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 354 359 364 369 9999 9999
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 354 369 364 359 9999 9999
--6
-6 74 564 194 599
-4 0 12 12 0 -1 0 0.000 4 12 84 74 579 Package: foo

-4 0 12 12 0 -1 0 0.000 4 12 119 74 595 Depends: a | b, c

--6
-6 389 449 399 459
-2 1 0 1 2 0 0 0 0.000 7 0 0
-	 389 449 399 459 9999 9999
-2 1 0 1 2 0 0 0 0.000 7 0 0
-	 389 459 399 449 9999 9999
--6
-6 389 509 399 519
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 389 509 399 519 9999 9999
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 389 519 399 509 9999 9999
--6
-6 304 409 424 544
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 304 444 424 444 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 304 464 424 464 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 304 484 424 484 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 304 504 424 504 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 364 424 364 544 9999 9999
-2 2 0 1 -1 0 0 0 0.000 0 0 0
-	 424 544 424 424 304 424 304 544 424 544 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 304 524 424 524 9999 9999
-4 0 12 10 0 -1 0 0.000 4 9 48 304 419 deppossi

-4 0 12 10 0 -1 0 0.000 4 7 12 309 439 up

-4 0 12 10 0 -1 0 0.000 4 7 24 309 459 next

-4 0 12 10 0 -1 0 0.000 4 7 12 309 479 ed

-4 0 12 10 0 -1 0 0.000 4 7 42 309 539 version

-4 0 12 10 0 -1 0 0.000 4 7 42 309 499 nextrev

-4 0 12 10 0 -1 0 0.000 4 7 42 309 519 backrev

--6
-6 259 119 359 214
-2 2 0 1 -1 0 0 0 0.000 0 0 0
-	 359 214 359 134 259 134 259 214 359 214 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 259 154 359 154 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 259 174 359 174 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 259 194 359 194 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 299 134 299 214 9999 9999
-4 0 12 10 0 -1 0 0.000 4 7 12 264 149 up

-4 0 12 10 0 -1 0 0.000 4 7 24 264 169 next

-4 0 12 10 0 -1 0 0.000 4 7 24 264 189 list

-4 0 12 10 0 -1 0 0.000 4 9 24 264 209 type

-4 0 12 10 0 -1 0 0.000 4 9 60 259 129 dependency

--6
-6 479 279 599 414
-6 564 359 574 369
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 564 359 574 369 9999 9999
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 564 369 574 359 9999 9999
--6
-6 564 319 574 329
-2 1 0 1 2 0 0 0 0.000 7 0 0
-	 564 319 574 329 9999 9999
-2 1 0 1 2 0 0 0 0.000 7 0 0
-	 564 329 574 319 9999 9999
--6
-6 479 279 599 414
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 479 314 599 314 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 479 334 599 334 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 479 354 599 354 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 479 374 599 374 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 539 294 539 414 9999 9999
-2 2 0 1 -1 0 0 0 0.000 0 0 0
-	 599 414 599 294 479 294 479 414 599 414 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 479 394 599 394 9999 9999
-4 0 12 10 0 -1 0 0.000 4 9 48 479 289 deppossi

-4 0 12 10 0 -1 0 0.000 4 7 12 484 309 up

-4 0 12 10 0 -1 0 0.000 4 7 24 484 329 next

-4 0 12 10 0 -1 0 0.000 4 7 12 484 349 ed

-4 0 12 10 0 -1 0 0.000 4 7 42 484 409 version

-4 0 12 10 0 -1 0 0.000 4 7 42 484 369 nextrev

-4 0 12 10 0 -1 0 0.000 4 7 42 484 389 backrev

--6
-6 564 379 574 389
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 564 379 574 389 9999 9999
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 564 389 574 379 9999 9999
--6
-1 3 0 1 4 0 0 0 0.000 1 0.000 569 304 5 5 569 304 574 309
-1 3 0 1 6 0 0 0 0.000 1 0.000 569 344 5 5 569 344 574 349
-4 0 0 12 0 -1 0 0.000 4 6 5 589 289 c

--6
-6 644 409 764 544
-6 729 489 739 499
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 729 489 739 499 9999 9999
-2 1 0 1 5 0 0 0 0.000 7 0 0
-	 729 499 739 489 9999 9999
--6
-6 729 449 739 459
-2 1 0 1 2 0 0 0 0.000 7 0 0
-	 729 449 739 459 9999 9999
-2 1 0 1 2 0 0 0 0.000 7 0 0
-	 729 459 739 449 9999 9999
--6
-6 644 409 764 544
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 644 444 764 444 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 644 464 764 464 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 644 484 764 484 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 644 504 764 504 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 704 424 704 544 9999 9999
-2 2 0 1 -1 0 0 0 0.000 0 0 0
-	 764 544 764 424 644 424 644 544 764 544 9999 9999
-2 1 2 1 -1 0 0 0 3.000 -1 0 0
-	 644 524 764 524 9999 9999
-4 0 12 10 0 -1 0 0.000 4 9 48 644 419 deppossi

-4 0 12 10 0 -1 0 0.000 4 7 12 649 439 up

-4 0 12 10 0 -1 0 0.000 4 7 24 649 459 next

-4 0 12 10 0 -1 0 0.000 4 7 12 649 479 ed

-4 0 12 10 0 -1 0 0.000 4 7 42 649 539 version

-4 0 12 10 0 -1 0 0.000 4 7 42 649 499 nextrev

-4 0 12 10 0 -1 0 0.000 4 7 42 649 519 backrev

--6
-1 3 0 1 4 0 0 0 0.000 1 0.000 734 434 5 5 734 434 739 439
-1 3 0 1 6 0 0 0 0.000 1 0.000 734 474 5 5 734 474 739 479
-1 3 0 1 5 0 0 0 0.000 1 0.000 734 514 5 5 734 514 739 519
-4 0 0 12 0 -1 0 0.000 4 9 6 744 419 b

-4 0 12 12 0 7 0 0.000 4 9 28 719 539 >1.0

--6
-6 449 564 589 599
-4 0 12 12 0 -1 0 0.000 4 12 70 449 579 Package: c

-4 0 12 12 0 -1 0 0.000 4 11 140 449 595 Recommends: b (>1.0)

--6
-1 3 0 1 1 0 0 0 0.000 1 0.000 169 139 5 5 169 139 174 144
-1 3 0 1 1 0 0 0 0.000 1 0.000 669 139 5 5 669 139 674 144
-1 3 0 1 1 0 0 0 0.000 1 0.000 329 164 5 5 329 164 334 169
-1 3 0 1 2 0 0 0 0.000 1 0.000 329 184 5 5 329 184 334 189
-1 3 0 1 2 0 0 0 0.000 1 0.000 469 184 5 5 469 184 474 189
-1 3 0 1 2 0 0 0 0.000 1 0.000 724 289 5 5 724 289 729 294
-1 3 0 1 5 0 0 0 0.000 1 0.000 169 479 5 5 169 479 174 484
-1 3 0 1 5 0 0 0 0.000 1 0.000 669 159 5 5 669 159 674 164
-1 3 0 1 4 0 0 0 0.000 1 0.000 724 249 5 5 724 249 729 254
-1 3 0 1 4 0 0 0 0.000 1 0.000 329 144 5 5 329 144 334 149
-1 3 0 1 4 0 0 0 0.000 1 0.000 469 144 5 5 469 144 474 149
-1 3 0 1 5 0 0 0 0.000 1 0.000 169 319 5 5 169 319 174 324
-1 3 0 1 2 0 0 0 0.000 1 0.000 359 304 5 5 359 304 364 309
-1 3 0 1 4 0 0 0 0.000 1 0.000 359 284 5 5 359 284 364 289
-1 3 0 1 6 0 0 0 0.000 1 0.000 359 324 5 5 359 324 364 329
-1 3 0 1 5 0 0 0 0.000 1 0.000 394 494 5 5 394 494 399 499
-1 3 0 1 4 0 0 0 0.000 1 0.000 394 434 5 5 394 434 399 439
-1 3 0 1 6 0 0 0 0.000 1 0.000 394 474 5 5 394 474 399 479
-2 1 0 1 5 0 0 0 0.000 7 1 0
-	0 0 1.000 4.000 8.000
-	 169 479 299 479 9999 9999
-2 1 0 1 1 0 0 0 0.000 -1 0 1
-	0 0 1.000 4.000 8.000
-	 394 164 329 164 9999 9999
-3 2 0 1 1 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 169 139 199 139 219 144 239 149 254 149 9999 9999
-	 0.000 -190.000 186.321 138.362 193.821 138.362 203.746 139.584
-	 214.444 142.861 223.556 145.139 234.254 148.416 241.590 149.319
-	 245.340 149.319 0.000 -190.000
-3 2 0 1 1 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 669 139 704 144 719 154 734 234 9999 9999
-	 0.000 -190.000 689.270 140.465 698.020 141.715 708.066 145.553
-	 716.306 149.925 728.121 167.798 731.871 187.798 0.000 -190.000
-3 2 0 1 2 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 329 184 319 184 314 184 304 194 304 199 304 259 9999 9999
-	 0.000 0.000 323.209 184.000 320.709 184.000 317.861 184.000
-	 315.246 183.484 310.477 185.460 305.459 190.476 303.484 195.246
-	 304.000 197.861 304.000 209.251 304.000 224.251 0.000 0.000
-3 2 0 1 2 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 359 304 389 309 399 339 404 384 404 419 9999 9999
-	 0.000 0.000 376.183 303.206 383.683 304.456 396.372 315.299
-	 397.434 331.869 401.243 349.210 403.427 373.663 404.332 389.993
-	 404.332 398.743 0.000 0.000
-3 2 0 1 2 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 469 184 504 189 534 229 549 289 9999 9999
-	 0.000 0.000 489.097 184.107 497.847 185.357 515.602 195.870
-	 528.871 218.224 538.758 238.997 542.508 253.997 0.000 0.000
-3 2 0 1 2 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 724 289 709 299 704 414 9999 9999
-	 0.000 0.000 714.657 293.115 710.907 295.615 696.821 320.614
-	 695.571 349.364 0.000 0.000
-3 2 0 1 5 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 394 494 444 499 569 499 639 499 9999 9999
-	 0.000 0.000 422.899 497.321 435.399 498.571 472.526 500.423
-	 540.524 499.000 580.960 499.000 598.460 499.000 0.000 0.000
-3 2 0 1 5 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 669 159 649 159 634 164 604 204 579 289 9999 9999
-	 0.000 0.000 657.478 158.436 652.478 158.436 645.334 159.595
-	 637.243 161.663 623.745 171.392 609.302 193.426 596.954 218.053
-	 590.704 239.303 0.000 0.000
-3 2 0 1 4 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 394 434 414 429 419 424 414 279 364 219 9999 9999
-	 0.000 0.000 405.666 432.138 410.666 430.888 415.525 428.137
-	 418.291 425.798 433.545 387.100 427.322 313.905 408.621 264.907
-	 396.121 249.907 0.000 0.000
-3 2 0 1 4 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 569 304 554 234 529 189 504 174 9999 9999
-	 0.000 0.000 562.162 263.254 558.412 245.754 549.770 222.731
-	 537.823 198.122 525.252 185.125 519.002 181.375 0.000 0.000
-3 2 0 1 4 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 359 284 359 249 354 219 9999 9999
-	 0.000 0.000 359.497 263.759 359.497 255.009 358.568 243.779
-	 357.318 236.279 0.000 0.000
-3 2 0 1 4 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 734 434 724 379 724 324 9999 9999
-	 0.000 0.000 727.366 402.355 724.866 388.605 723.148 369.549
-	 723.148 355.799 0.000 0.000
-3 2 0 1 4 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 724 249 719 209 699 174 9999 9999
-	 0.000 -190.000 722.530 225.840 721.280 215.840 716.720 202.160
-	 711.720 193.410 0.000 -190.000
-3 2 0 1 4 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 329 144 304 144 269 139 219 124 204 124 9999 9999
-	 0.000 -190.000 314.537 144.305 308.287 144.305 295.917 143.426
-	 276.919 140.743 257.308 136.426 231.067 125.771 216.399 123.618
-	 212.649 123.618 0.000 -190.000
-3 2 0 1 5 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 169 319 189 319 229 324 254 329 264 329 9999 9999
-	 0.000 0.000 180.574 318.787 185.574 318.787 198.208 319.573
-	 219.921 322.527 234.742 324.932 248.152 328.421 255.720 329.170
-	 258.220 329.170 0.000 0.000
-3 2 0 1 6 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 394 474 339 469 299 469 259 469 234 469 204 469 9999 9999
-	 0.000 0.000 362.200 470.679 348.450 469.429 329.874 468.586
-	 308.112 469.000 289.888 469.000 268.112 469.000 253.305 469.000
-	 239.695 469.000 228.874 469.000 221.374 469.000 0.000 0.000
-3 2 0 1 6 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 734 474 659 469 434 484 299 489 204 489 9999 9999
-	 0.000 0.000 690.661 470.250 671.911 469.000 607.354 469.001
-	 485.316 481.339 403.258 485.594 329.783 488.430 282.765 489.301
-	 259.015 489.301 0.000 0.000
-3 2 0 1 6 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 569 344 594 339 619 304 634 204 644 174 9999 9999
-	 0.000 0.000 583.473 343.015 589.723 341.765 603.620 332.780
-	 615.079 313.689 628.219 281.222 628.581 226.603 635.271 198.699
-	 637.771 191.199 0.000 0.000
-3 2 0 1 6 0 0 0 0.000 1 0
-	0 0 1.000 4.000 8.000
-	 359 324 294 319 204 309 9999 9999
-	 0.000 0.000 321.344 321.293 305.094 320.043 278.591 317.552
-	 256.091 315.052 0.000 0.000
-3 2 0 1 5 0 0 0 0.000 0 1
-	0 0 1.000 4.000 8.000
-	 429 514 564 519 714 519 734 514 9999 9999
-	 0.000 0.000 507.163 517.323 540.913 518.573 598.180 519.633
-	 679.471 523.251 717.559 518.562 722.559 517.312 0.000 0.000
-3 2 0 1 4 0 0 0 0.000 0 1
-	0 0 1.000 4.000 8.000
-	 204 99 364 109 414 139 469 144 9999 9999
-	 0.000 0.000 296.049 97.811 336.049 100.311 377.555 113.214
-	 400.605 134.627 423.515 142.106 437.265 143.356 0.000 0.000
-4 0 0 12 0 -1 0 0.000 4 9 15 159 104 foo

-4 0 0 12 0 -1 0 0.000 4 6 5 479 129 c

-4 0 0 12 0 -1 0 0.000 4 12 42 309 209 depends

-4 0 0 12 0 -1 0 0.000 4 12 42 449 209 depends

-4 0 0 12 0 -1 0 0.000 4 9 6 744 234 b

-4 0 0 12 0 -1 0 0.000 4 6 18 714 314 rec.

-4 0 0 12 0 -1 0 0.000 4 6 6 164 264 a

-4 0 0 12 0 -1 0 0.000 4 9 6 164 424 b

-4 0 0 12 0 -1 0 0.000 4 6 5 664 104 c

-4 0 0 18 0 -1 0 0.000 4 17 632 64 54 example of the structures (in the C code) which contain related packages information

-4 0 12 12 0 -1 0 0.000 4 12 70 284 589 Package: a

-4 0 0 12 0 -1 0 0.000 4 6 6 374 269 a

-4 0 0 12 0 -1 0 0.000 4 9 6 384 419 b

-4 0 0 12 0 -1 0 0.000 4 9 15 339 129 a|b

-4 0 12 12 0 -1 0 0.000 4 12 70 674 589 Package: b

doc/en/reference.sgml

@@ -1,976 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-  <!ENTITY debian "<productname>Debian</productname>">
-  <!ENTITY dpkg "<command>dpkg</command>">
-  <!ENTITY dselect "<command>dselect</command>">
-  <!ENTITY deb "<filename>.deb</filename>">
-]>
-<book id="reference">
-<bookinfo>
-  <title>dpkg reference Manual</title>
-  <edition>draft</edition>
-
-  <authorgroup>
-    <author>
-      <firstname>Wichert</firstname>
-      <surname>Akkerman</surname>
-      <affiliation>
-	<address>
-	  <email>wichert@deephackmode.org</email>
-	</address>
-      </affiliation>
-    </author>
-  </authorgroup>
-
-  <copyright>
-    <year>2001</year>
-    <year>2002</year>
-    <holder>Wichert Akkerman</holder>
-  </copyright>
-
-  <legalnotice>
-    <para>
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1 or any
-      later version published by the Free Software Foundation. There are
-      no invariant sections. A copy of the license is included in the section
-      entitled "GNU Free Documentation License".
-    </para>
-  </legalnotice>
-</bookinfo>
-
-<preface>
-  <title>Preface</title>
-
-  <para>
-    This manual is a reference to the &debian; package management system.
-  </para>
-
-  <para>
-    This manual is currently being written based on the previous packaging
-    manual and as such is a work in progress.
-  </para>
-</preface>
-
-<chapter id="intro">
-  <title>Introduction</title>
-
-  <para>
-    The Debian package management system is build up from various seperate
-    tools that work together form a comprehensive system to manage your
-    system.
-  </para>
-
-  <para>
-    This document describes all the tools that used to handle and produce
-    them as well as the file formats used.
-  </para>
-</chapter>
-
-
-<chapter id="versions">
-  <title>Version numbers</title>
-
-  <para>
-    It is essential for a packaging system to have a documented method to
-    compare version numbers. Unfortunately there are different ways of
-    dealing with them, each with their own good and bad sides. This chapter
-    describes how &dpkg; compares version numbers.
-  </para>
-
-  <para>
-    Version numbers are ASCII strings made up from alphanumeric characters
-    (letters and digits) and the hyphen (<keycap>-</keycap>), dot
-    (<keycap>.</keycap>), plus (<keycap>+</keycap>), minus
-    (<keycap>-</keycap>) and colon (<keycap>:</keycap>) characters.
-  </para>
-
-  <para>
-    A version number consists of two parts: the upstream version, and
-    optionally the package revision, which are seperated by a hyphen.
-    If there is no seperate package revision then the upstream version is
-    not allowed to contain a hyphen.
-  </para>
-
-  <para>
-    Comparing version numbers is done by breaking them into pieces and
-    comparing those from left to right. Pieces are seperated by a
-    transition from numbers to letters and by non-alphanumeric
-    characters. Starting from &dpkg; 1.10 numbers of unlimited length may
-    be used. Olders versions converted numbers to integers before comparing
-    them and as a result can not handle numbers that do not fit into the C
-    type int (2^31-1 on 32bit architectures and 2^63-1 on 64bit
-    architectures).
-  </para>
-</chapter>
-
-
-<chapter id="diversions">
-  <title>Managing diversions</title>
-
-  <para>
-    Diversions are a method to instruct &dpkg; to use a different filename
-    when installing a file. This can be useful to prevent conflicts between
-    related packages or when a system administator wants to replace a file
-    with another version.
-  </para>
-
-  <para>
-    Diversions are specific to either a package or the local system.  A
-    package specific diversion will only divert a file if it does not
-    belongs to a specific package that was given when the diversion was
-    created. This allow a package to divert a file from other packages and
-    replacing them with its own copy. Local diversions are applied to all
-    packages and can be used by the system administrator.
-  </para>
-
-  <section>
-    <title>Managing diversions with dpkg-divert</title>
-
-    <tip>
-      <para>
-	The official documentation for <command>dpkg-divert</command> can always
-	be found online in the
-	<citerefentry><refentrytitle>dpkg-divert</refentrytitle>
-	<manvolnum>8</manvolnum></citerefentry> manual page.
-      </para>
-    </tip>
-
-    <section>
-    <title>Adding new diversions</title>
-
-    <para>New options can be added using the <emphasis>--add</emphasis>
-    option for <command>dpkg-divert</command>. Its syntax is:
-    </para>
-
-    </section>
-
-  </section>
-</chapter>
-
-<chapter id="permissions">
-  <title>Managing file permissions / ownership</title>
-
-  <para>
-    When you install a package &dpkg; will use the ownership and permissions
-    that are used inside the package. In some situations you might not agree
-    with those defaults and would like to use other settings. To support this
-    a feature called statoverrides was introduced in &dpkg; 1.8.0, and an
-    accompanying tool called <command>dpkg-statoverride</command>.
-  </para>
-
-  <note>
-    <para>
-      Even though we use the word file here, this applies to all filesystem
-      objects that &dpkg; handles, including directories,
-      devices, etc.
-    </para>
-  </note>
-
-  <caution>
-    <para>
-      If you look at the &dpkg; changelog you will see that statoverrides
-      were actually added in version 1.7.0. However that version had
-      some problems both in <command>dpkg-statoverrides</command> which
-      broke adding and removing of overrides and in &dpkg; itself which
-      made it only apply overrides to normal files. Both problems
-      were fixed in version 1.8.0.
-    </para>
-  </caution>
-
-  <section>
-    <title>How permissions and ownership are applied</title>
-
-    <para>
-      &dpkg; uses the following logic to determine the ownership and
-      permissions to use when installing a file:
-    </para>
-
-    <orderedlist>
-      <listitem><para>Check if there is a statoverride registered for this file
-      </para></listitem>
-
-      <listitem><para>If an override is present use the ownership and permission
-	specified in the override.</para></listitem>
-
-      <listitem><para>If no override is present:</para>
-
-	<orderedlist>
-	  <listitem><para>Check if there is a system account with the same name
-	    as the owner used inside the archive. If so use that as owner,
-	    otherwise use the uid as used in the package.
-	  </para></listitem>
-
-	  <listitem><para>Check if there is a system group with the same name
-	    as the group used inside the archive. If so use that as group,
-	    otherwise use the gid as used in the package.
-	  </para></listitem>
-
-	  <listitem><para>Use the permissions as used in the package.
-	  </para></listitem>
-	</orderedlist>
-      </listitem>
-    </orderedlist>
-
-    <para>
-      The exact method that &dpkg; uses to set the ownership and permissions
-      depends on the type of file that is being created:
-    </para>
-
-    <variablelist>
-      <varlistentry>
-	<term>regular files</term>
-	<listitem><para>Created with owner and group set to
-	  <filename>root</filename> and with mode 0. After the data has
-	  been written to the file the ownership and mode are set to their
-	  final values.
-	</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>FIFOs</term>
-	<term>character and block devices</term>
-	<term>directories</term>
-	<listitem><para>Created with owner and group set to
-	  <filename>root</filename> and with mode 0, and then updated
-	  to set the ownership and mode to their final values.
-	</para></listitem>
-      </varlistentry>
-	  
-      <varlistentry>
-	<term>Hardlinks</term>
-	<listitem><para>After the link has been made its ownership and
-	  permissions are setup. <emphasis>This means the original file
-	  will also be changed!</emphasis>
-	</para></listitem>
-      </varlistentry>
-    </variablelist>
-  </section>
-
-  <section>
-    <title>Managing overrides with dpkg-statoverride</title>
-
-    <tip>
-      <para>
-	The official documentation for <command>dpkg-statoverride</command> can
-	always be found online in the
-	<citerefentry><refentrytitle>dpkg-statoverride</refentrytitle>
-	<manvolnum>8</manvolnum></citerefentry> manual page.
-      </para>
-    </tip>
-
-    <section>
-      <title>Listing overrides</title>
-
-      <para>
-	You can get a list of all overrides present in the database by using the
-	<option>--list</option> option:
-      </para>
-
-      <blockquote><para>
-	<synopsis><command>dpkg-statoverride</command> <option>--list</option> <parameter>&lt;glob&gt;</parameter></synopsis>
-</para></blockquote>
-
-      <para>
-	There is an optional glob option that restricts the output from
-	<option>--list</option> to overrides for files that match the glob
-	expression. 
-      <para>
-
-      <footnote>
-	<para>
-	  Please see the <citerefentry><refentrytitle>sh</refentrytitle>
-	  <manvolnum>1</manvolnum></citerefentry> or
-	  <citerefentry><refentrytitle>glob</refentrytitle><manvolnum>7</manvolnum>
-	  </citerefentry> for a description of glob syntax.
-	</para>
-      </footnote>
-
-      <example>
-	<title>Listing overrides</title>
-	<programlisting>
-[fog;~]-1# dpkg-statoverride --list
-root root 0755 /bin/mount
-root root 0755 /bin/ping
-[fog;~]-2# dpkg-statoverride --list '*mount*'
-root root 0755 /bin/mount
-</programlisting>
-      </example>
-    </section>
-
-    <section>
-      <title>Adding new overrides</title>
-
-      <para>
-	New options can be added using the <option>--add</option> option
-	for <command>dpkg-statoverride</command>. Its syntax is:
-      </para>
-
-      <blockquote><para>
-	<synopsis><command>dpkg-statoverride</command> <option>--add</option> <parameter>&lt;user&gt;</parameter> <parameter>&lt;group&gt;</parameter> <parameter>&lt;mode&gt;</parameter> <parameter>&lt;file&gt;</parameter>
-</synopsis></para></blockquote>
-      
-      <para>
-	This will add an override for <filename>&lt;file&gt;</filename> by
-	telling &dpkg; to use the user, group and mode given to
-	<command>dpkg-statoverride</command>. The user and group can be
-	specified in two ways: either by using the name as found in the
-	system account database (ie <filename>/etc/passwd</filename>, NIS or
-	another source configured in
-	<filename>/etc/nsswitch.conf</filename>), or by using a number
-	prefixed with <computeroutput>#</computeroutput>.
-      </para>
-
-      <example>
-	<title>Adding an override</title>
-
-      <programlisting>
-
-[fog;~]-1# ls -l /bin/mount
--rwsr-xr-x    1 root     root        56284 Nov 23 06:14 /bin/mount
-[fog;~]-2# dpkg-statoverride --add root root 0755 /bin/mount
-[fog;~]-3# ls -l /bin/mount
--rwsr-xr-x    1 root     root        56284 Nov 23 06:14 /bin/mount
-</programlisting>
-      </example>
-
-      <para>
-	Adding an override does not update the file on the filesystem, unless
-	you also specify the <option>--update</option> option.
-      </para>
-
-      <example>
-	<title>Adding an override using --update</title>
-
-	<programlisting>
-[fog;~]-1# ls -l /bin/mount
--rwsr-xr-x    1 root     root        56284 Nov 23 06:14 /bin/mount
-[fog;~]-2# dpkg-statoverride --update --add root root 0755 /bin/mount
-[fog;~]-3# ls -l /bin/mount
--rwxr-xr-x    1 root     root        56284 Nov 23 06:14 /bin/mount
-</programlisting>
-    </example>
-
-    <para>
-      If an override already exists and you want to replace it you can
-      use the <option>--force</option> to force <command>dpkg-statoverride
-      </command> to replace the existing override.
-    </para>
-
-    <example>
-      <title>Replacing an existing override</title>
-      <programlisting>
-[fog;~/sources/play/pkg-manual]-1# dpkg-statoverride --add root root 0755 /bin/mount
-An override for "/bin/mount" already exists, aborting
-[fog;~]-2# dpkg-statoverride --force --add root root 0755 /bin/mount
-An override for "/bin/mount" already exists, but --force specified so lets ignore it.
-[fog;~]-3# dpkg-statoverride --list /bin/mount
-root root 0755 /bin/mount
-</programlisting>
-    </example>
-  </section>
-
-  <section>
-    <title>Removing overrides</title>
-    <para>
-    Overrides can be removed using the <option>--remove</option> option,
-    which takes a single filename as argument:
-    </para>
-
-    <blockquote><para>
-      <synopsis><command>dpkg-statoverride</command> <option>--remove</option> <parameter>&lt;file&gt;</parameter></synopsis>
-</para></blockquote>
-
-    <para>
-    This will remove the override for <filename>&lt;file&gt;</filename>
-    from the database.
-    </para>
-
-    <note>
-      <para>When an override for a file is removed its ownership and permission
-      are <emphasis>not</emphasis> restored to the original value.
-      </para>
-    </note>
-
-    <example>
-      <title>Removing an override</title>
-      <programlisting>
-[fog;~]-1# dpkg-statoverride --list
-root root 0755 /bin/mount
-[fog;~]-2# dpkg-statoverride --remove /bin/mount
-[fog;~]-3# dpkg-statoverride --list
-[fog;~]-4#
-</programlisting>
-    </example>
-  </section>
-
-  </section>
-</chapter>
-
-
-<chapter id="formats">
-  <title>File formats</title>
-  <para>
-    This chapter describes all the file formats used by the package tools.
-    All files are text files which you can view and modify using any normal
-    text editor if needed.
-  </para>
-
-  <para>
-    Most file formats are based on the RFC822 format, which is best known
-    as the format used in e-mail headers.
-  </para>
-
-  <para>
-    Each format has a version number which indicates the revision of the
-    format being used. This version is always of the form "X.Y". The
-    first number (X) is the major version. Within a major version the only
-    allowed changes in format are the addition of new fields. This guarantees
-    that tools will always be fully backwards and upwards compatible within
-    a major version.
-  </para>
-
-  <section>
-    <title>RFC822</title>
-    <para>
-      A RFC822 style messages consists of one or more blocks, seperated by
-      null lines (an empty line). Each block is made up of fields. Fields
-      can be folded over multiple lines by inserting a 'newline whitespace'
-      pair. This combination is interpreted as a single whitespace.
-    </para>
-
-    <para>
-      Each fiels is a single line consisting of a field-name and a
-      field-body, seperated by a colon (:). The field-name is made up
-      from printable ASCII characters minus the colon. The field-body
-      may be composed of all ASCII characters except CR or LF (they
-      are automatically removed when unfolding lines).
-    </para>
-
-    <example>
-      <title>RFC822 style file</title>
-
-      <programlisting>
-Header: value
-Description: this is an example of an RFC822 style message
-
-Section: new
-Name: body
-Description: this is block 2 of the example
-X-Fortune:
- To be excellent when engaged in administration is to be like the North
- Star.  As it remains in its one position, all the other stars surround it.
- -- Confucius
-</programlisting>
-    </example>
-  </section>
-
-  <section>
-    <title>changes file</title>
-
-    <para>
-      The <filename>.changse</filename> file is used to describe a set of
-      files that is going to be installed in an archive. All files have to
-      belong to the same source package. The data in a
-      <filename>changes</filename> include  the changes made since the
-      previous revision, version and architecture information and the list
-      of files that form the change set along with a checksum
-    </para>
-
-    <para>
-      Just like other dpkg datafiles this file is formated using RFC822
-      syntax. In addition the file can signed as an OpenPGP ASCII armored
-      message (see RFC2440). The table below lists the allowed fields
-      in a <filename>.dsc</filename> file. The order used is not important,
-      although <command>dpkg-genchanges</command> will output the fields using
-      the ordering used in the table.
-    </para>
-
-    <table>
-      <title>Fields in a <filename>.changes</filename> file</title>
-      <tgroup cols="2">
-        <thead>
-	  <row>
-	    <entry>Field</entry>
-	    <entry>Description</entry>
-	  </row>
-	</thead>
-
-	<tbody>
-	  <row>
-	    <entry>Format</entry>
-	    <entry>
-	      Version of the file format used. Currently 1.7.
-	    </entry>
-	  </row>
-	  <row>
-	    <entry>Date</entry>
-	    <entry>
-	      The date (in RFC822 format) when the change set was build.
-	    </entry>
-	  </row>
-	  <row>
-	    <entry>Source</entry>
-	    <entry>
-	      The name of the source package from which the changes were
-	      build.
-	    </entry>
-	  </row>
-	  <row>
-	    <entry>Binary</entry>
-	    <entry>
-	      The binary packages (ie &deb; files) that are part of the
-	      change set.
-	    </entry>
-	  </row>
-	  <row>
-	    <entry>Architecture</entry>
-	    <entry>
-	      A space seperate list of architectures for which files are
-	      included in the set.
-	    </entry>
-	  </row>
-	  <row>
-	    <entry>Version</entry>
-	    <entry>
-	      Version number of the source from which the files were built.
-	    </entry>
-	  </row>
-	  <row>
-	    <entry>Distribution</entry>
-	    <entry>
-	      Distribution in which the changes should be installed, as taken from
-	      <filename>debian/changelog</filename>.
-	    </entry>
-	  </row>
-	  <row>
-	    <entry>Urgency</entry>
-	    <entry>
-	      Urgency of the changes, as taken from
-	      <filename>debian/changelog</filename>.
-	    </entry>
-	  </row>
-	  <row>
-	    <entry>Maintainer</entry>
-	    <entry>
-	      The maintainer of the package, as listed in
-	      <filename>debian/control</filename>.
-	    </entry>
-	  </row>
-	  <row>
-	    <entry>Changed-By</entry>
-	    <entry>
-	      The person who made the last changes to the sources, as
-	      listed in <filename>debian/changelog</filename>.
-	    </entry>
-	  </row>
-	  <row>
-	    <entry>Description</entry>
-	    <entry>
-	      Multi-line field describing the &deb; files in the package.
-	      Each line describes a single package in the format
-	      "packagename - short description".
-	    </entry>
-	  </row>
-	  <row>
-	    <entry>Closes</entry>
-	    <entry>
-	      Space seperate list of bugreports which are closed by this
-	      change set. (Optional)
-	    </entry>
-	  </row>
-	  <row>
-	    <entry>Changes</entry>
-	    <entry>
-	      Multi-line field with the changes made since the previous
-	      version, as taken from <filename>debian/changelog</filename>.
-	      Can possibly mention changes for multiple versions.
-	    </entry>
-	  </row>
-	  <row>
-	    <entry>Files</entry>
-	    <entry>
-	      Multi-line field with the list of files in the change set.
-	      Each line describes a single file in the format "MD5 filesize
-	      filename".
-	    </entry>
-	  </row>
-        </tbody>
-      </tgroup>
-    </table>
-  </section>
-
-  <section>
-    <title>dsc file</title>
-
-    <para>
-      The <filename>.dsc</filename> file describes the source for a Debian
-      package: it contains general information over the source such as the
-      name of the package and which binary package it produces as well as
-      the files that contain the sourcecode.
-    </para>
-    
-    <para>
-      Just like other dpkg datafiles this file is formated using RFC822
-      syntax. In addition the file can signed as an OpenPGP ASCII armored
-      message (see RFC2440). The table below lists the allowed fields
-      in a <filename>.dsc</filename> file. The order used is not important,
-      although <command>dpkg-source</command> will output the fields using
-      the ordering used in the table.
-    </para>
-
-    <table>
-      <title>Fields in a <filename>.dsc</filename> file</title>
-      <tgroup cols="2">
-	<thead>
-	  <row><entry>Field</entry><entry>Description</entry></row>
-	</thead>
-	<tbody>
-	  <row><entry>Format</entry>
-	       <entry>Version of the file format used. Currently 1.0.
-	       </entry></row>
-	  <row><entry>Source</entry>
-	       <entry>Name of the source package</entry></row>
-	  <row><entry>Version</entry>
-	       <entry>Version number of the source</entry></row>
-	  <row><entry>Binary</entry>
-	       <entry>comma seperated list of binary packages build from this
-		  source</entry></row>
-	  <row><entry>Origin</entry>
-	       <entry>Name of the organization that procuded this package
-		      </entry></row>
-	  <row><entry>Maintainer</entry>
-	       <entry>Maintainer of this package</entry></row>
-	  <row><entry>Uploaders</entry>
-	       <entry>Multi-line field with list of people authorized to make
-		      uploads of a package (optional)</entry>
-	  <row><entry>Architecture</entry>
-	       <entry>Space seperated list of architectures for which package
-		      are build from this source</entry></row>
-	  <row><entry>Standards-Version</entry>
-	       <entry>Version of &debian; policy this package is complient
-		      with</entry></row>
-	  <row><entry>Files</entry>
-	       <entry>Multi-line field with list of files with the actual source
-		      code</entry></row>
-	</tbody>
-      </tgroup>
-    </table>
-
-    <para>
-      The Files field contains one line for each file that is
-      contains source for this package (only 2 files are supported: a
-      <filename>.tar.gz</filename> file with the (original) source, and
-      an optional <filename>.diff.gz</filename> with Debian changes to the
-      source). Each file description consists of 3 items, seperated by
-      a single space:
-
-      <orderedlist>
-	<listitem><para>A MD5 checksum of the file</para></listitem>
-	<listitem><para>The filesize in bytes</para></listitem>
-	<listitem><para>The filename</para></listitem>
-      </orderedlist>
-    </para>
-
-    <example>
-      <title>modutils .dsc file</title>
-
-      <programlisting>
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-Format: 1.0
-Source: modutils
-Version: 2.4.1-1
-Binary: modutils
-Origin: debian
-Maintainer: Wichert Akkerman &lt;wakkerma@debian.org&gt;
-Architecture: any
-Standards-Version: 3.2.0
-Files: 
- 6d69ff476c964e703659d950999e411c 246022 modutils_2.4.1.orig.tar.gz
- 3de7100460662472404f8a83cccde6da 17219 modutils_2.4.1-1.diff.gz
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.0.4 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-
-iEYEARECAAYFAjpbNIAACgkQPLiSUC+jvC1CFQCePvKBH6qT7/BKXVHCamKXZvZq
-Be8An1QDPcyDFtMddYJw/BwTVphbwzU6
-=Zl3g
------END PGP SIGNATURE-----
-</programlisting>
-    </example>
-  </section>
-
-  <section>
-    <title>control</title>
-
-    <table>
-      <title>Fields in the source section of the <filename>control</filename>
-	     file</title>
-      <tgroup cols="2">
-	<thead>
-	  <row><entry>Field</entry>
-	       <entry>required</entry>
-	       <entry>Description</entry>
-	  </row>
-	</thead>
-	<tbody>
-	  <row><entry>Source</entry><entry>yes</entry>
-	       <entry>Name of the source package</entry></row>
-	  <row><entry>Section</entry><entry>no</entry>
-	       <entry>Package category for this package, used by frontends.
-		      </entry></row>
-	  <row><entry>Priority</entry><entry>no</entry>
-	       <entry>Indication of package importance. Legal values are
-		      extra, important, optional, required and standard.
-		      </entry></row>
-	  <row><entry>Maintainer</entry><entry>yes</entry>
-	       <entry>Name of the source package</entry></row>
-	  <row><entry>Standards-Version</entry><entry>no</entry>
-	       <entry>Version of &debian; policy this package is complient
-		      with</entry></row>
-	  <row><entry>Build-Depends, Build-Conflicts,
-		      Build-Depends-Indep, Build-Conflicts-Indep</entry><entry>no</entry>
-	       <entry>Specify demands on the build environment</entry></row>
-	  <row><entry>Bugs</entry><entry>no</entry>
-	       <entry>Name of the source package</entry></row>
-	  <row><entry>Origin</entry><entry>no</entry>
-	       <entry>Name of the source package</entry></row>
-	</tbody>
-      </tgroup>
-    </table>
-
-
-    <table>
-      <title>Fields in the package section of the <filename>control</filename>
-	     file</title>
-      <tgroup cols="2">
-	<thead>
-	  <row><entry>Field</entry>
-	       <entry>required</entry>
-	       <entry>Description</entry>
-	  </row>
-	</thead>
-	<tbody>
-	  <row><entry>Package</entry><entry>yes</entry>
-	       <entry>Name of the package</entry></row>
-	  <row><entry>Architecture</entry><entry>yes</entry>
-	       <entry>Space seperated list of architectures for which package
-		      are build from this source</entry></row>
-	  <row><entry>Essential</entry><entry>no</entry>
-	       <entry>Indicates if a package is essential to the system
-		      </entry></row>
-	  <row><entry>Pre-Depends, Depends, Recommends, Suggests, Replaces,
-		      Conflicts</entry><entry>no</entry>
-	       <entry>Specify relations to other packages</entry></row>
-	  <row><entry>Description</entry><entry>yes</entry>
-	       <entry>Description of the package</entry></row>
-	</tbody>
-      </tgroup>
-    </table>
-  </section>
-
-  <section>
-    <title>diversions</title>
-
-    <para>
-      The <filename>diversions</filename> file contains all the alternatives
-      defined on this system. It is located in the &dpkg; admin directory.
-    </para>
-
-    <note>
-      <para>
-	This is an internal &dpkg; file: do not edit it by hand unless really
-	needed, but use the <command>dpkg-divert</command> tool instead.
-      </para>
-    </note>
-
-    <para>
-      For each diversion there are 3 lines in the diversions file:
-      <orderedlist>
-	<listitem><para>
-	  The name of the file that will be diverted.
-	</para></listitem>
-
-       <listitem><para>
-	 The filename that the diverted file will be diverted to.
-       </para></listitem>
-
-       <listitem><para>
-	 The name of the package that made this diversion. If it is a
-	 local (ie user) diversion the magic packagename `:' is used
-	 instead.
-       </para></listitem>
-      </orderedlist>
-    </para>
-
-    <example>
-      <title>Example <filename>diversions</filename> file</title>
-
-      <programlisting>
-/sbin/modprobe
-/sbin/modprobe.orig
-:
-/usr/bin/locate
-/usr/bin/locate.notslocate
-slocate
-</programlisting>
-    </example>
-  </section>
-
-  <section>
-    <title>statoverrides</title>
-    <para>
-      This file contains the list of all statoverrides that &dpkg; uses
-      when unpacking packages. It is located in the &dpkg; admin
-      directory. Each line in the file represents one override, and
-      comments are not allowed.
-    </para>
-
-    <note>
-      <para>
-	This is an internal &dpkg; file: do not edit it by hand unless really
-	needed, but use the <command>dpkg-statoverride</command> tool instead.
-      </para>
-    </note>
-
-    <para>
-      Each line contains 4 items, seperated by whitespace:
-      <orderedlist>
-	<listitem><para>
-	  The owner to use. This can be either an accountname that must
-	  be present on the system, or a numerical uid. Uids are prefixed
-	  with a <computeroutput>#</computeroutput>.
-	</para></listitem>
-
-	<listitem><para>
-	  The group to use. This can be either a group that must be present on
-	  the system, or a numerical gid. Gids are prefixed
-	  with a <computeroutput>#</computeroutput>.
-	</para></listitem>
-
-	<listitem><para>
-	  Mode to use for this file. This is an octal number.
-	</para></listitem>
-
-	<listitem><para>
-	  The filesystem object (file, directory, device, FIFO or link)
-	  to which this override should be applied. Since this is the
-	  last item on a line it may contain whitespace.
-	</para></listitem>
-      </orderedlist>
-    </para>
-
-    <example>
-      <title>Example <filename>statoverride</filename> file</title>
-      <programlisting>
-root wheel 04750 /bin/su
-root adm 0750 /var/log/apache
-</programlisting>
-
-      <para>
-        This will tell &dpkg; to do the following:
-      </para>
-
-      <itemizedlist>
-	<listitem><para><filename>/bin/su</filename> is installed owned by
-	  user <computeroutput>root</computeroutput> and group
-	  <computeroutput>wheel</computeroutput> with mode 04750. This means
-	  that only people in the <computeroutput>wheel</computeroutput>
-	  group are allowed to run <command>su</command>.
-        </para></listitem>
-  
-	<listitem><para><filename>/var/log/apache</filename> is installed
-	  owned by user <computeroutput>root</computeroutput> and group
-	  <computeroutput>adm</computeroutput> with mode 0750. This
-	  restricts the ability to view the
-	  <productname>apache</productname> to people in the
-	  <computeroutput>adm</computeroutput> group by disallowing others
-	  to access the <filename>/var/log/apache</filename> directory.
-        </para></listitem>
-      </itemizedlist>
-    </example>
-  </section>
-
-  <section>
-    <title>alternatives</title>
-
-    <para>
-      The configuration for alternatives is spread over two places: the
-      symlink to the selected alternative is stored in /etc/alternatives
-      and the list of available alternatives is kept in a series of files
-      in <filename>/var/lib/dpkg/alternatives/</filename>.
-    </para>
-
-    <para>
-      For each alternative there is a single file in
-      <filename>/var/lib/dpkg/alternatives/</filename> named after the
-      the alternative it describes. The file is a normal text file:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-	<para>
-	  The first line lists the state of the alternative, either
-	  `manual' or `auto'. 
-	</para>
-      </listitem>
-
-      <listitem>
-	<para>
-	  The second line is the filename that the alternative will
-	  provide.
-	</para>
-      </listitem>
-
-      <listitem>
-	<para>
-	  A list of zero or more slave links. For each slave there are
-	  two lines: the first contains the name of the slave and the
-	  second contains the filename.
-	</para>
-      </listitem>
-
-      <listitem>
-	<para>
-	  An empty line
-	</para>
-      </listitem>
-
-      <listitem>
-	<para>
-	  A list of one or more alternatives. Each alternative is made up
-	  as follows:
-	</para>
-
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      The filename of the file providing the alternative.
-	    </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
-	      The priority
-	    </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
-	      For each slave link a single line with the file providing
-	      the link. An empty line can be used to indicate an
-	      alternative does not provide a slave.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </listitem>
-    </itemizedlist>
-  </section>
-</chapter>
-
-</book>
-
-<!-- vi: sw=2 tw=75
--->

doc/internals.sgml

@@ -1,544 +0,0 @@
-<!doctype debiandoc system [
-<!entity % manuals-version-def system "manuals-version">
-%manuals-version-def;
-]>
-<debiandoc><book>
-
-<titlepag>
-<title>dpkg Internals Manual</title>
-<author>
-  <name>Klee Dienes</name>
-  <email>klee@mit.edu</email>
-</author>
-<version>Version &manuals-version; (dpkg &dpkg-version;)</version>
-<abstract>
-This manual describes the internal structure of the <prgn>dpkg</prgn> package
-management system.
-</abstract>
-
-<copyright>
-<copyrightsummary>
-Copyright &copy;1997 Klee Dienes &lt;klee@mit.edu&gt;
-</copyrightsummary>
-<p>
-This manual is free software; you may 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.
-<p>
-This is distributed in the hope that it will be useful, but
-<em>without any warranty</em>; without even the implied warranty of
-merchantability or fitness for a particular purpose.  See the GNU
-General Public License for more details.
-<p>
-You should have received a copy of the GNU General Public License with
-your Debian system, in <file>/usr/share/common-licenses/GPL</file>, or
-with the <prgn>dpkg</prgn> source package as the file <file>COPYING</file>.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
-</copyright>
-</titlepag>
-
-<toc detail="sect">
-
-<chapt id=build>
-<heading>Build Notes</heading>
-  <sect id=automake>
-  <heading>Automake</heading>
-<p>
-This section by Tom Lees &lt;tom@lpsg.demon.co.uk&gt; on Tue, 4 Mar 1997
-21:34:57 +0000, with subsequent modifications by Klee Dienes &lt;klee@debian.org&gt;
-
-<p>
-This chapter contains general notes about the conversion to
-<prgn>automake</prgn>.  If you plan on doing anything with <prgn>dpkg</prgn>, you
-should probably read all of this file first.  You have been warned.
-
-<p>
-Automake has several significant advantages, including:
-
-<list>
-<item>it supports emacs lisp properly
-<item>It supports libtool properly
-<item>it includes the aclocal utility
-</list>
-
-<p>
-The <prgn>aclocal</prgn> utility is a very useful program which will automatically
-build an <file>aclocal.m4</file> file from the <file>configure.in</file> file to include the
-appropriate macros.
-
-<p>
-This doesn't affect anything other than rebuilding the <file>Makefile.in</file> files
-from the sources.
-
-<p>
-Probably the main difference which is noticable is that instead of
-using proprietary directory names, it now supports <em>configure
---sharedstatedir</em>, and <em>configure --localstatedir</em>. To set these
-to the Debian defaults, you should use <em>./configure
---localstatedir=/etc --sharedstatedir=/var/lib</em>.
-
-<p>
-I have also customized the canonicalizing macros found in
-<em>autoconf</em> to include the old way of finding the <prgn>dpkg</prgn>
-``architecture'', i.e. to be a bit more smart. Instead of it trying to
-determine the architecture only, I changed it to use the `host',
-`build', and `target' system types. The target CPU type is checked
-against the archtable to find the architecture on which dpkg will run.
-
-<p>
-It uses <em>gcc --print-libgcc-file-name</em> to find out the build
-architecture if possible (used later to determine ELF or <em>a.out</em>
-format), and also uses <em>dpkg --print-architecture</em> if possible to
-modify the <em>cpu</em> field before it passes on the target alias to
-config.sub. If you want to specify the architecture, you should now
-use "--target=", rather than <em>--with-arch</em>, which was essentially
-a hack anyway.  The old <em/--with-arch/ is still there, but it is
-somewhat less functional. I have also moved the
-<em/DPKG_CACHED_/ macros into dpkg.m4 to make configure.in a bit
-more readable.
-
-<p>
-I also converted to libtool (which can be found in the Debian
-distribution now). Essentially, this means that all the dpkg tools can
-be compiled against a shared <em>libdpkg</em> without much hassle (in
-fact, it is the default). You do not need to install libtool to use
-this feature (it works like autoconf), and generally, it should not be
-needed much at all.
-
-<p>
-The new <em>dist</em> targets will build a distribution including all
-files built by the <prgn>debiandoc2html</prgn>, <prgn>debiandoc2ps</prgn>, etc.,
-which are included in the distribution so that people may build <prgn>dpkg</prgn>
-without these (especially useful to porters).
-
-<p>
-A target <em/make debian/ has been added, which will build the
-Debian files from a working directory (does a <em/make dist/
-first). Now all we need is a modified dpkg-source so that the
-<file/dpkg-1.4.0.8.tar.gz/ GNU-distribution file can be used as part
-of the Debian distribution.  I'm working on this, but it doesn't work
-too well at the moment (find it in examples).
-
-<p>
-I removed the <em/make portable/ target - it doesn't do anything useful.
-
-<p>
-I have added <em/make uninstall/ targets to aid non-Debian users who simply
-want to try out certain Debian packages, and the "dist" targets are also
-useful to build a "distribution" of the dpkg tool. Note that since automake
-automatically includes dependencies into the Makefiles in a distribution,
-if you want to modify the C files, it would be advisable to get and install
-automake, and then re-run it in the base dpkg distribution directory, so that
-automatic dependency generation will be switched back on, and any
-dependencies which change will be taken account of. The "make maintainer-clean"
-targets will remove all files which any of the following utilities create:
-
-<list>
-<item>automake
-<item>autoconf
-<item>aclocal
-<item>autoheader
-<item>gettextize
-<item>libtoolize
-</list>
-
-<p>
-If you want to modify any of the sources, I recommend that you do the following
-first (after having installed the appropriate utilities, of course):-
-
-<list>
-<item>
-make maintainer-clean
-<item>
-aclocal
-<item>
-autoheader
-<item>
-autoconf
-<item>
-gettextize
-<item>
-libtoolize (do not let automake run this, as it will cause it not to
-include the libtool files in the dist targets) 
-<item>
-for i in COPYING INSTALL; do ln -s /usr/share/automake/$i .; done
-<item>
-automake
-</list>
-
-<p>
-I have also incorporated the patches originally made by Galen
-Hazelwood to internationalize dpkg using GNU gettext - see the file
-"NOTES.intl" for more information about this.
-
-<p>
-Other minor changes are:
-
-<list>
-<item>
-The version number is now determined from debian/changelog, not from
-the directory name.
-<item>
-Creation of version.h now handled from configure script, not Makefile.
-<item>
-include/dpkg.h is now generated from include/dpkg.h.in by a sed
-script, inserting the appropriate directory definitions - so now it
-supports changing the dpkg directories (can install in /usr/local)
-<item>
-Updated the COPYING (1 very minor change) and INSTALL files to those
-distributed with automake-1.1l
-<item>
-Since the shared libdpkg is now installed, I also made
-include/Makefile install dpkg.h and dpkg-db.h into /usr/include by
-default
-</list>
-
-Questions:
-
-<list>
-<item>
-Should I use <em/localstatedir/ and <em/sharedstatedir/ instead of
-<em/sysconfdir/ and <em/datadir/?
-</list>
-
-</sect>
-
-<sect id=i18n>
-<heading>Internationalization</heading>
-
-<p>
-This section by Galen Hazelwood. 
-
-<p>
-Dpkg is, to say the least, generous in its error reporting.  The vast
-majority of the output strings are error messages of one kind or another.
-And if you feel that you've stumbled into the Department of Redundancy
-Department, you would be absolutely correct.  Many of the error messages
-in dpkg.pot are duplicates, used at different points in the program.
-
-<p>
-To avoid swamping the translators completely, I made some executive decisions
-on what kinds of strings to translate.  All the strings sent to debug() are
-left alone, on the grounds that these are for dpkg developers, and not for
-the general public.  Most interal error messages were very cryptic, and
-would probably confuse the translators when seen just sitting there in
-the dpkg.pot file, and are also left alone.  (I did mark some of the more
-verbose ones for translation.)
-
-<p>
-If others disagree with me about the necessity of translating these strings,
-it's easy enough to just go through and mark them later.
-
-<p>
-I added the startup gettext code to the main routine in dselect, which was
-necessary as many of the strings in lib are translated.  Dselect is otherwise
-unchanged.
-
-<p>
-Changes:
-
-<list>
-<item>
-The files in intl and po were taken from gettext 0.10.26, by way of
-the gettextize program.  I altered the makefiles to remove the VERSION
-symbol, which is only used in targets which dpkg does not support.
-<item>
-aclocal.m4 was stolen from the textutils package, configure.in was
-altered to use these new tests, symbols were added to acconfig.h, and
-the two new directories were added to Makefile.in.
-<item>
-The dpkg, dpkg-deb, md5sum, split, and dselect Makefiles now look for
-headers in ../intl, and try to link with whatever i18n libraries
-configure finds.  They also now define LOCALEDIR in CFLAGS.
-<item>
-include/dpkg.h has the necessary NLS boilerplate, and the only file
-which dosen't include this (md5sum/md5sum.c) had it added directly.
-<item>
-The most intrusive change is due to a disagreement between xgettext
-and the dpkg coding style.  Although xgettext understands string
-constant concatenation, it can't handle the case where preprocessor
-symbols are used as well.  The dpkg code uses this a lot, especially
-in cases like this:
-<example>
-ohshite("error reading from " BACKEND " pipe");
-</example>
-where BACKEND is defined as "dpkg-deb".  Because xgettext can't handle
-this, I have changed this usage in all cases to something like:
-<example>
-ohshite(_("error reading from dpkg-deb pipe");
-</example>
-This isn't very kind to Ian, I know.  But what can I do?
-</list>
-
-</sect>
-
-</chapt>
-
-<chapt id=code>
-<heading>Code Internals</heading>
-
-<sect id=defs>
-<heading>Structure Definitons</heading>
-
-<sect1 id=versionrevision>
-<heading>versionrevision</heading>
-<p>
-<example>
-struct versionrevision {
-  unsigned long epoch;
-  char *version;
-  char *revision;
-};  
-</example>
-
-<p>
-The <tt/versionrevision/ structure is used to store a Debian version specification
-</sect1>
-
-</sect>
-
-<sect id=functions>
-<heading>Functions</heading>
-
-<sect1 id=parsing>
-<heading>Parsing translation tables</heading>
-<p>
-Each of these tables is used to associate a set of strings with a
-corresponding set of integers.
-
-Current tables are:
-
-<p>
-<example>
-const struct namevalue booleaninfos[];
-</example>
-
-<p>
-Maps boolean strings (<em/"yes"/,<em/"no"/) to their binary values.
-
-<sect2>
-<heading>priorityinfos[]</heading>
-
-<p>
-<example>
-const struct namevalue priorityinfos[];
-</example>
-
-<p>
-Maps priority strings to and from values of
-type <em/enum pkgpriority/.  
-Current priority values are:
-
-<list>
-<item><em/required/ - required
-<item><em/important/ - important
-<item><em/standard/ - standard
-<item><em/recommended/ - recommended
-<item><em/optional/ - optional
-<item><em/extra/ - extra
-<item><em/contrib/ - contrib
-<item><em/other/ - other
-<item><em/unknown/ - unknown
-<item><em/base/ -
-This is obsolete, but is accepted as an alias for <em/required/.
-</item>
-</list>
-</sect2>
-
-<sect2>
-<heading>statusinfos[]</heading>
-
-<p>
-<example>
-const struct namevalue statusinfos[];
-</example>
-
-Maps package status strings to values of type <em/enum ???/.
-
-Package status strings are:
-
-"not-installed" "unpacked" "half-configured" "installed"
-"half-installed" "config-files" "postinst-failed" "removal-failed"
-</sect2>
-
-<sect2>
-<heading>eflaginfos[]</heading>
-
-<p>
-<example>
-const struct namevalue eflaginfos[];
-</example>
-</sect2>
-
-<sect2>
-<heading>wantinfos[]</heading>
-
-<p>
-<example>
-const struct namevalue wantinfos[];
-</example>
-</sect2>
-
-<sect2>
-<heading>nicknames[]</heading>
-
-<p>
-<example>
-const struct nickname nicknames[];
-</example>
-
-Maps obsolete control fields to their current versions.
-
-</sect2>
-
-</sect1>
-
-<sect1 id=parsef>
-<heading>Parsing functions</heading>
-
-<sect2>
-<heading>parseerr()</heading>
-
-<p>
-<example>
-void parseerr
-(FILE *file, const char *filename, int lno,
- FILE *warnto, int *warncount, const struct pkginfo *pigp,
- int warnonly, const char *fmt, ...);
-</example>
-
-Report an error parsing a control data stream.  Checks <var/file/ for
-error status on <var/file/, printing an error message to stderr and
-exiting with error status if an error is present on the stream.
-Formats the variable arguments according to the <em/printf/-style
-string in <var/fmt/, preceding the result with <var/filename/,
-<var/lno/, and <var/pigp/ (if not NULL).  If <var/warnonly/ is 0,
-writes the result to stderr and exits with error status.  Otherwise,
-increments <var/warncount/ and returns normally.
-</sect2>
-
-<sect2>
-<heading>illegal_packagename()</heading>
-
-<p>
-<em>
-const char *illegal_packagename
-(const char *p, const char **ep) 
-</em>
-
-Checks the package name at <var/p/ for proper syntax.  Returns NULL in
-case of success, setting <var/*ep/ to point after the last character
-in the package name, including any trailing whitespace (as defined by
-isspace()).  In case of error, returns the error message as a pointer
-to a static buffer.
-</sect2>
-
-<sect2>
-<heading>informativeversion()</heading>
-
-<p>
-<em>
-int informativeversion(const struct versionrevision *version)
-</em>
-
-<p>
-Returns true if and only if the <em/versionrevision/ is non-empty;
-otherwise returns false.
-</sect2>
-
-<sect2>
-<heading>varbufversion()</heading>
-
-<p>
-<example>
-void varbufversion
-(struct varbuf *vb,
- const struct versionrevision *version,
- enum versiondisplayepochwhen vdew);
-</example>
-
-Writes a human-readable representation of <var/version/ to <var/vb/.
-Possible values of <var/vdew/:
-
-<list>
-<item><tt/vdew_never/ - never include epoch
-<item><tt/vdew_nonambig/ - include epoch string if non-zero
-<item><tt/vdew_always/ - always include epoch string
-</list>
-</sect2>
-
-<sect2>
-<heading>versiondescribe()</heading>
-
-<p>
-<example>
-const char *versiondescribe
-(const struct versionrevision *version,
- enum versiondisplayepochwhen vdew);
-</example>
-
-<p>
-Return a human-readable representation of <var/version/ as a pointer
-to a static buffer.  If the version structure is empty, return
-<em/"&lt;none&gt;"/.  Static buffers are allocated from a set of 10
-in round-robin fashion (they will be re-used after 10 successive calls
-to <em/versiondescribe/).
-</sect2>
-
-<sect2>
-<heading>parseversion()</heading>
-
-<p>
-<example>
-const char *parseversion
-(struct versionrevision *rversion, const char *string);
-</example>
-
-<p>
-Parse the contents of <var/string/ into <var/rversion/.  If
-successful, returns NULL, otherwise returns a pointer to a static
-error string.
-</sect2>
-
-<sect2>
-<heading>parsemustfield()</heading>
-
-<p>
-<example>
-void parsemustfield
-(FILE *file, const char *filename, int lno,
- FILE *warnto, int *warncount,
- const struct pkginfo *pigp, int warnonly,
- char **value, const char *what);
-</example>
-</sect2>
-
-<sect2>
-<heading>skip_slash_dotslash()</heading>
-
-<p>
-<example>
-const char *skip_slash_dotslash (const char *p);
-</example>
-</sect2>
-
-<sect2>
-<heading>convert_string()</heading>
-
-<p>
-<example>
-static int convert_string
-(const char *filename, int lno, const char *what, int otherwise,
- FILE *warnto, int *warncount, const struct pkginfo *pigp,
- const char *startp, const struct namevalue *nvip,
- const char **endpp) 
-</example>
-</sect2>
-
-</sect1>
-
-</sect>
-</chapt>
-</book></debiandoc>

dpkg-deb/Makefile

@@ -1,56 +0,0 @@
-
-
-srcdir		= .
-top_srcdir	= ..
-top_builddir	= ..
-
-
-default: all
-
-include ../Makefile.conf
-
-
-SOURCES		= build.c extract.c info.c main.c
-
-OBJECTS		= $(patsubst %.c, %.o, $(SOURCES))
-GENFILES	= $(OBJECTS) dpkg-deb dpkg-deb-static
-
-.PHONY: all
-all:: dpkg-deb
-ifdef ALSO_STATIC
-all:: dpkg-deb-static
-endif
-
-.PHONY: install
-install:: all
-
-.PHONY: clean
-clean::
-	-$(RM) $(GENFILES)
-
-.PHONY: distclean
-cvslean:: clean
-	$(RM) Makefile
-
-.PHONY: install
-install:: install-program install-doc
-
-.PHONY: install-program
-install-program:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(INSTALL) dpkg-deb $(DESTDIR)$(bindir)
-ifdef ALSO_STATIC
-	$(INSTALL) dpkg-deb-static $(DESTDIR)$(bindir)
-endif
-
-.PHONY: install-doc
-install-doc:
-	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-	$(INSTALL_DATA) $(srcdir)/dpkg-deb.1 $(DESTDIR)$(man1dir)
-
-dpkg-deb-static: LDFLAGS += -static
-dpkg-deb-static: ZLIB_LIBS = $(ZLIB_LIBS_ALSO_STATIC)
-dpkg-deb-static: BZ2LIB_LIBS = $(BZ2LIB_LIBS_ALSO_STATIC)
-dpkg-deb dpkg-deb-static: $(OBJECTS) ../lib/libdpkg.a
-	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS)
-

dpkg-deb/Makefile.am

@@ -0,0 +1,19 @@
+## Process this file with automake to produce Makefile.in
+
+localedir = $(datadir)/locale
+INCLUDES = \
+	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+	-I$(top_srcdir)/lib \
+	$(ZLIB_CFLAGS) $(BZ2_CFLAGS)
+
+
+bin_PROGRAMS = dpkg-deb
+
+dpkg_deb_SOURCES = \
+	dpkg-deb.h \
+	build.c \
+	extract.c \
+	info.c \
+	main.c
+
+dpkg_deb_LDADD = $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS)

dpkg-deb/Makefile.in

@@ -1,56 +1,490 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-top_srcdir	= @top_srcdir@
-top_builddir	= ..
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-default: all
+@SET_MAKE@
 
-include ../Makefile.conf
+SOURCES = $(dpkg_deb_SOURCES)
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+bin_PROGRAMS = dpkg-deb$(EXEEXT)
+subdir = dpkg-deb
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+	$(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \
+	$(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_dpkg_deb_OBJECTS = build.$(OBJEXT) extract.$(OBJEXT) info.$(OBJEXT) \
+	main.$(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)
+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)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(dpkg_deb_SOURCES)
+DIST_SOURCES = $(dpkg_deb_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BZ2_CFLAGS = @BZ2_CFLAGS@
+BZ2_LIBS = @BZ2_LIBS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@
+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@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+admindir = @admindir@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+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)
 
-SOURCES		= build.c extract.c info.c main.c
+dpkg_deb_SOURCES = \
+	dpkg-deb.h \
+	build.c \
+	extract.c \
+	info.c \
+	main.c
 
-OBJECTS		= $(patsubst %.c, %.o, $(SOURCES))
-GENFILES	= $(OBJECTS) dpkg-deb dpkg-deb-static
+dpkg_deb_LDADD = $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS)
+all: all-am
 
-.PHONY: all
-all:: dpkg-deb
-ifdef ALSO_STATIC
-all:: dpkg-deb-static
-endif
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  dpkg-deb/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  dpkg-deb/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
 
-.PHONY: install
-install:: all
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-.PHONY: clean
-clean::
-	-$(RM) $(GENFILES)
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
 
-.PHONY: distclean
-cvslean:: clean
-	$(RM) Makefile
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
 
-.PHONY: install
-install:: install-program install-doc
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+dpkg-deb$(EXEEXT): $(dpkg_deb_OBJECTS) $(dpkg_deb_DEPENDENCIES) 
+	@rm -f dpkg-deb$(EXEEXT)
+	$(LINK) $(dpkg_deb_LDFLAGS) $(dpkg_deb_OBJECTS) $(dpkg_deb_LDADD) $(LIBS)
 
-.PHONY: install-program
-install-program:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(INSTALL) dpkg-deb $(DESTDIR)$(bindir)
-ifdef ALSO_STATIC
-	$(INSTALL) dpkg-deb-static $(DESTDIR)$(bindir)
-endif
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
 
-.PHONY: install-doc
-install-doc:
-	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-	$(INSTALL_DATA) $(srcdir)/dpkg-deb.1 $(DESTDIR)$(man1dir)
+distclean-compile:
+	-rm -f *.tab.c
 
-dpkg-deb-static: LDFLAGS += -static
-dpkg-deb-static: ZLIB_LIBS = $(ZLIB_LIBS_ALSO_STATIC)
-dpkg-deb-static: BZ2LIB_LIBS = $(BZ2LIB_LIBS_ALSO_STATIC)
-dpkg-deb dpkg-deb-static: $(OBJECTS) ../lib/libdpkg.a
-	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS)
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/build.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extract.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 
+.c.o:
+@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@
+@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@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

dpkg-deb/build.c

@@ -36,7 +36,7 @@
 #include <limits.h>
 #include <ctype.h>
 #include <assert.h>
-#ifdef USE_ZLIB
+#ifdef WITH_ZLIB
 #include <zlib.h>
 #endif
 

dpkg-deb/extract.c

@@ -34,7 +34,7 @@
 #include <ctype.h>
 #include <assert.h>
 #include <ar.h>
-#ifdef USE_ZLIB
+#ifdef WITH_ZLIB
 #include <zlib.h>
 #endif
 

dpkg-deb/main.c

@@ -35,7 +35,7 @@
 #include <assert.h>
 
 #include <dpkg.h>
-#include <version.h>
+#include <dpkg-db.h>
 #include <myopt.h>
 
 #include "dpkg-deb.h"
@@ -176,7 +176,6 @@ static void setcompresstype(const struct cmdinfo *cip, const char *value) {
     ohshit(_("unknown compression type `%s'!"), value);
 }
 
-int main(int argc, const char *const *argv) NONRETURNING;
 int main(int argc, const char *const *argv) {
   jmp_buf ejbuf;
 

dpkg-split/Makefile.am

@@ -0,0 +1,38 @@
+## Process this file with automake to produce Makefile.in
+
+localedir = $(datadir)/locale
+INCLUDES = \
+	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+	-DADMINDIR=\"$(admindir)\" -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\" \
+	-I$(top_srcdir)/lib
+
+
+bin_PROGRAMS = dpkg-split
+
+dpkg_split_SOURCES = \
+	dpkg-split.h \
+	info.c \
+	join.c \
+	main.c \
+	queue.c \
+	split.c
+
+dpkg_split_LDADD = $(LIBINTL) ../lib/libdpkg.a
+
+
+pkglib_SCRIPTS = mksplit
+EXTRA_DIST = mksplit.pl
+CLEANFILES = $(pkglib_SCRIPTS)
+
+
+do_perl_subst = sed -e "s:^\#![:space:]*/usr/bin/perl:\#!$(PERL):"
+
+
+%: %.pl Makefile
+	@test -d `dirname $@` || $(mkdir_p) `dirname $@`
+	$(do_perl_subst) <$< >$@
+	chmod +x $@
+
+
+install-data-local:
+	$(mkdir_p) $(DESTDIR)$(admindir)/parts

dpkg-split/Makefile.in

@@ -0,0 +1,530 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+SOURCES = $(dpkg_split_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+bin_PROGRAMS = dpkg-split$(EXEEXT)
+subdir = dpkg-split
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+	$(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \
+	$(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_dpkg_split_OBJECTS = info.$(OBJEXT) join.$(OBJEXT) main.$(OBJEXT) \
+	queue.$(OBJEXT) split.$(OBJEXT)
+dpkg_split_OBJECTS = $(am_dpkg_split_OBJECTS)
+am__DEPENDENCIES_1 =
+dpkg_split_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a
+pkglibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+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)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(dpkg_split_SOURCES)
+DIST_SOURCES = $(dpkg_split_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BZ2_CFLAGS = @BZ2_CFLAGS@
+BZ2_LIBS = @BZ2_LIBS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@
+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@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+admindir = @admindir@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+localedir = $(datadir)/locale
+INCLUDES = \
+	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+	-DADMINDIR=\"$(admindir)\" -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\" \
+	-I$(top_srcdir)/lib
+
+dpkg_split_SOURCES = \
+	dpkg-split.h \
+	info.c \
+	join.c \
+	main.c \
+	queue.c \
+	split.c
+
+dpkg_split_LDADD = $(LIBINTL) ../lib/libdpkg.a
+pkglib_SCRIPTS = mksplit
+EXTRA_DIST = mksplit.pl
+CLEANFILES = $(pkglib_SCRIPTS)
+do_perl_subst = sed -e "s:^\#![:space:]*/usr/bin/perl:\#!$(PERL):"
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  dpkg-split/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  dpkg-split/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+dpkg-split$(EXEEXT): $(dpkg_split_OBJECTS) $(dpkg_split_DEPENDENCIES) 
+	@rm -f dpkg-split$(EXEEXT)
+	$(LINK) $(dpkg_split_LDFLAGS) $(dpkg_split_OBJECTS) $(dpkg_split_LDADD) $(LIBS)
+install-pkglibSCRIPTS: $(pkglib_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+	@list='$(pkglib_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(pkglibSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	    $(pkglibSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-pkglibSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkglib_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queue.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/split.Po@am__quote@
+
+.c.o:
+@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@
+@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@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(SCRIPTS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local
+
+install-exec-am: install-binPROGRAMS install-pkglibSCRIPTS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+	uninstall-pkglibSCRIPTS
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-data-local install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-pkglibSCRIPTS install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+	uninstall-pkglibSCRIPTS
+
+
+%: %.pl Makefile
+	@test -d `dirname $@` || $(mkdir_p) `dirname $@`
+	$(do_perl_subst) <$< >$@
+	chmod +x $@
+
+install-data-local:
+	$(mkdir_p) $(DESTDIR)$(admindir)/parts
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

split/main.c

@@ -30,7 +30,6 @@
 
 #include <dpkg.h>
 #include <dpkg-db.h>
-#include <version.h>
 #include <myopt.h>
 
 #include "dpkg-split.h"
@@ -149,7 +148,6 @@ static void setaction(const struct cmdinfo *cip, const char *value) {
   action= dofunctions[cip-cmdinfos];
 }
 
-int main(int argc, const char *const *argv) NONRETURNING;
 int main(int argc, const char *const *argv) {
   jmp_buf ejbuf;
   int l;

dselect/Makefile

@@ -1,60 +0,0 @@
-
-srcdir		= .
-top_srcdir	= ..
-top_builddir	= ..
-
-default: all
-include ../Makefile.conf
-
-CXX_SOURCES	= basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \
-		  main.cc methkeys.cc methlist.cc method.cc methparse.cc \
-		  pkgcmds.cc pkgdepcon.cc pkgdisplay.cc pkginfo.cc pkgkeys.cc \
-		  pkglist.cc pkgsublist.cc pkgtop.cc helpmsgs.cc
-
-MAN8PAGES	= dselect.8
-
-OBJECTS		= $(patsubst %.cc, %.o, $(CXX_SOURCES))
-GENFILES	= $(OBJECTS) dselect curkeys.h
-
-.PHONY: all
-all:: dselect
-
-.PHONY: install
-install:: all
-
-.PHONY: clean
-clean::
-	$(RM) $(GENFILES)
-
-.PHONY: distclean
-cvslean:: clean
-	$(RM) Makefile
-
-.PHONY: install
-install:: install-program install-doc
-
-.PHONY: install-program
-install-program:
-	$(mkinstalldirs) $(DESTDIR)/$(bindir)
-	$(INSTALL_PROGRAM) dselect $(DESTDIR)/$(bindir)
-
-.PHONY: install-doc
-install-doc:
-	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
-	set -e ; for i in $(MAN8PAGES) ; do \
-	    if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
-	    $(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man8dir) ; \
-	done
-
-dselect: $(OBJECTS) ../lib/libdpkg.a
-	$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(CURSES_LIBS) $(LIBS) $(NLS_LIBS)
-
-basecmds.o: helpmsgs.h
-curkeys.o: curkeys.h
-
-curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl
-	cursesfile=`echo '#include <curses.h>' | \
-		 $(CC) -E - | grep 'curses.h' | head -n 1 | \
-		 $(SED) -e 's/^[^"]*"//; s/".*$$//'`; \
-	if [ "$$cursesfile" = "" ]; then echo "can't find curses file"; exit 1; fi; \
-	perl $(srcdir)/mkcurkeys.pl $< $$cursesfile > $@

dselect/Makefile.am

@@ -0,0 +1,48 @@
+## Process this file with automake to produce Makefile.in
+
+localedir = $(datadir)/locale
+INCLUDES = \
+	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+	-DADMINDIR=\"$(admindir)\" -DLIBDIR=\"$(pkglibdir)\" \
+	-I$(top_srcdir)/lib
+
+
+bin_PROGRAMS = dselect
+
+dselect_SOURCES = \
+	dselect.h \
+	basecmds.cc \
+	baselist.cc \
+	basetop.cc \
+	bindings.cc bindings.h \
+	curkeys.cc \
+	helpmsgs.cc helpmsgs.h \
+	main.cc \
+	methkeys.cc \
+	methlist.cc \
+	method.cc method.h \
+	methparse.cc \
+	pkgcmds.cc \
+	pkgdepcon.cc \
+	pkgdisplay.cc \
+	pkginfo.cc \
+	pkgkeys.cc \
+	pkglist.cc pkglist.h \
+	pkgsublist.cc \
+	pkgtop.cc
+
+dselect_LDADD = $(LIBINTL) ../lib/libdpkg.a $(CURSES_LIBS)
+
+
+EXTRA_DIST = keyoverride mkcurkeys.pl
+CLEANFILES = curkeys.h
+
+curkeys.$(OBJEXT): curkeys.h
+curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl
+	cursesfile=`echo '#include <curses.h>' | \
+		$(CC) -E - | grep 'curses.h' | head -n 1 | \
+		sed -e 's/^[^"]*"//; s/".*$$//'`; \
+	if [ "$$cursesfile" = "" ]; then \
+		echo "can't find curses file"; exit 1; \
+	fi; \
+	perl $(srcdir)/mkcurkeys.pl $< $$cursesfile >$@

dselect/Makefile.in

@@ -1,60 +1,551 @@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-top_srcdir	= @top_srcdir@
-top_builddir	= ..
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-default: all
-include ../Makefile.conf
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-CXX_SOURCES	= basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \
-		  main.cc methkeys.cc methlist.cc method.cc methparse.cc \
-		  pkgcmds.cc pkgdepcon.cc pkgdisplay.cc pkginfo.cc pkgkeys.cc \
-		  pkglist.cc pkgsublist.cc pkgtop.cc helpmsgs.cc
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-MAN8PAGES	= dselect.8
+@SET_MAKE@
 
-OBJECTS		= $(patsubst %.cc, %.o, $(CXX_SOURCES))
-GENFILES	= $(OBJECTS) dselect curkeys.h
+SOURCES = $(dselect_SOURCES)
 
-.PHONY: all
-all:: dselect
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+bin_PROGRAMS = dselect$(EXEEXT)
+subdir = dselect
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+	$(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \
+	$(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_dselect_OBJECTS = basecmds.$(OBJEXT) baselist.$(OBJEXT) \
+	basetop.$(OBJEXT) bindings.$(OBJEXT) curkeys.$(OBJEXT) \
+	helpmsgs.$(OBJEXT) main.$(OBJEXT) methkeys.$(OBJEXT) \
+	methlist.$(OBJEXT) method.$(OBJEXT) methparse.$(OBJEXT) \
+	pkgcmds.$(OBJEXT) pkgdepcon.$(OBJEXT) pkgdisplay.$(OBJEXT) \
+	pkginfo.$(OBJEXT) pkgkeys.$(OBJEXT) pkglist.$(OBJEXT) \
+	pkgsublist.$(OBJEXT) pkgtop.$(OBJEXT)
+dselect_OBJECTS = $(am_dselect_OBJECTS)
+am__DEPENDENCIES_1 =
+dselect_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a \
+	$(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)/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)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(dselect_SOURCES)
+DIST_SOURCES = $(dselect_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BZ2_CFLAGS = @BZ2_CFLAGS@
+BZ2_LIBS = @BZ2_LIBS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@
+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@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+admindir = @admindir@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+localedir = $(datadir)/locale
+INCLUDES = \
+	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+	-DADMINDIR=\"$(admindir)\" -DLIBDIR=\"$(pkglibdir)\" \
+	-I$(top_srcdir)/lib
 
-.PHONY: install
-install:: all
+dselect_SOURCES = \
+	dselect.h \
+	basecmds.cc \
+	baselist.cc \
+	basetop.cc \
+	bindings.cc bindings.h \
+	curkeys.cc \
+	helpmsgs.cc helpmsgs.h \
+	main.cc \
+	methkeys.cc \
+	methlist.cc \
+	method.cc method.h \
+	methparse.cc \
+	pkgcmds.cc \
+	pkgdepcon.cc \
+	pkgdisplay.cc \
+	pkginfo.cc \
+	pkgkeys.cc \
+	pkglist.cc pkglist.h \
+	pkgsublist.cc \
+	pkgtop.cc
 
-.PHONY: clean
-clean::
-	$(RM) $(GENFILES)
+dselect_LDADD = $(LIBINTL) ../lib/libdpkg.a $(CURSES_LIBS)
+EXTRA_DIST = keyoverride mkcurkeys.pl
+CLEANFILES = curkeys.h
+all: all-am
 
-.PHONY: distclean
-cvslean:: clean
-	$(RM) Makefile
+.SUFFIXES:
+.SUFFIXES: .cc .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  dselect/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  dselect/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
 
-.PHONY: install
-install:: install-program install-doc
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-.PHONY: install-program
-install-program:
-	$(mkinstalldirs) $(DESTDIR)/$(bindir)
-	$(INSTALL_PROGRAM) dselect $(DESTDIR)/$(bindir)
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+dselect$(EXEEXT): $(dselect_OBJECTS) $(dselect_DEPENDENCIES) 
+	@rm -f dselect$(EXEEXT)
+	$(CXXLINK) $(dselect_LDFLAGS) $(dselect_OBJECTS) $(dselect_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basecmds.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/baselist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basetop.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bindings.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curkeys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helpmsgs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/methkeys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/methlist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/method.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/methparse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgcmds.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgdepcon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgdisplay.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkginfo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgkeys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkglist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgsublist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgtop.Po@am__quote@
+
+.cc.o:
+@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@
+@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@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
 
-.PHONY: install-doc
-install-doc:
-	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
-	set -e ; for i in $(MAN8PAGES) ; do \
-	    if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
-	    $(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man8dir) ; \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
 	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
-dselect: $(OBJECTS) ../lib/libdpkg.a
-	$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(CURSES_LIBS) $(LIBS) $(NLS_LIBS)
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-info-am
 
-basecmds.o: helpmsgs.h
-curkeys.o: curkeys.h
 
-curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl
+curkeys.$(OBJEXT): curkeys.h
+curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl
 	cursesfile=`echo '#include <curses.h>' | \
-		 $(CC) -E - | grep 'curses.h' | head -n 1 | \
-		 $(SED) -e 's/^[^"]*"//; s/".*$$//'`; \
-	if [ "$$cursesfile" = "" ]; then echo "can't find curses file"; exit 1; fi; \
-	perl $(srcdir)/mkcurkeys.pl $< $$cursesfile > $@
+		$(CC) -E - | grep 'curses.h' | head -n 1 | \
+		sed -e 's/^[^"]*"//; s/".*$$//'`; \
+	if [ "$$cursesfile" = "" ]; then \
+		echo "can't find curses file"; exit 1; \
+	fi; \
+	perl $(srcdir)/mkcurkeys.pl $< $$cursesfile >$@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

dselect/checkunimp.pl

@@ -1,17 +0,0 @@
-#!/usr/bin/perl
-while(<>) {
-    if (m/^\s+\{\s+\"(\w[^"]+)\",\s+0,\s+\w+list\:\:kd_\w+,\s+qa_\w+\s+\},\s*$/ ||
-        m/^\s+\{\s+\"(\w[^"]+)\",\s+\w+list\:\:kd_\w+,\s+0,\s+qa_\w+\s+\},\s*$/) {
-        $implem{$1}= 1;
-    } elsif (m/^\s+\{\s+(\S.{0,15}\S),\s+\"(\w[^"]+)\"\s+\},\s*$/) {
-        $bound{$2} .= $1.', ';
-    } elsif (m/^\s+\{\s+0,/ || m/^\s+\{\s+-1,/) {
-    } elsif (m/^\s+\{\s+/) {
-        print "huh ? $_";
-    }
-}
-for $f (sort keys %bound) {
-    next if defined($implem{$f});
-    $b=$bound{$f}; $b =~ s/, $//;
-    printf "unimplemented: %-20s (%s)\n", $f, $b;
-}

dselect/keys.c

@@ -1,91 +0,0 @@
-{ KEY_MIN		, "MIN" },
-{ KEY_BREAK       , "BREAK" },
-{ KEY_DOWN        , "DOWN" },
-{ KEY_UP          , "UP" },
-{ KEY_LEFT        , "LEFT" },
-{ KEY_RIGHT       , "RIGHT" },
-{ KEY_HOME        , "HOME" },
-{ KEY_BACKSPACE   , "BACKSPACE" },
-{ KEY_F0          , "F0" },
-{ KEY_DL          , "DL" },
-{ KEY_IL          , "IL" },
-{ KEY_DC          , "DC" },
-{ KEY_IC          , "IC" },
-{ KEY_EIC         , "EIC" },
-{ KEY_CLEAR       , "CLEAR" },
-{ KEY_EOS         , "EOS" },
-{ KEY_EOL         , "EOL" },
-{ KEY_SF          , "SF" },
-{ KEY_SR          , "SR" },
-{ KEY_NPAGE       , "NPAGE" },
-{ KEY_PPAGE       , "PPAGE" },
-{ KEY_STAB        , "STAB" },
-{ KEY_CTAB        , "CTAB" },
-{ KEY_CATAB       , "CATAB" },
-{ KEY_ENTER       , "ENTER" },
-{ KEY_SRESET      , "SRESET" },
-{ KEY_RESET       , "RESET" },
-{ KEY_PRINT       , "PRINT" },
-{ KEY_LL          , "LL" },
-{ KEY_A1		, "A1" },
-{ KEY_A3		, "A3" },
-{ KEY_B2		, "B2" },
-{ KEY_C1		, "C1" },
-{ KEY_C3		, "C3" },
-{ KEY_BTAB	, "BTAB" },
-{ KEY_BEG		, "BEG" },
-{ KEY_CANCEL	, "CANCEL" },
-{ KEY_CLOSE	, "CLOSE" },
-{ KEY_COMMAND	, "COMMAND" },
-{ KEY_COPY	, "COPY" },
-{ KEY_CREATE	, "CREATE" },
-{ KEY_END		, "END" },
-{ KEY_EXIT	, "EXIT" },
-{ KEY_FIND	, "FIND" },
-{ KEY_HELP	, "HELP" },
-{ KEY_MARK	, "MARK" },
-{ KEY_MESSAGE	, "MESSAGE" },
-{ KEY_MOVE	, "MOVE" },
-{ KEY_NEXT	, "NEXT" },
-{ KEY_OPEN	, "OPEN" },
-{ KEY_OPTIONS	, "OPTIONS" },
-{ KEY_PREVIOUS	, "PREVIOUS" },
-{ KEY_REDO	, "REDO" },
-{ KEY_REFERENCE	, "REFERENCE" },
-{ KEY_REFRESH	, "REFRESH" },
-{ KEY_REPLACE	, "REPLACE" },
-{ KEY_RESTART	, "RESTART" },
-{ KEY_RESUME	, "RESUME" },
-{ KEY_SAVE	, "SAVE" },
-{ KEY_SBEG	, "SBEG" },
-{ KEY_SCANCEL	, "SCANCEL" },
-{ KEY_SCOMMAND	, "SCOMMAND" },
-{ KEY_SCOPY	, "SCOPY" },
-{ KEY_SCREATE	, "SCREATE" },
-{ KEY_SDC		, "SDC" },
-{ KEY_SDL		, "SDL" },
-{ KEY_SELECT	, "SELECT" },
-{ KEY_SEND	, "SEND" },
-{ KEY_SEOL	, "SEOL" },
-{ KEY_SEXIT	, "SEXIT" },
-{ KEY_SFIND	, "SFIND" },
-{ KEY_SHELP	, "SHELP" },
-{ KEY_SHOME	, "SHOME" },
-{ KEY_SIC		, "SIC" },
-{ KEY_SLEFT	, "SLEFT" },
-{ KEY_SMESSAGE	, "SMESSAGE" },
-{ KEY_SMOVE	, "SMOVE" },
-{ KEY_SNEXT	, "SNEXT" },
-{ KEY_SOPTIONS	, "SOPTIONS" },
-{ KEY_SPREVIOUS	, "SPREVIOUS" },
-{ KEY_SPRINT	, "SPRINT" },
-{ KEY_SREDO	, "SREDO" },
-{ KEY_SREPLACE	, "SREPLACE" },
-{ KEY_SRIGHT	, "SRIGHT" },
-{ KEY_SRSUME	, "SRSUME" },
-{ KEY_SSAVE	, "SSAVE" },
-{ KEY_SSUSPEND	, "SSUSPEND" },
-{ KEY_SUNDO	, "SUNDO" },
-{ KEY_SUSPEND	, "SUSPEND" },
-{ KEY_UNDO	, "UNDO" },
-{ KEY_MAX		, "MAX" },

dselect/main.cc

@@ -41,7 +41,6 @@ extern "C" {
 extern "C" {
 #include <dpkg.h>
 #include <dpkg-db.h>
-#include <version.h>
 #include <myopt.h>
 }
 #include "dselect.h"

getopt/Makefile.am

@@ -0,0 +1,17 @@
+## Process this file with automake to produce Makefile.in
+
+localedir = $(datadir)/locale
+INCLUDES = \
+	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+	-I$(top_srcdir)/lib
+
+
+noinst_LIBRARIES = libopt.a
+
+libopt_a_SOURCES = \
+	closeout.c closeout.h \
+	error.h \
+	getopt.c getopt.h \
+	getopt1.c \
+	long-options.c long-options.h \
+	obstack.c obstack.h

getopt/Makefile.in

@@ -0,0 +1,468 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+SOURCES = $(libopt_a_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = getopt
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+	$(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \
+	$(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libopt_a_AR = $(AR) $(ARFLAGS)
+libopt_a_LIBADD =
+am_libopt_a_OBJECTS = closeout.$(OBJEXT) getopt.$(OBJEXT) \
+	getopt1.$(OBJEXT) long-options.$(OBJEXT) obstack.$(OBJEXT)
+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)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libopt_a_SOURCES)
+DIST_SOURCES = $(libopt_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BZ2_CFLAGS = @BZ2_CFLAGS@
+BZ2_LIBS = @BZ2_LIBS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@
+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@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+admindir = @admindir@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+localedir = $(datadir)/locale
+INCLUDES = \
+	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+	-I$(top_srcdir)/lib
+
+noinst_LIBRARIES = libopt.a
+libopt_a_SOURCES = \
+	closeout.c closeout.h \
+	error.h \
+	getopt.c getopt.h \
+	getopt1.c \
+	long-options.c long-options.h \
+	obstack.c obstack.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  getopt/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  getopt/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libopt.a: $(libopt_a_OBJECTS) $(libopt_a_DEPENDENCIES) 
+	-rm -f libopt.a
+	$(libopt_a_AR) libopt.a $(libopt_a_OBJECTS) $(libopt_a_LIBADD)
+	$(RANLIB) libopt.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/closeout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/long-options.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obstack.Po@am__quote@
+
+.c.o:
+@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@
+@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@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

optlib/error.h

@@ -32,12 +32,10 @@ extern "C" {
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
    If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
 
-extern void error (int status, int errnum, const char *format, ...)
-     PRINTFFORMAT(3, 4);
+extern void error (int status, int errnum, const char *format, ...);
 
 extern void error_at_line (int status, int errnum, const char *fname,
-			   unsigned int lineno, const char *format, ...)
-     PRINTFFORMAT(5, 6);
+			   unsigned int lineno, const char *format, ...);
 
 /* If NULL, error will flush stdout, then print on stderr the program
    name, a colon and a space.  Otherwise, error will call this

optlib/getopt.c

@@ -270,7 +270,6 @@ extern pid_t __libc_pid;
    is valid for the getopt call we must make sure that the ARGV passed
    to getopt is that one passed to the process.  */
 static void
-UNUSED
 store_args_and_env (int argc, char *const *argv)
 {
   /* XXX This is no good solution.  We should rather copy the args so

include/Makefile

@@ -1,25 +0,0 @@
-
-
-srcdir		= .
-
-GENFILES	= dpkg.h
-
-default: all
-include ../Makefile.conf
-
-all:: $(GENFILES)
-	
-install:: all
-
-clean::
-	rm -f $(GENFILES) 
-
-cvslean:: clean
-	rm -f Makefile
-
-dpkg.h: dpkg.h.in
-	sed -e 's,#CONFIGDIR#,$(dpkgconfdir),' \
-		-e 's,#ADMINDIR#,$(admindir),' \
-		-e 's,#LIBDIR#,$(dpkglibdir),' $< > $@
-
-.PHONY: all install clean distclean

include/Makefile.in

@@ -1,25 +0,0 @@
-
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-
-GENFILES	= dpkg.h
-
-default: all
-include ../Makefile.conf
-
-all:: $(GENFILES)
-	
-install:: all
-
-clean::
-	rm -f $(GENFILES) 
-
-cvslean:: clean
-	rm -f Makefile
-
-dpkg.h: dpkg.h.in
-	sed -e 's,#CONFIGDIR#,$(dpkgconfdir),' \
-		-e 's,#ADMINDIR#,$(admindir),' \
-		-e 's,#LIBDIR#,$(dpkglibdir),' $< > $@
-
-.PHONY: all install clean distclean

install-sh

@@ -1,19 +1,38 @@
 #!/bin/sh
-#
 # install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
+scriptversion=2004-04-01.17
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# Copyright 1991 by the Massachusetts Institute of Technology
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
@@ -23,13 +42,11 @@
 # from scratch.  It can only install one file at a time, a restriction
 # shared with many OS's install programs.
 
-
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 
-
 # put in absolute paths if you don't have them in your path; or use env. vars.
 
 mvprog="${MVPROG-mv}"
@@ -41,211 +58,268 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-transformbasename=""
-transform_arg=""
+transformbasename=
+transform_arg=
 instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
+chowncmd=
+chgrpcmd=
+stripcmd=
 rmcmd="$rmprog -f"
 mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
+src=
+dst=
+dir_arg=
+
+usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 -d DIRECTORIES...
+
+In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
+In the second, create the directory path DIR.
+
+Options:
+-b=TRANSFORMBASENAME
+-c         copy source (using $cpprog) instead of moving (using $mvprog).
+-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
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+        shift
+        continue;;
+
+    -c) instcmd=$cpprog
+        shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit 0;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+        shift
+        continue;;
+
+    --version) echo "$0 $scriptversion"; exit 0;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	test -n "$dir_arg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
 done
 
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
 fi
 
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      instcmd=:
+      chmodcmd=
+    else
+      instcmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$instcmd $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
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
 
-	pathcomp="${pathcomp}/"
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp" || lasterr=$?
+	# 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; }
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $instcmd "$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"`
+
+    # 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 '(exit $?); exit' 1 2 13 15
+
+    # Move or copy the file name to the temp name
+    $doit $instcmd "$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.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit; }
 done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# 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.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
 
-exit 0
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:

intl/ChangeLog

@@ -0,0 +1,4 @@
+2004-01-29  GNU  <bug-gnu-gettext@gnu.org>
+
+	* Version 0.14.1 released.
+

intl/Makefile.in

@@ -0,0 +1,493 @@
+# Makefile for directory with message catalog handling library of GNU gettext
+# Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library 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
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library 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.
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = ..
+VPATH = $(srcdir)
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+transform = @program_transform_name@
+libdir = @libdir@
+includedir = @includedir@
+datadir = @datadir@
+localedir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/intl
+aliaspath = $(localedir)
+subdir = intl
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+
+l = @INTL_LIBTOOL_SUFFIX_PREFIX@
+
+AR = ar
+CC = @CC@
+LIBTOOL = @LIBTOOL@
+RANLIB = @RANLIB@
+YACC = @INTLBISON@ -y -d
+YFLAGS = --name-prefix=__gettext
+
+DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
+-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
+-Dset_relocation_prefix=libintl_set_relocation_prefix \
+-Drelocate=libintl_relocate \
+-DDEPENDS_ON_LIBICONV=1 @DEFS@
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+
+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+
+HEADERS = \
+  gmo.h \
+  gettextP.h \
+  hash-string.h \
+  loadinfo.h \
+  plural-exp.h \
+  eval-plural.h \
+  localcharset.h \
+  relocatable.h \
+  xsize.h \
+  printf-args.h printf-args.c \
+  printf-parse.h wprintf-parse.h printf-parse.c \
+  vasnprintf.h vasnwprintf.h vasnprintf.c \
+  os2compat.h \
+  libgnuintl.h.in
+SOURCES = \
+  bindtextdom.c \
+  dcgettext.c \
+  dgettext.c \
+  gettext.c \
+  finddomain.c \
+  loadmsgcat.c \
+  localealias.c \
+  textdomain.c \
+  l10nflist.c \
+  explodename.c \
+  dcigettext.c \
+  dcngettext.c \
+  dngettext.c \
+  ngettext.c \
+  plural.y \
+  plural-exp.c \
+  localcharset.c \
+  relocatable.c \
+  localename.c \
+  log.c \
+  printf.c \
+  osdep.c \
+  os2compat.c \
+  intl-compat.c
+OBJECTS = \
+  bindtextdom.$lo \
+  dcgettext.$lo \
+  dgettext.$lo \
+  gettext.$lo \
+  finddomain.$lo \
+  loadmsgcat.$lo \
+  localealias.$lo \
+  textdomain.$lo \
+  l10nflist.$lo \
+  explodename.$lo \
+  dcigettext.$lo \
+  dcngettext.$lo \
+  dngettext.$lo \
+  ngettext.$lo \
+  plural.$lo \
+  plural-exp.$lo \
+  localcharset.$lo \
+  relocatable.$lo \
+  localename.$lo \
+  log.$lo \
+  printf.$lo \
+  osdep.$lo \
+  intl-compat.$lo
+DISTFILES.common = Makefile.in \
+config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
+DISTFILES.generated = plural.c
+DISTFILES.normal = VERSION
+DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \
+libgnuintl.h_vms Makefile.vms \
+libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
+DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
+COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
+
+all: all-@USE_INCLUDED_LIBINTL@
+all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
+all-no: all-no-@BUILD_INCLUDED_LIBINTL@
+all-no-yes: libgnuintl.$la
+all-no-no:
+
+libintl.a libgnuintl.a: $(OBJECTS)
+	rm -f $@
+	$(AR) cru $@ $(OBJECTS)
+	$(RANLIB) $@
+
+libintl.la libgnuintl.la: $(OBJECTS)
+	$(LIBTOOL) --mode=link \
+	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
+	  $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \
+	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
+	  -rpath $(libdir) \
+	  -no-undefined
+
+# Libtool's library version information for libintl.
+# Before making a gettext release, the gettext maintainer must change this
+# according to the libtool documentation, section "Library interface versions".
+# Maintainers of other packages that include the intl directory must *not*
+# change these values.
+LTV_CURRENT=7
+LTV_REVISION=0
+LTV_AGE=4
+
+.SUFFIXES:
+.SUFFIXES: .c .y .o .lo .sin .sed
+
+.c.o:
+	$(COMPILE) $<
+
+.y.c:
+	$(YACC) $(YFLAGS) --output $@ $<
+	rm -f $*.h
+
+bindtextdom.lo: $(srcdir)/bindtextdom.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
+dcgettext.lo: $(srcdir)/dcgettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
+dgettext.lo: $(srcdir)/dgettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
+gettext.lo: $(srcdir)/gettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
+finddomain.lo: $(srcdir)/finddomain.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
+loadmsgcat.lo: $(srcdir)/loadmsgcat.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
+localealias.lo: $(srcdir)/localealias.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
+textdomain.lo: $(srcdir)/textdomain.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
+l10nflist.lo: $(srcdir)/l10nflist.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
+explodename.lo: $(srcdir)/explodename.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
+dcigettext.lo: $(srcdir)/dcigettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
+dcngettext.lo: $(srcdir)/dcngettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
+dngettext.lo: $(srcdir)/dngettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
+ngettext.lo: $(srcdir)/ngettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
+plural.lo: $(srcdir)/plural.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
+plural-exp.lo: $(srcdir)/plural-exp.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
+localcharset.lo: $(srcdir)/localcharset.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
+relocatable.lo: $(srcdir)/relocatable.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
+localename.lo: $(srcdir)/localename.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
+log.lo: $(srcdir)/log.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
+printf.lo: $(srcdir)/printf.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
+osdep.lo: $(srcdir)/osdep.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
+intl-compat.lo: $(srcdir)/intl-compat.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
+
+ref-add.sed: $(srcdir)/ref-add.sin
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
+	mv t-ref-add.sed ref-add.sed
+ref-del.sed: $(srcdir)/ref-del.sin
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
+	mv t-ref-del.sed ref-del.sed
+
+INCLUDES = -I. -I$(srcdir) -I..
+
+libgnuintl.h: $(srcdir)/libgnuintl.h.in
+	sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
+	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
+	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
+	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
+	  < $(srcdir)/libgnuintl.h.in > libgnuintl.h
+
+libintl.h: libgnuintl.h
+	cp libgnuintl.h libintl.h
+
+charset.alias: $(srcdir)/config.charset
+	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+	mv t-$@ $@
+
+check: all
+
+# We must not install the libintl.h/libintl.a files if we are on a
+# system which has the GNU gettext() function in its C library or in a
+# separate library.
+# If you want to use the one which comes with this version of the
+# package, you have to use `configure --with-included-gettext'.
+install: install-exec install-data
+install-exec: all
+	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
+	  $(LIBTOOL) --mode=install \
+	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+	  if test "@RELOCATABLE@" = yes; then \
+	    dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
+	    if test -n "$$dependencies"; then \
+	      rm -f $(DESTDIR)$(libdir)/libintl.la; \
+	    fi; \
+	  fi; \
+	else \
+	  : ; \
+	fi
+	if test "$(PACKAGE)" = "gettext-tools" \
+	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	  $(LIBTOOL) --mode=install \
+	    $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
+	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+	  $(LIBTOOL) --mode=uninstall \
+	    rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
+	else \
+	  : ; \
+	fi
+	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+	  dest=$(DESTDIR)$(libdir)/charset.alias; \
+	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+	    orig=$(DESTDIR)$(libdir)/charset.alias; \
+	    sed -f ref-add.sed $$orig > $$temp; \
+	    $(INSTALL_DATA) $$temp $$dest; \
+	    rm -f $$temp; \
+	  else \
+	    if test @GLIBC21@ = no; then \
+	      orig=charset.alias; \
+	      sed -f ref-add.sed $$orig > $$temp; \
+	      $(INSTALL_DATA) $$temp $$dest; \
+	      rm -f $$temp; \
+	    fi; \
+	  fi; \
+	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
+	  test -f $(DESTDIR)$(localedir)/locale.alias \
+	    && orig=$(DESTDIR)$(localedir)/locale.alias \
+	    || orig=$(srcdir)/locale.alias; \
+	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+	  dest=$(DESTDIR)$(localedir)/locale.alias; \
+	  sed -f ref-add.sed $$orig > $$temp; \
+	  $(INSTALL_DATA) $$temp $$dest; \
+	  rm -f $$temp; \
+	else \
+	  : ; \
+	fi
+install-data: all
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
+	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
+	  dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
+	  for file in $$dists; do \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
+	  dists="$(DISTFILES.generated)"; \
+	  for file in $$dists; do \
+	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+	    $(INSTALL_DATA) $$dir/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  dists="$(DISTFILES.obsolete)"; \
+	  for file in $$dists; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+
+install-strip: install
+
+installdirs:
+	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+	else \
+	  : ; \
+	fi
+	if test "$(PACKAGE)" = "gettext-tools" \
+	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	else \
+	  : ; \
+	fi
+	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
+	else \
+	  : ; \
+	fi
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	  : ; \
+	fi
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall:
+	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
+	  rm -f $(DESTDIR)$(includedir)/libintl.h; \
+	  $(LIBTOOL) --mode=uninstall \
+	    rm -f $(DESTDIR)$(libdir)/libintl.$la; \
+	else \
+	  : ; \
+	fi
+	if test "$(PACKAGE)" = "gettext-tools" \
+	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
+	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+	else \
+	  : ; \
+	fi
+	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+	    dest=$(DESTDIR)$(libdir)/charset.alias; \
+	    sed -f ref-del.sed $$dest > $$temp; \
+	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+	      rm -f $$dest; \
+	    else \
+	      $(INSTALL_DATA) $$temp $$dest; \
+	    fi; \
+	    rm -f $$temp; \
+	  fi; \
+	  if test -f $(DESTDIR)$(localedir)/locale.alias; then \
+	    temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+	    dest=$(DESTDIR)$(localedir)/locale.alias; \
+	    sed -f ref-del.sed $$dest > $$temp; \
+	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+	      rm -f $$dest; \
+	    else \
+	      $(INSTALL_DATA) $$temp $$dest; \
+	    fi; \
+	    rm -f $$temp; \
+	  fi; \
+	else \
+	  : ; \
+	fi
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+
+info dvi ps pdf html:
+
+$(OBJECTS): ../config.h libgnuintl.h
+bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
+dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
+explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
+dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
+dcigettext.$lo: $(srcdir)/eval-plural.h
+localcharset.$lo: $(srcdir)/localcharset.h
+localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
+printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
+
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES)
+	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
+
+ctags: CTAGS
+
+CTAGS: $(HEADERS) $(SOURCES)
+	here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
+
+id: ID
+
+ID: $(HEADERS) $(SOURCES)
+	here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
+
+
+mostlyclean:
+	rm -f *.a *.la *.o *.obj *.lo core core.*
+	rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
+	rm -f -r .libs _libs
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile ID TAGS
+	if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
+	  rm -f ChangeLog.inst $(DISTFILES.normal); \
+	else \
+	  : ; \
+	fi
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+
+# GNU gettext needs not contain the file `VERSION' but contains some
+# other files which should not be distributed in other packages.
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: Makefile
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  : ; \
+	else \
+	  if test "$(PACKAGE)" = "gettext-runtime"; then \
+	    additional="$(DISTFILES.gettext)"; \
+	  else \
+	    additional="$(DISTFILES.normal)"; \
+	  fi; \
+	  $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
+	  for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
+	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+	    cp -p $$dir/$$file $(distdir); \
+	  done; \
+	fi
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status
+# This would be more efficient, but doesn't work any more with autoconf-2.57,
+# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
+#	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

intl/VERSION

@@ -0,0 +1 @@
+GNU gettext library from gettext-0.14.1

intl/bindtextdom.c

@@ -0,0 +1,363 @@
+/* Implementation of the bindtextdomain(3) function
+   Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+#include "gettextP.h"
+
+#ifdef _LIBC
+/* We have to handle multi-threaded applications.  */
+# include <bits/libc-lock.h>
+#else
+/* Provide dummy implementation if this is outside glibc.  */
+# define __libc_rwlock_define(CLASS, NAME)
+# define __libc_rwlock_wrlock(NAME)
+# define __libc_rwlock_unlock(NAME)
+#endif
+
+/* The internal variables in the standalone libintl.a must have different
+   names than the internal variables in GNU libc, otherwise programs
+   using libintl.a cannot be linked statically.  */
+#if !defined _LIBC
+# define _nl_default_dirname libintl_nl_default_dirname
+# define _nl_domain_bindings libintl_nl_domain_bindings
+#endif
+
+/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
+#ifndef offsetof
+# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Contains the default location of the message catalogs.  */
+extern const char _nl_default_dirname[];
+#ifdef _LIBC
+extern const char _nl_default_dirname_internal[] attribute_hidden;
+#else
+# define INTUSE(name) name
+#endif
+
+/* List with bindings of specific domains.  */
+extern struct binding *_nl_domain_bindings;
+
+/* Lock variable to protect the global data in the gettext implementation.  */
+__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
+
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define BINDTEXTDOMAIN __bindtextdomain
+# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
+# ifndef strdup
+#  define strdup(str) __strdup (str)
+# endif
+#else
+# define BINDTEXTDOMAIN libintl_bindtextdomain
+# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
+#endif
+
+/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
+   to be used for the DOMAINNAME message catalog.
+   If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
+   modified, only the current value is returned.
+   If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
+   modified nor returned.  */
+static void
+set_binding_values (const char *domainname,
+		    const char **dirnamep, const char **codesetp)
+{
+  struct binding *binding;
+  int modified;
+
+  /* Some sanity checks.  */
+  if (domainname == NULL || domainname[0] == '\0')
+    {
+      if (dirnamep)
+	*dirnamep = NULL;
+      if (codesetp)
+	*codesetp = NULL;
+      return;
+    }
+
+  __libc_rwlock_wrlock (_nl_state_lock);
+
+  modified = 0;
+
+  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
+    {
+      int compare = strcmp (domainname, binding->domainname);
+      if (compare == 0)
+	/* We found it!  */
+	break;
+      if (compare < 0)
+	{
+	  /* It is not in the list.  */
+	  binding = NULL;
+	  break;
+	}
+    }
+
+  if (binding != NULL)
+    {
+      if (dirnamep)
+	{
+	  const char *dirname = *dirnamep;
+
+	  if (dirname == NULL)
+	    /* The current binding has be to returned.  */
+	    *dirnamep = binding->dirname;
+	  else
+	    {
+	      /* The domain is already bound.  If the new value and the old
+		 one are equal we simply do nothing.  Otherwise replace the
+		 old binding.  */
+	      char *result = binding->dirname;
+	      if (strcmp (dirname, result) != 0)
+		{
+		  if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
+		    result = (char *) INTUSE(_nl_default_dirname);
+		  else
+		    {
+#if defined _LIBC || defined HAVE_STRDUP
+		      result = strdup (dirname);
+#else
+		      size_t len = strlen (dirname) + 1;
+		      result = (char *) malloc (len);
+		      if (__builtin_expect (result != NULL, 1))
+			memcpy (result, dirname, len);
+#endif
+		    }
+
+		  if (__builtin_expect (result != NULL, 1))
+		    {
+		      if (binding->dirname != INTUSE(_nl_default_dirname))
+			free (binding->dirname);
+
+		      binding->dirname = result;
+		      modified = 1;
+		    }
+		}
+	      *dirnamep = result;
+	    }
+	}
+
+      if (codesetp)
+	{
+	  const char *codeset = *codesetp;
+
+	  if (codeset == NULL)
+	    /* The current binding has be to returned.  */
+	    *codesetp = binding->codeset;
+	  else
+	    {
+	      /* The domain is already bound.  If the new value and the old
+		 one are equal we simply do nothing.  Otherwise replace the
+		 old binding.  */
+	      char *result = binding->codeset;
+	      if (result == NULL || strcmp (codeset, result) != 0)
+		{
+#if defined _LIBC || defined HAVE_STRDUP
+		  result = strdup (codeset);
+#else
+		  size_t len = strlen (codeset) + 1;
+		  result = (char *) malloc (len);
+		  if (__builtin_expect (result != NULL, 1))
+		    memcpy (result, codeset, len);
+#endif
+
+		  if (__builtin_expect (result != NULL, 1))
+		    {
+		      if (binding->codeset != NULL)
+			free (binding->codeset);
+
+		      binding->codeset = result;
+		      binding->codeset_cntr++;
+		      modified = 1;
+		    }
+		}
+	      *codesetp = result;
+	    }
+	}
+    }
+  else if ((dirnamep == NULL || *dirnamep == NULL)
+	   && (codesetp == NULL || *codesetp == NULL))
+    {
+      /* Simply return the default values.  */
+      if (dirnamep)
+	*dirnamep = INTUSE(_nl_default_dirname);
+      if (codesetp)
+	*codesetp = NULL;
+    }
+  else
+    {
+      /* We have to create a new binding.  */
+      size_t len = strlen (domainname) + 1;
+      struct binding *new_binding =
+	(struct binding *) malloc (offsetof (struct binding, domainname) + len);
+
+      if (__builtin_expect (new_binding == NULL, 0))
+	goto failed;
+
+      memcpy (new_binding->domainname, domainname, len);
+
+      if (dirnamep)
+	{
+	  const char *dirname = *dirnamep;
+
+	  if (dirname == NULL)
+	    /* The default value.  */
+	    dirname = INTUSE(_nl_default_dirname);
+	  else
+	    {
+	      if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
+		dirname = INTUSE(_nl_default_dirname);
+	      else
+		{
+		  char *result;
+#if defined _LIBC || defined HAVE_STRDUP
+		  result = strdup (dirname);
+		  if (__builtin_expect (result == NULL, 0))
+		    goto failed_dirname;
+#else
+		  size_t len = strlen (dirname) + 1;
+		  result = (char *) malloc (len);
+		  if (__builtin_expect (result == NULL, 0))
+		    goto failed_dirname;
+		  memcpy (result, dirname, len);
+#endif
+		  dirname = result;
+		}
+	    }
+	  *dirnamep = dirname;
+	  new_binding->dirname = (char *) dirname;
+	}
+      else
+	/* The default value.  */
+	new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
+
+      new_binding->codeset_cntr = 0;
+
+      if (codesetp)
+	{
+	  const char *codeset = *codesetp;
+
+	  if (codeset != NULL)
+	    {
+	      char *result;
+
+#if defined _LIBC || defined HAVE_STRDUP
+	      result = strdup (codeset);
+	      if (__builtin_expect (result == NULL, 0))
+		goto failed_codeset;
+#else
+	      size_t len = strlen (codeset) + 1;
+	      result = (char *) malloc (len);
+	      if (__builtin_expect (result == NULL, 0))
+		goto failed_codeset;
+	      memcpy (result, codeset, len);
+#endif
+	      codeset = result;
+	      new_binding->codeset_cntr++;
+	    }
+	  *codesetp = codeset;
+	  new_binding->codeset = (char *) codeset;
+	}
+      else
+	new_binding->codeset = NULL;
+
+      /* Now enqueue it.  */
+      if (_nl_domain_bindings == NULL
+	  || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
+	{
+	  new_binding->next = _nl_domain_bindings;
+	  _nl_domain_bindings = new_binding;
+	}
+      else
+	{
+	  binding = _nl_domain_bindings;
+	  while (binding->next != NULL
+		 && strcmp (domainname, binding->next->domainname) > 0)
+	    binding = binding->next;
+
+	  new_binding->next = binding->next;
+	  binding->next = new_binding;
+	}
+
+      modified = 1;
+
+      /* Here we deal with memory allocation failures.  */
+      if (0)
+	{
+	failed_codeset:
+	  if (new_binding->dirname != INTUSE(_nl_default_dirname))
+	    free (new_binding->dirname);
+	failed_dirname:
+	  free (new_binding);
+	failed:
+	  if (dirnamep)
+	    *dirnamep = NULL;
+	  if (codesetp)
+	    *codesetp = NULL;
+	}
+    }
+
+  /* If we modified any binding, we flush the caches.  */
+  if (modified)
+    ++_nl_msg_cat_cntr;
+
+  __libc_rwlock_unlock (_nl_state_lock);
+}
+
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+char *
+BINDTEXTDOMAIN (const char *domainname, const char *dirname)
+{
+  set_binding_values (domainname, &dirname, NULL);
+  return (char *) dirname;
+}
+
+/* Specify the character encoding in which the messages from the
+   DOMAINNAME message catalog will be returned.  */
+char *
+BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset)
+{
+  set_binding_values (domainname, NULL, &codeset);
+  return (char *) codeset;
+}
+
+#ifdef _LIBC
+/* Aliases for function names in GNU C Library.  */
+weak_alias (__bindtextdomain, bindtextdomain);
+weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
+#endif

intl/config.charset

@@ -0,0 +1,608 @@
+#! /bin/sh
+# Output a system dependent table of character encoding aliases.
+#
+#   Copyright (C) 2000-2004 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Library 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
+#   Library General Public License for more details.
+#
+#   You should have received a copy of the GNU Library 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.
+#
+# The table consists of lines of the form
+#    ALIAS  CANONICAL
+#
+# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
+# ALIAS is compared in a case sensitive way.
+#
+# CANONICAL is the GNU canonical name for this character encoding.
+# It must be an encoding supported by libiconv. Support by GNU libc is
+# also desirable. CANONICAL is case insensitive. Usually an upper case
+# MIME charset name is preferred.
+# The current list of GNU canonical charset names is as follows.
+#
+#       name              MIME?             used by which systems
+#   ASCII, ANSI_X3.4-1968       glibc solaris freebsd darwin
+#   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd darwin
+#   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd darwin
+#   ISO-8859-3              Y   glibc solaris
+#   ISO-8859-4              Y   osf solaris freebsd darwin
+#   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd darwin
+#   ISO-8859-6              Y   glibc aix hpux solaris
+#   ISO-8859-7              Y   glibc aix hpux irix osf solaris
+#   ISO-8859-8              Y   glibc aix hpux osf solaris
+#   ISO-8859-9              Y   glibc aix hpux irix osf solaris
+#   ISO-8859-13                 glibc
+#   ISO-8859-14                 glibc
+#   ISO-8859-15                 glibc aix osf solaris freebsd
+#   KOI8-R                  Y   glibc solaris freebsd darwin
+#   KOI8-U                  Y   glibc freebsd darwin
+#   KOI8-T                      glibc
+#   CP437                       dos
+#   CP775                       dos
+#   CP850                       aix osf dos
+#   CP852                       dos
+#   CP855                       dos
+#   CP856                       aix
+#   CP857                       dos
+#   CP861                       dos
+#   CP862                       dos
+#   CP864                       dos
+#   CP865                       dos
+#   CP866                       freebsd darwin dos
+#   CP869                       dos
+#   CP874                       woe32 dos
+#   CP922                       aix
+#   CP932                       aix woe32 dos
+#   CP943                       aix
+#   CP949                       osf woe32 dos
+#   CP950                       woe32 dos
+#   CP1046                      aix
+#   CP1124                      aix
+#   CP1125                      dos
+#   CP1129                      aix
+#   CP1250                      woe32
+#   CP1251                      glibc solaris darwin woe32
+#   CP1252                      aix woe32
+#   CP1253                      woe32
+#   CP1254                      woe32
+#   CP1255                      glibc woe32
+#   CP1256                      woe32
+#   CP1257                      woe32
+#   GB2312                  Y   glibc aix hpux irix solaris freebsd darwin
+#   EUC-JP                  Y   glibc aix hpux irix osf solaris freebsd darwin
+#   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd darwin
+#   EUC-TW                      glibc aix hpux irix osf solaris
+#   BIG5                    Y   glibc aix hpux osf solaris freebsd darwin
+#   BIG5-HKSCS                  glibc solaris
+#   GBK                         glibc aix osf solaris woe32 dos
+#   GB18030                     glibc solaris
+#   SHIFT_JIS               Y   hpux osf solaris freebsd darwin
+#   JOHAB                       glibc solaris woe32
+#   TIS-620                     glibc aix hpux osf solaris
+#   VISCII                  Y   glibc
+#   TCVN5712-1                  glibc
+#   GEORGIAN-PS                 glibc
+#   HP-ROMAN8                   hpux
+#   HP-ARABIC8                  hpux
+#   HP-GREEK8                   hpux
+#   HP-HEBREW8                  hpux
+#   HP-TURKISH8                 hpux
+#   HP-KANA8                    hpux
+#   DEC-KANJI                   osf
+#   DEC-HANYU                   osf
+#   UTF-8                   Y   glibc aix hpux osf solaris
+#
+# Note: Names which are not marked as being a MIME name should not be used in
+# Internet protocols for information interchange (mail, news, etc.).
+#
+# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
+# must understand both names and treat them as equivalent.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+
+host="$1"
+os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
+echo "# This file contains a table of character encoding aliases,"
+echo "# suitable for operating system '${os}'."
+echo "# It was automatically generated from config.charset."
+# List of references, updated during installation:
+echo "# Packages using this file: "
+case "$os" in
+    linux-gnulibc1*)
+	# Linux libc5 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "C ASCII"
+	echo "POSIX ASCII"
+	for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
+	         en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
+	         en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
+	         es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
+	         et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
+	         fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
+	         it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
+	         sv_FI sv_SE; do
+	  echo "$l ISO-8859-1"
+	  echo "$l.iso-8859-1 ISO-8859-1"
+	  echo "$l.iso-8859-15 ISO-8859-15"
+	  echo "$l.iso-8859-15@euro ISO-8859-15"
+	  echo "$l@euro ISO-8859-15"
+	  echo "$l.cp-437 CP437"
+	  echo "$l.cp-850 CP850"
+	  echo "$l.cp-1252 CP1252"
+	  echo "$l.cp-1252@euro CP1252"
+	  #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
+	  echo "$l.utf-8 UTF-8"
+	  echo "$l.utf-8@euro UTF-8"
+	done
+	for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
+	         sl_SI sr sr_CS sr_YU; do
+	  echo "$l ISO-8859-2"
+	  echo "$l.iso-8859-2 ISO-8859-2"
+	  echo "$l.cp-852 CP852"
+	  echo "$l.cp-1250 CP1250"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in mk mk_MK ru ru_RU; do
+	  echo "$l ISO-8859-5"
+	  echo "$l.iso-8859-5 ISO-8859-5"
+	  echo "$l.koi8-r KOI8-R"
+	  echo "$l.cp-866 CP866"
+	  echo "$l.cp-1251 CP1251"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in ar ar_SA; do
+	  echo "$l ISO-8859-6"
+	  echo "$l.iso-8859-6 ISO-8859-6"
+	  echo "$l.cp-864 CP864"
+	  #echo "$l.cp-868 CP868" # not a commonly used encoding
+	  echo "$l.cp-1256 CP1256"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in el el_GR gr gr_GR; do
+	  echo "$l ISO-8859-7"
+	  echo "$l.iso-8859-7 ISO-8859-7"
+	  echo "$l.cp-869 CP869"
+	  echo "$l.cp-1253 CP1253"
+	  echo "$l.cp-1253@euro CP1253"
+	  echo "$l.utf-8 UTF-8"
+	  echo "$l.utf-8@euro UTF-8"
+	done
+	for l in he he_IL iw iw_IL; do
+	  echo "$l ISO-8859-8"
+	  echo "$l.iso-8859-8 ISO-8859-8"
+	  echo "$l.cp-862 CP862"
+	  echo "$l.cp-1255 CP1255"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in tr tr_TR; do
+	  echo "$l ISO-8859-9"
+	  echo "$l.iso-8859-9 ISO-8859-9"
+	  echo "$l.cp-857 CP857"
+	  echo "$l.cp-1254 CP1254"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in lt lt_LT lv lv_LV; do
+	  #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
+	  echo "$l ISO-8859-13"
+	done
+	for l in ru_UA uk uk_UA; do
+	  echo "$l KOI8-U"
+	done
+	for l in zh zh_CN; do
+	  #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
+	  echo "$l GB2312"
+	done
+	for l in ja ja_JP ja_JP.EUC; do
+	  echo "$l EUC-JP"
+	done
+	for l in ko ko_KR; do
+	  echo "$l EUC-KR"
+	done
+	for l in th th_TH; do
+	  echo "$l TIS-620"
+	done
+	for l in fa fa_IR; do
+	  #echo "$l ISIRI-3342" # a broken encoding
+	  echo "$l.utf-8 UTF-8"
+	done
+	;;
+    linux* | *-gnu*)
+	# With glibc-2.1 or newer, we don't need any canonicalization,
+	# because glibc has iconv and both glibc and libiconv support all
+	# GNU canonical names directly. Therefore, the Makefile does not
+	# need to install the alias file at all.
+	# The following applies only to glibc-2.0.x and older libcs.
+	echo "ISO_646.IRV:1983 ASCII"
+	;;
+    aix*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-6 ISO-8859-6"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "IBM-850 CP850"
+	echo "IBM-856 CP856"
+	echo "IBM-921 ISO-8859-13"
+	echo "IBM-922 CP922"
+	echo "IBM-932 CP932"
+	echo "IBM-943 CP943"
+	echo "IBM-1046 CP1046"
+	echo "IBM-1124 CP1124"
+	echo "IBM-1129 CP1129"
+	echo "IBM-1252 CP1252"
+	echo "IBM-eucCN GB2312"
+	echo "IBM-eucJP EUC-JP"
+	echo "IBM-eucKR EUC-KR"
+	echo "IBM-eucTW EUC-TW"
+	echo "big5 BIG5"
+	echo "GBK GBK"
+	echo "TIS-620 TIS-620"
+	echo "UTF-8 UTF-8"
+	;;
+    hpux*)
+	echo "iso88591 ISO-8859-1"
+	echo "iso88592 ISO-8859-2"
+	echo "iso88595 ISO-8859-5"
+	echo "iso88596 ISO-8859-6"
+	echo "iso88597 ISO-8859-7"
+	echo "iso88598 ISO-8859-8"
+	echo "iso88599 ISO-8859-9"
+	echo "iso885915 ISO-8859-15"
+	echo "roman8 HP-ROMAN8"
+	echo "arabic8 HP-ARABIC8"
+	echo "greek8 HP-GREEK8"
+	echo "hebrew8 HP-HEBREW8"
+	echo "turkish8 HP-TURKISH8"
+	echo "kana8 HP-KANA8"
+	echo "tis620 TIS-620"
+	echo "big5 BIG5"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "hp15CN GB2312"
+	#echo "ccdc ?" # what is this?
+	echo "SJIS SHIFT_JIS"
+	echo "utf8 UTF-8"
+	;;
+    irix*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "eucCN GB2312"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	;;
+    osf*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "cp850 CP850"
+	echo "big5 BIG5"
+	echo "dechanyu DEC-HANYU"
+	echo "dechanzi GB2312"
+	echo "deckanji DEC-KANJI"
+	echo "deckorean EUC-KR"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "GBK GBK"
+	echo "KSC5601 CP949"
+	echo "sdeckanji EUC-JP"
+	echo "SJIS SHIFT_JIS"
+	echo "TACTIS TIS-620"
+	echo "UTF-8 UTF-8"
+	;;
+    solaris*)
+	echo "646 ASCII"
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-3 ISO-8859-3"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-6 ISO-8859-6"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "koi8-r KOI8-R"
+	echo "ansi-1251 CP1251"
+	echo "BIG5 BIG5"
+	echo "Big5-HKSCS BIG5-HKSCS"
+	echo "gb2312 GB2312"
+	echo "GBK GBK"
+	echo "GB18030 GB18030"
+	echo "cns11643 EUC-TW"
+	echo "5601 EUC-KR"
+	echo "ko_KR.johap92 JOHAB"
+	echo "eucJP EUC-JP"
+	echo "PCK SHIFT_JIS"
+	echo "TIS620.2533 TIS-620"
+	#echo "sun_eu_greek ?" # what is this?
+	echo "UTF-8 UTF-8"
+	;;
+    freebsd* | os2*)
+	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	# Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
+	# reuse FreeBSD's locale data for OS/2.
+	echo "C ASCII"
+	echo "US-ASCII ASCII"
+	for l in la_LN lt_LN; do
+	  echo "$l.ASCII ASCII"
+	done
+	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
+	         lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
+	  echo "$l.ISO_8859-1 ISO-8859-1"
+	  echo "$l.DIS_8859-15 ISO-8859-15"
+	done
+	for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
+	  echo "$l.ISO_8859-2 ISO-8859-2"
+	done
+	for l in la_LN lt_LT; do
+	  echo "$l.ISO_8859-4 ISO-8859-4"
+	done
+	for l in ru_RU ru_SU; do
+	  echo "$l.KOI8-R KOI8-R"
+	  echo "$l.ISO_8859-5 ISO-8859-5"
+	  echo "$l.CP866 CP866"
+	done
+	echo "uk_UA.KOI8-U KOI8-U"
+	echo "zh_TW.BIG5 BIG5"
+	echo "zh_TW.Big5 BIG5"
+	echo "zh_CN.EUC GB2312"
+	echo "ja_JP.EUC EUC-JP"
+	echo "ja_JP.SJIS SHIFT_JIS"
+	echo "ja_JP.Shift_JIS SHIFT_JIS"
+	echo "ko_KR.EUC EUC-KR"
+	;;
+    netbsd*)
+	echo "646 ASCII"
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "eucCN GB2312"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "BIG5 BIG5"
+	echo "SJIS SHIFT_JIS"
+	;;
+    darwin*)
+	# Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "C ASCII"
+	for l in en_AU en_CA en_GB en_US la_LN; do
+	  echo "$l.US-ASCII ASCII"
+	done
+	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
+	         nl_NL no_NO pt_PT sv_SE; do
+	  echo "$l ISO-8859-1"
+	  echo "$l.ISO8859-1 ISO-8859-1"
+	  echo "$l.ISO8859-15 ISO-8859-15"
+	done
+	for l in la_LN; do
+	  echo "$l.ISO8859-1 ISO-8859-1"
+	  echo "$l.ISO8859-15 ISO-8859-15"
+	done
+	for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
+	  echo "$l.ISO8859-2 ISO-8859-2"
+	done
+	for l in la_LN lt_LT; do
+	  echo "$l.ISO8859-4 ISO-8859-4"
+	done
+	for l in ru_RU; do
+	  echo "$l.KOI8-R KOI8-R"
+	  echo "$l.ISO8859-5 ISO-8859-5"
+	  echo "$l.CP866 CP866"
+	done
+	for l in bg_BG; do
+	  echo "$l.CP1251 CP1251"
+	done
+	echo "uk_UA.KOI8-U KOI8-U"
+	echo "zh_TW.BIG5 BIG5"
+	echo "zh_TW.Big5 BIG5"
+	echo "zh_CN.EUC GB2312"
+	echo "ja_JP.EUC EUC-JP"
+	echo "ja_JP.SJIS SHIFT_JIS"
+	echo "ko_KR.EUC EUC-KR"
+	;;
+    beos*)
+	# BeOS has a single locale, and it has UTF-8 encoding.
+	echo "* UTF-8"
+	;;
+    msdosdjgpp*)
+	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "#"
+	echo "# The encodings given here may not all be correct."
+	echo "# If you find that the encoding given for your language and"
+	echo "# country is not the one your DOS machine actually uses, just"
+	echo "# correct it in this file, and send a mail to"
+	echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
+	echo "# and Bruno Haible <bruno@clisp.org>."
+	echo "#"
+	echo "C ASCII"
+	# ISO-8859-1 languages
+	echo "ca CP850"
+	echo "ca_ES CP850"
+	echo "da CP865"    # not CP850 ??
+	echo "da_DK CP865" # not CP850 ??
+	echo "de CP850"
+	echo "de_AT CP850"
+	echo "de_CH CP850"
+	echo "de_DE CP850"
+	echo "en CP850"
+	echo "en_AU CP850" # not CP437 ??
+	echo "en_CA CP850"
+	echo "en_GB CP850"
+	echo "en_NZ CP437"
+	echo "en_US CP437"
+	echo "en_ZA CP850" # not CP437 ??
+	echo "es CP850"
+	echo "es_AR CP850"
+	echo "es_BO CP850"
+	echo "es_CL CP850"
+	echo "es_CO CP850"
+	echo "es_CR CP850"
+	echo "es_CU CP850"
+	echo "es_DO CP850"
+	echo "es_EC CP850"
+	echo "es_ES CP850"
+	echo "es_GT CP850"
+	echo "es_HN CP850"
+	echo "es_MX CP850"
+	echo "es_NI CP850"
+	echo "es_PA CP850"
+	echo "es_PY CP850"
+	echo "es_PE CP850"
+	echo "es_SV CP850"
+	echo "es_UY CP850"
+	echo "es_VE CP850"
+	echo "et CP850"
+	echo "et_EE CP850"
+	echo "eu CP850"
+	echo "eu_ES CP850"
+	echo "fi CP850"
+	echo "fi_FI CP850"
+	echo "fr CP850"
+	echo "fr_BE CP850"
+	echo "fr_CA CP850"
+	echo "fr_CH CP850"
+	echo "fr_FR CP850"
+	echo "ga CP850"
+	echo "ga_IE CP850"
+	echo "gd CP850"
+	echo "gd_GB CP850"
+	echo "gl CP850"
+	echo "gl_ES CP850"
+	echo "id CP850"    # not CP437 ??
+	echo "id_ID CP850" # not CP437 ??
+	echo "is CP861"    # not CP850 ??
+	echo "is_IS CP861" # not CP850 ??
+	echo "it CP850"
+	echo "it_CH CP850"
+	echo "it_IT CP850"
+	echo "lt CP775"
+	echo "lt_LT CP775"
+	echo "lv CP775"
+	echo "lv_LV CP775"
+	echo "nb CP865"    # not CP850 ??
+	echo "nb_NO CP865" # not CP850 ??
+	echo "nl CP850"
+	echo "nl_BE CP850"
+	echo "nl_NL CP850"
+	echo "nn CP865"    # not CP850 ??
+	echo "nn_NO CP865" # not CP850 ??
+	echo "no CP865"    # not CP850 ??
+	echo "no_NO CP865" # not CP850 ??
+	echo "pt CP850"
+	echo "pt_BR CP850"
+	echo "pt_PT CP850"
+	echo "sv CP850"
+	echo "sv_SE CP850"
+	# ISO-8859-2 languages
+	echo "cs CP852"
+	echo "cs_CZ CP852"
+	echo "hr CP852"
+	echo "hr_HR CP852"
+	echo "hu CP852"
+	echo "hu_HU CP852"
+	echo "pl CP852"
+	echo "pl_PL CP852"
+	echo "ro CP852"
+	echo "ro_RO CP852"
+	echo "sk CP852"
+	echo "sk_SK CP852"
+	echo "sl CP852"
+	echo "sl_SI CP852"
+	echo "sq CP852"
+	echo "sq_AL CP852"
+	echo "sr CP852"    # CP852 or CP866 or CP855 ??
+	echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
+	echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
+	# ISO-8859-3 languages
+	echo "mt CP850"
+	echo "mt_MT CP850"
+	# ISO-8859-5 languages
+	echo "be CP866"
+	echo "be_BE CP866"
+	echo "bg CP866"    # not CP855 ??
+	echo "bg_BG CP866" # not CP855 ??
+	echo "mk CP866"    # not CP855 ??
+	echo "mk_MK CP866" # not CP855 ??
+	echo "ru CP866"
+	echo "ru_RU CP866"
+	echo "uk CP1125"
+	echo "uk_UA CP1125"
+	# ISO-8859-6 languages
+	echo "ar CP864"
+	echo "ar_AE CP864"
+	echo "ar_DZ CP864"
+	echo "ar_EG CP864"
+	echo "ar_IQ CP864"
+	echo "ar_IR CP864"
+	echo "ar_JO CP864"
+	echo "ar_KW CP864"
+	echo "ar_MA CP864"
+	echo "ar_OM CP864"
+	echo "ar_QA CP864"
+	echo "ar_SA CP864"
+	echo "ar_SY CP864"
+	# ISO-8859-7 languages
+	echo "el CP869"
+	echo "el_GR CP869"
+	# ISO-8859-8 languages
+	echo "he CP862"
+	echo "he_IL CP862"
+	# ISO-8859-9 languages
+	echo "tr CP857"
+	echo "tr_TR CP857"
+	# Japanese
+	echo "ja CP932"
+	echo "ja_JP CP932"
+	# Chinese
+	echo "zh_CN GBK"
+	echo "zh_TW CP950" # not CP938 ??
+	# Korean
+	echo "kr CP949"    # not CP934 ??
+	echo "kr_KR CP949" # not CP934 ??
+	# Thai
+	echo "th CP874"
+	echo "th_TH CP874"
+	# Other
+	echo "eo CP850"
+	echo "eo_EO CP850"
+	;;
+esac

intl/dcgettext.c

@@ -0,0 +1,56 @@
+/* Implementation of the dcgettext(3) function.
+   Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define DCGETTEXT __dcgettext
+# define DCIGETTEXT __dcigettext
+#else
+# define DCGETTEXT libintl_dcgettext
+# define DCIGETTEXT libintl_dcigettext
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+   locale.  */
+char *
+DCGETTEXT (const char *domainname, const char *msgid, int category)
+{
+  return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+INTDEF(__dcgettext)
+weak_alias (__dcgettext, dcgettext);
+#endif

intl/dcngettext.c

@@ -0,0 +1,57 @@
+/* Implementation of the dcngettext(3) function.
+   Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define DCNGETTEXT __dcngettext
+# define DCIGETTEXT __dcigettext
+#else
+# define DCNGETTEXT libintl_dcngettext
+# define DCIGETTEXT libintl_dcigettext
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+   locale.  */
+char *
+DCNGETTEXT (const char *domainname,
+	    const char *msgid1, const char *msgid2, unsigned long int n,
+	    int category)
+{
+  return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__dcngettext, dcngettext);
+#endif

intl/dgettext.c

@@ -0,0 +1,58 @@
+/* Implementation of the dgettext(3) function.
+   Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "gettextP.h"
+
+#include <locale.h>
+
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define DGETTEXT __dgettext
+# define DCGETTEXT INTUSE(__dcgettext)
+#else
+# define DGETTEXT libintl_dgettext
+# define DCGETTEXT libintl_dcgettext
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog of the current
+   LC_MESSAGES locale.  */
+char *
+DGETTEXT (const char *domainname, const char *msgid)
+{
+  return DCGETTEXT (domainname, msgid, LC_MESSAGES);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__dgettext, dgettext);
+#endif

intl/dngettext.c

@@ -0,0 +1,59 @@
+/* Implementation of the dngettext(3) function.
+   Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "gettextP.h"
+
+#include <locale.h>
+
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define DNGETTEXT __dngettext
+# define DCNGETTEXT __dcngettext
+#else
+# define DNGETTEXT libintl_dngettext
+# define DCNGETTEXT libintl_dcngettext
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog of the current
+   LC_MESSAGES locale and skip message according to the plural form.  */
+char *
+DNGETTEXT (const char *domainname,
+	   const char *msgid1, const char *msgid2, unsigned long int n)
+{
+  return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__dngettext, dngettext);
+#endif