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

7 files changed, 631 insertions, 523 deletions

diff --git a/utils/Makefile b/utils/Makefile
deleted file mode 100644
index e63191a35..000000000
--- a/utils/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-srcdir		= .
-top_srcdir	= ..
-
-default: all
-include ../Makefile.conf
-
-CFLAGS			+= -I$(top_srcdir)/optlib
-
-SSD_SOURCES		= start-stop-daemon.c
-SSD_OBJECTS		= $(patsubst %.c, %.o, $(SSD_SOURCES))
-SSD_MANPAGES		= start-stop-daemon.8
-
-MD5_SOURCES		= md5sum.c
-MD5_OBJECTS		= $(patsubst %.c, %.o, $(MD5_SOURCES))
-MD5_MANPAGES		= md5sum.1
-
-ENOENT_SOURCES		= enoent.c
-ENOENT_OBJECTS		= $(patsubst %.c, %.o, $(ENOENT_SOURCES))
-
-GENFILES		= $(MD5_OBJECTS) md5sum md5sum-static $(ENOENT_OBJECTS) enoent
-ifeq (true, true)
-GENFILES		+= $(SSD_OBJECTS) start-stop-daemon
-endif
-
-.PHONY: all
-ifeq (true, true)
-all:: start-stop-daemon md5sum enoent
-else
-all:: md5sum enoent
-endif
-
-.PHONY: install
-install:: all
-ifdef ALSO_STATIC
-all:: md5sum-static
-endif
-
-.PHONY: clean
-clean::
-	$(RM) $(GENFILES)
-
-.PHONY: distclean
-cvslean:: clean
-	$(RM) Makefile confdefs.h config.log
-
-.PHONY: install
-install:: install-program install-doc
-
-.PHONY: install-program
-install-program:
-ifeq (true, true)
-	$(mkinstalldirs) $(DESTDIR)/$(sbindir)
-	$(INSTALL_PROGRAM) start-stop-daemon $(DESTDIR)/$(sbindir)
-endif
-	$(mkinstalldirs) $(DESTDIR)/$(bindir)
-	$(INSTALL_PROGRAM) md5sum $(DESTDIR)/$(bindir)
-ifdef ALSO_STATIC
-	$(INSTALL_PROGRAM) md5sum-static $(DESTDIR)/$(bindir)
-endif
-	$(mkinstalldirs) $(DESTDIR)/$(dpkglibdir)
-	$(INSTALL_PROGRAM) enoent $(DESTDIR)/$(dpkglibdir)
-
-.PHONY: install-doc
-install-doc:
-ifeq (true, true)
-	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
-	$(INSTALL_DATA) $(srcdir)/$(SSD_MANPAGES) $(DESTDIR)/$(man8dir)
-endif
-	$(mkinstalldirs) $(DESTDIR)/$(man1dir)
-	$(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
-
-start-stop-daemon: $(SSD_OBJECTS) ../lib/libdpkg.a
-	$(CC) $(LDFLAGS) -o $@ $(SSD_OBJECTS) $(LIBS) $(SSD_LIBS)
-
-md5sum-static: LDFLAGS += -static
-md5sum-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC)
-md5sum md5sum-static: $(MD5_OBJECTS) ../lib/libdpkg.a
-	$(CC) $(LDFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS)
diff --git a/utils/Makefile.am b/utils/Makefile.am
new file mode 100644
index 000000000..5318bc03b
--- /dev/null
+++ b/utils/Makefile.am
@@ -0,0 +1,31 @@
+## Process this file with automake to produce Makefile.in
+
+localedir = $(datadir)/locale
+INCLUDES = \
+	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+	-I$(top_srcdir)/getopt \
+	-I$(top_srcdir)/lib
+
+
+bin_PROGRAMS = md5sum
+
+md5sum_SOURCES = \
+	md5sum.c
+
+md5sum_LDADD = $(LIBINTL) ../getopt/libopt.a ../lib/libdpkg.a $(ZLIB_LIBS)
+
+
+if WITH_START_STOP_DAEMON
+  sbin_PROGRAMS = start-stop-daemon
+
+  start_stop_daemon_SOURCES = \
+	start-stop-daemon.c
+
+  start_stop_daemon_LDADD = ../getopt/libopt.a $(SSD_LIBS)
+endif
+
+
+pkglib_PROGRAMS = enoent
+
+enoent_SOURCES = \
+	enoent.c
diff --git a/utils/Makefile.in b/utils/Makefile.in
index c4e486eea..6676cf21e 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -1,80 +1,566 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-top_srcdir	= @top_srcdir@
-
-default: all
-include ../Makefile.conf
-
-CFLAGS			+= -I$(top_srcdir)/optlib
-
-SSD_SOURCES		= start-stop-daemon.c
-SSD_OBJECTS		= $(patsubst %.c, %.o, $(SSD_SOURCES))
-SSD_MANPAGES		= start-stop-daemon.8
-
-MD5_SOURCES		= md5sum.c
-MD5_OBJECTS		= $(patsubst %.c, %.o, $(MD5_SOURCES))
-MD5_MANPAGES		= md5sum.1
-
-ENOENT_SOURCES		= enoent.c
-ENOENT_OBJECTS		= $(patsubst %.c, %.o, $(ENOENT_SOURCES))
-
-GENFILES		= $(MD5_OBJECTS) md5sum md5sum-static $(ENOENT_OBJECTS) enoent
-ifeq (@USE_START_STOP_DAEMON@, true)
-GENFILES		+= $(SSD_OBJECTS) start-stop-daemon
-endif
-
-.PHONY: all
-ifeq (@USE_START_STOP_DAEMON@, true)
-all:: start-stop-daemon md5sum enoent
-else
-all:: md5sum enoent
-endif
-
-.PHONY: install
-install:: all
-ifdef ALSO_STATIC
-all:: md5sum-static
-endif
-
-.PHONY: clean
-clean::
-	$(RM) $(GENFILES)
-
-.PHONY: distclean
-cvslean:: clean
-	$(RM) Makefile confdefs.h config.log
-
-.PHONY: install
-install:: install-program install-doc
-
-.PHONY: install-program
-install-program:
-ifeq (@USE_START_STOP_DAEMON@, true)
-	$(mkinstalldirs) $(DESTDIR)/$(sbindir)
-	$(INSTALL_PROGRAM) start-stop-daemon $(DESTDIR)/$(sbindir)
-endif
-	$(mkinstalldirs) $(DESTDIR)/$(bindir)
-	$(INSTALL_PROGRAM) md5sum $(DESTDIR)/$(bindir)
-ifdef ALSO_STATIC
-	$(INSTALL_PROGRAM) md5sum-static $(DESTDIR)/$(bindir)
-endif
-	$(mkinstalldirs) $(DESTDIR)/$(dpkglibdir)
-	$(INSTALL_PROGRAM) enoent $(DESTDIR)/$(dpkglibdir)
-
-.PHONY: install-doc
-install-doc:
-ifeq (@USE_START_STOP_DAEMON@, true)
-	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
-	$(INSTALL_DATA) $(srcdir)/$(SSD_MANPAGES) $(DESTDIR)/$(man8dir)
-endif
-	$(mkinstalldirs) $(DESTDIR)/$(man1dir)
-	$(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
-
-start-stop-daemon: $(SSD_OBJECTS) ../lib/libdpkg.a
-	$(CC) $(LDFLAGS) -o $@ $(SSD_OBJECTS) $(LIBS) $(SSD_LIBS)
-
-md5sum-static: LDFLAGS += -static
-md5sum-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC)
-md5sum md5sum-static: $(MD5_OBJECTS) ../lib/libdpkg.a
-	$(CC) $(LDFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS)
+# 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 = $(enoent_SOURCES) $(md5sum_SOURCES) $(start_stop_daemon_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 = md5sum$(EXEEXT)
+@WITH_START_STOP_DAEMON_TRUE@sbin_PROGRAMS =  \
+@WITH_START_STOP_DAEMON_TRUE@	start-stop-daemon$(EXEEXT)
+pkglib_PROGRAMS = enoent$(EXEEXT)
+subdir = utils
+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)" "$(DESTDIR)$(sbindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+pkglibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(pkglib_PROGRAMS) $(sbin_PROGRAMS)
+am_enoent_OBJECTS = enoent.$(OBJEXT)
+enoent_OBJECTS = $(am_enoent_OBJECTS)
+enoent_LDADD = $(LDADD)
+am_md5sum_OBJECTS = md5sum.$(OBJEXT)
+md5sum_OBJECTS = $(am_md5sum_OBJECTS)
+am__DEPENDENCIES_1 =
+md5sum_DEPENDENCIES = $(am__DEPENDENCIES_1) ../getopt/libopt.a \
+	../lib/libdpkg.a $(am__DEPENDENCIES_1)
+am__start_stop_daemon_SOURCES_DIST = start-stop-daemon.c
+@WITH_START_STOP_DAEMON_TRUE@am_start_stop_daemon_OBJECTS =  \
+@WITH_START_STOP_DAEMON_TRUE@	start-stop-daemon.$(OBJEXT)
+start_stop_daemon_OBJECTS = $(am_start_stop_daemon_OBJECTS)
+@WITH_START_STOP_DAEMON_TRUE@start_stop_daemon_DEPENDENCIES =  \
+@WITH_START_STOP_DAEMON_TRUE@	../getopt/libopt.a \
+@WITH_START_STOP_DAEMON_TRUE@	$(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/enoent.Po ./$(DEPDIR)/md5sum.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/start-stop-daemon.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 = $(enoent_SOURCES) $(md5sum_SOURCES) \
+	$(start_stop_daemon_SOURCES)
+DIST_SOURCES = $(enoent_SOURCES) $(md5sum_SOURCES) \
+	$(am__start_stop_daemon_SOURCES_DIST)
+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)/getopt \
+	-I$(top_srcdir)/lib
+
+md5sum_SOURCES = \
+	md5sum.c
+
+md5sum_LDADD = $(LIBINTL) ../getopt/libopt.a ../lib/libdpkg.a $(ZLIB_LIBS)
+@WITH_START_STOP_DAEMON_TRUE@start_stop_daemon_SOURCES = \
+@WITH_START_STOP_DAEMON_TRUE@	start-stop-daemon.c
+
+@WITH_START_STOP_DAEMON_TRUE@start_stop_daemon_LDADD = ../getopt/libopt.a $(SSD_LIBS)
+enoent_SOURCES = \
+	enoent.c
+
+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  utils/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  utils/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)
+install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+	@list='$(pkglib_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) $(pkglibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(pkglibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-pkglibPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkglib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+	done
+
+clean-pkglibPROGRAMS:
+	-test -z "$(pkglib_PROGRAMS)" || rm -f $(pkglib_PROGRAMS)
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+	@list='$(sbin_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) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
+	done
+
+clean-sbinPROGRAMS:
+	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
+enoent$(EXEEXT): $(enoent_OBJECTS) $(enoent_DEPENDENCIES) 
+	@rm -f enoent$(EXEEXT)
+	$(LINK) $(enoent_LDFLAGS) $(enoent_OBJECTS) $(enoent_LDADD) $(LIBS)
+md5sum$(EXEEXT): $(md5sum_OBJECTS) $(md5sum_DEPENDENCIES) 
+	@rm -f md5sum$(EXEEXT)
+	$(LINK) $(md5sum_LDFLAGS) $(md5sum_OBJECTS) $(md5sum_LDADD) $(LIBS)
+start-stop-daemon$(EXEEXT): $(start_stop_daemon_OBJECTS) $(start_stop_daemon_DEPENDENCIES) 
+	@rm -f start-stop-daemon$(EXEEXT)
+	$(LINK) $(start_stop_daemon_LDFLAGS) $(start_stop_daemon_OBJECTS) $(start_stop_daemon_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enoent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5sum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/start-stop-daemon.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)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sbindir)"; 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 clean-pkglibPROGRAMS \
+	clean-sbinPROGRAMS 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-pkglibPROGRAMS \
+	install-sbinPROGRAMS
+
+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-pkglibPROGRAMS uninstall-sbinPROGRAMS
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-pkglibPROGRAMS clean-sbinPROGRAMS 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-pkglibPROGRAMS install-sbinPROGRAMS \
+	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-pkglibPROGRAMS \
+	uninstall-sbinPROGRAMS
+
+# 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:
diff --git a/utils/md5sum.1 b/utils/md5sum.1
deleted file mode 100644
index 2919f6b01..000000000
--- a/utils/md5sum.1
+++ /dev/null
@@ -1,75 +0,0 @@
-.\" Hey, Emacs!  This is an -*- nroff -*- source file.
-.TH MD5SUM 1 "29th November 1995" "Lankester et al." "Debian GNU/Linux"
-.SH NAME
-md5sum \- generates or checks MD5 message digests
-
-.SH SYNOPSIS
-.B md5sum
-[\-bv] [\-c [file]] | [file...]
-
-.SH DESCRIPTION
-.B md5sum
-generates or checks MD5 checksums. The algorithm to generate the
-checksum is reasonably fast and strong enough for most cases. Exact
-specification of the algorithm is in
-.I RFC 1321.
-
-Normally
-.B md5sum
-generates checksums of all files given to it as a parameter and prints
-the checksums followed by the filenames. If, however,
-.B \-c
-is specified, only one filename parameter is allowed. This file should
-contain checksums and filenames to which these checksums refer to, and
-the files listed in that file are checked against the checksums listed
-there. See option
-.B \-c
-for more information.
-
-.SS OPTIONS
-.TP
-.B \-b
-Use binary mode. In unix environment, only difference between this and
-the normal mode is an asterisk preceding the filename in the output.
-.TP
-.B \-c
-Check md5sum of all files listed in
-.I file
-against the checksum listed in the same file. The actual format of that
-file is the same as output of
-.B md5sum.
-That is, each line in the file describes a file. A line looks like:
-
-.B <MD5 checksum>  <filename>
-
-So, for example, if a file was created and its message digest calculated
-like so:
-
-.B echo foo > md5\-test\-file; md5sum md5\-test\-file
-
-.B md5sum
-would report:
-
-.B d3b07384d113edec49eaa6238ad5ff00\  md5\-test\-file
-
-.TP
-.B \-v
-Be more verbose. Print filenames when checking (with \-c).
-
-.SH BUGS
-The related MD4 message digest algorithm was broken in October 1995.
-MD5 isn't looking as secure as it used to.
-
-This manpage is not quite accurate and has formatting inconsistent
-with other manpages.
-
-.B md5sum
-does not accept standard options like
-.BR \-\-help .
-
-.SH AUTHOR
-
-.B md5sum
-was originally written by Branko Lankester, and modified afterwards by
-Colin Plumb and Ian Jackson (ijackson@gnu.ai.mit.edu). Manual page was
-added by Juho Vuori (javuori@cc.helsinki.fi)
diff --git a/utils/md5sum.c b/utils/md5sum.c
index 3105ce4ee..29cdc4f1f 100644
--- a/utils/md5sum.c
+++ b/utils/md5sum.c
@@ -22,26 +22,6 @@
 #include <getopt.h>
 #include <unistd.h>
 
-/* 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)
-#else
-# undef bindtextdomain
-# define bindtextdomain(Domain, Directory) /* empty */
-# undef textdomain
-# define textdomain(Domain) /* empty */
-# define _(Text) Text
-#endif
-
 #include <dpkg.h>
 
 #ifdef UNIX
@@ -127,7 +107,7 @@ main(int argc, char **argv)
 		push_error_handler(&ejbuf, print_md5sum_error, "stdin");
 
 		mdfile(fileno(stdin), &digest);
-		printf("%s %c-\n", digest, bin_mode ? '*' : ' ');
+		printf("%s\n", digest);
 		set_error_display(0, 0);
 		error_unwind(ehflag_normaltidy);
 		exit(0);
diff --git a/utils/start-stop-daemon.8 b/utils/start-stop-daemon.8
deleted file mode 100644
index f55c9318c..000000000
--- a/utils/start-stop-daemon.8
+++ /dev/null
@@ -1,258 +0,0 @@
-.TH START\-STOP\-DAEMON 8 "15th March 1997" "Debian Project" "dpkg utilities"
-.SH NAME
-start\-stop\-daemon \- start and stop system daemon programs
-.SH SYNOPSIS
-.B start\-stop\-daemon
-.BR \-S | \-\-start
-.IR options
-.RB [ \-\- ]
-.IR arguments
-.HP
-.B start\-stop\-daemon
-.BR \-K | \-\-stop
-.IR options
-.HP
-.B start\-stop\-daemon
-.BR \-H | \-\-help
-.HP
-.B start\-stop\-daemon
-.BR \-V | \-\-version
-.SH DESCRIPTION
-.B start\-stop\-daemon
-is used to control the creation and termination of system-level processes.
-Using the
-.BR \-\-exec ", " \-\-pidfile ", " \-\-user ", and " \-\-name " options,"
-.B start\-stop\-daemon
-can be configured to find existing instances of a running process.
-
-With
-.BR \-\-start ,
-.B start\-stop\-daemon
-checks for the existence of a specified process.
-If such a process exists,
-.B start\-stop\-daemon
-does nothing, and exits with error status 1 (0 if
-.BR \-\-oknodo
-is specified).  
-If such a process does not exist, it starts an
-instance, using either the executable specified by
-.BR \-\-exec ,
-(or, if specified, by
-.BR \-\-startas ).
-Any arguments given after
-.BR \-\-
-on the command line are passed unmodified to the program being
-started.
-
-With 
-.BR \-\-stop ,
-.B start\-stop\-daemon
-also checks for the existence of a specified process.
-If such a process exists,
-.B start\-stop\-daemon
-sends it the signal specified by
-.BR \-\-signal ,
-and exits with error status 0.
-If such a process does not exist,
-.B start\-stop\-daemon
-exits with error status 1
-(0 if
-.BR \-\-oknodo
-is specified).  If
-.B \-\-retry
-is specified then 
-.B start\-stop\-daemon
-will check that the process(es) have terminated.
-
-Note that unless
-.BR \-\-pidfile ,
-is specified, then
-.B start\-stop\-daemon
-behaves similarly to
-.B killall(1).
-.B start\-stop\-daemon
-will scan the process table looking for any processes which
-match the process name, uid, and/or gid (if specified).  Any
-matching process will prevent
-.BR \-\-start
-from starting the daemon.  All matching processes will be
-sent the KILL signal if
-.BR \-\-stop
-is specified.  For daemons which have long-lived children
-which need to live through a
-.BR \-\-stop
-you must specify a pidfile.
-
-.SH OPTIONS
-
-.TP
-\fB\-x\fP|\fB\-\-exec\fP \fIexecutable\fP
-Check for processes that are instances of this executable (according to 
-.B /proc/\fIpid\fB/exe\fP
-).
-.TP
-\fB\-p\fP|\fB\-\-pidfile\fP \fIpid-file\fP
-Check whether a process has created the file
-.IR pid-file .
-.TP
-\fB\-u\fP|\fB\-\-user\fP \fIusername\fP|\fIuid\fP
-Check for processes owned by the user specified by
-.I username 
-or
-.IR uid .
-.TP
-\fB\-g\fP|\fB\-\-group\fP \fIgroup\fP|\fIgid\fP
-Change to \fIgroup\fP or \fIgid\fP when starting the process.
-.TP
-\fB\-n\fP|\fB\-\-name\fP \fIprocess-name\fP
-Check for processes with the name
-.I process-name
-(according to
-.BR /proc/\fIpid\fB/stat\fP ).
-.TP
-\fB\-s\fP|\fB\-\-signal\fP \fIsignal\fP
-With
-.BR \-\-stop ,
-specifies the signal to send to processes being stopped (default 15).
-.TP
-\fB\-R\fP|\fB\-\-retry\fP \fItimeout\fP|\fIschedule\fP
-With
-.BR \-\-stop ,
-specifies that
-.B start\-stop\-daemon
-is to check whether the process(es)
-do finish.  It will check repeatedly whether any matching processes
-are running, until none are.  If the processes do not exit it will
-then take further action as determined by the schedule.
-
-If
-.I timeout
-is specified instead of
-.I schedule
-then the schedule
-.IB signal / timeout /KILL/ timeout
-is used, where
-.I signal
-is the signal specified with
-.BR \-\-signal .
-
-.I schedule
-is a list of at least two items separated by slashes
-.RB ( / );
-each item may be
-.BI \- signal-number
-or [\fB\-\fP]\fIsignal-name\fP,
-which means to send that signal,
-or
-.IR timeout ,
-which means to wait that many seconds for processes to
-exit,
-or
-.BR forever ,
-which means to repeat the rest of the schedule forever if
-necessary.
-
-If the end of the schedule is reached and
-.BR forever
-is not specified, then
-.B start\-stop\-daemon
-exits with error status 2.
-If a schedule is specified, then any signal specified
-with
-.B \-\-signal
-is ignored.
-.TP
-\fB\-a\fP|\fB\-\-startas\fP \fIpathname\fP
-With 
-.BR \-\-start ,
-start the process specified by 
-.IR pathname .
-If not specified, defaults to the argument given to
-.BR \-\-exec .
-.TP
-.BR \-t | \-\-test
-Print actions that would be taken and set appropriate return value,
-but take no action.
-.TP
-.BR \-o | \-\-oknodo
-Return exit status 0 instead of 1 if no actions are (would be) taken.
-.TP
-.BR \-q | \-\-quiet
-Do not print informational messages; only display error messages.
-.TP
-\fB\-c\fP|\fB\-\-chuid\fP \fIusername\fR|\fIuid\fP
-Change to this username/uid before starting the process. You can also
-specify a group by appending a
-.BR : ,
-then the group or gid in the same way
-as you would for the `chown' command (\fIuser\fP\fB:\fP\fIgroup\fP).
-When using this option
-you must realize that the primary and supplemental groups are set as well,
-even if the
-.B \-\-group
-option is not specified.  The
-.B \-\-group
-option is only for
-groups that the user isn't normally a member of (like adding per/process
-group membership for generic users like
-.BR nobody ).
-.TP
-\fB\-r\fP|\fB\-\-chroot\fP \fIroot\fP
-Chdir and chroot to
-.I root
-before starting the process. Please note that the pidfile is also written
-after the chroot.
-.TP
-\fB\-d\fP|\fB\-\-chdir\fP \fIpath\fP
-Chdir to
-.I path
-before starting the process. This is done after the chroot if the
-\fB\-r\fP|\fB\-\-chroot\fP option is set.  When not specified,
-start\-stop\-daemon will chdir to the root directory before starting
-the process.
-.TP
-.BR \-b | \-\-background
-Typically used with programs that don't detach on their own. This option
-will force
-.B start\-stop\-daemon
-to fork before starting the process, and force it into the background.
-.B WARNING: start\-stop\-daemon
-cannot check the exit status if the process fails to execute for
-.B any
-reason. This is a last resort, and is only meant for programs that either
-make no sense forking on their own, or where it's not feasible to add the
-code for it to do this itself.
-.TP
-\fB\-N\fP|\fB\-\-nicelevel\fP \fIint\fP 
-This alters the prority of the process before starting it.
-.TP
-.BR \-m | \-\-make\-pidfile
-Used when starting a program that does not create its own pid file. This
-option will make
-.B start\-stop\-daemon
-create the file referenced with
-.B \-\-pidfile
-and place the pid into it just before executing the process. Note, it will
-not be removed when stopping the program.
-.B NOTE:
-This feature may not work in all cases. Most notably when the program
-being executed forks from its main process. Because of this it is usually
-only useful when combined with the
-.B \-\-background
-option.
-.TP
-.BR \-v | \-\-verbose
-Print verbose informational messages.
-.TP
-.BR \-H | \-\-help
-Print help information; then exit.
-.TP
-.BR \-V | \-\-version
-Print version information; then exit.
-
-.SH AUTHORS
-Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl> based on
-a previous version by Ian Jackson <ian@chiark.greenend.org.uk>.
-
-Manual page by Klee Dienes <klee@mit.edu>, partially reformatted
-by Ian Jackson.
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 673608898..343905f87 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#if defined(linux)
+#if defined(linux) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
 #  define OSLinux
 #elif defined(__GNU__)
 #  define OSHURD
@@ -47,18 +47,21 @@
 #  include <ps.h>
 #endif
 
-#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
+#if  defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
 #include <sys/param.h>
-#include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
-#include <sys/sysctl.h>
 #include <sys/types.h>
- 
+
 #include <err.h>
-#include <kvm.h>
 #include <limits.h>
 #endif
+ 
+#ifdef HAVE_KVM_H
+#include <kvm.h>
+#include <sys/sysctl.h>
+#include <sys/user.h>
+#endif
 
 #if defined(OShpux)
 #include <sys/param.h>
@@ -86,10 +89,32 @@
 #include <assert.h>
 #include <ctype.h>
 
+#ifdef HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
+
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
 #ifdef HAVE_ERROR_H
 #  include <error.h>
 #endif
 
+#if HAVE_C_ATTRIBUTE
+# define CONSTANT __attribute__((constant))
+# define PRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc)))
+# define NONRETURNING __attribute__((noreturn))
+# define UNUSED __attribute__((unused))
+# define NONRETURNPRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc),noreturn))
+#else
+# define CONSTANT
+# define PRINTFFORMAT(si, tc)
+# define NONRETURNING
+# define UNUSED
+# define NONRETURNPRINTFFORMAT(si, tc)
+#endif
+
 static int testmode = 0;
 static int quietmode = 0;
 static int exitnodo = 1;
@@ -204,7 +229,7 @@ fatal(const char *format, ...)
 	va_start(arglist, format);
 	vfprintf(stderr, format, arglist);
 	va_end(arglist);
-	putc('\n', stderr);
+	fprintf(stderr, " (%s)\n", strerror (errno));
 	exit(2);
 }
 
@@ -756,7 +781,7 @@ do_pidfile(const char *name)
 /* WTA: this  needs to be an autoconf check for /proc/pid existance.
  */
 
-#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd)
+#if defined(OSLinux) || defined (OSsunos)
 static void
 do_procinit(void)
 {
@@ -802,7 +827,7 @@ do_procinit(void)
 #endif /* OSHURD */
 
 
-#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
+#ifdef HAVE_KVM_H
 static int
 pid_is_cmd(pid_t pid, const char *name)
 {
@@ -1142,7 +1167,6 @@ x_finished:
 }
 
 
-int main(int argc, char **argv) NONRETURNING;
 int
 main(int argc, char **argv)
 {