diff -Nru schroot-1.4.23/aclocal.m4 schroot-1.4.25/aclocal.m4
--- schroot-1.4.23/aclocal.m4	2011-06-25 11:09:34.000000000 +0000
+++ schroot-1.4.25/aclocal.m4	2012-02-03 11:09:02.000000000 +0000
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.2 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # 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.
@@ -272,12 +273,15 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # 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.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -287,7 +291,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.2], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -303,19 +307,21 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.2])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # 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.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -397,14 +403,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # 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.
 
-# serial 10
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -444,6 +450,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -508,7 +515,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -573,10 +580,13 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -798,12 +808,15 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # 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.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -935,12 +948,15 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # 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.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -963,13 +979,14 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # 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.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -977,13 +994,13 @@
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -994,12 +1011,14 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # 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.
 
+# serial 1
+
 # AM_RUN_LOG(COMMAND)
 # -------------------
 # Run COMMAND, save the exit status in ac_status, and log it.
@@ -1103,12 +1122,14 @@
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # 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.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -1131,13 +1152,13 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # 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.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -1146,7 +1167,7 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
diff -Nru schroot-1.4.23/bin/csbuild/Makefile.am schroot-1.4.25/bin/csbuild/Makefile.am
--- schroot-1.4.23/bin/csbuild/Makefile.am	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/bin/csbuild/Makefile.am	2012-01-17 23:41:00.000000000 +0000
@@ -23,7 +23,7 @@
 
 LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) -I$(top_srcdir)/bin
 
-LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\"
+LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\" -DCSBUILD_CONF=\"$(CSBUILD_CONF)\"
 
 if BUILD_CSBUILD
 csbuild = csbuild
diff -Nru schroot-1.4.23/bin/csbuild/Makefile.in schroot-1.4.25/bin/csbuild/Makefile.in
--- schroot-1.4.23/bin/csbuild/Makefile.in	2011-06-25 11:09:36.000000000 +0000
+++ schroot-1.4.25/bin/csbuild/Makefile.in	2012-02-03 11:09:04.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -174,14 +174,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -256,21 +271,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -334,12 +338,24 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
 AM_LDFLAGS = $(LOCAL_LDFLAGS) $(PTHREAD_LIBS)
 LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) -I$(top_srcdir)/bin
-LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\"
+LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\" -DCSBUILD_CONF=\"$(CSBUILD_CONF)\"
 @BUILD_CSBUILD_TRUE@csbuild = csbuild
 csbuild_SOURCES = \
 	csbuild-debian-changes.h	\
@@ -446,26 +462,23 @@
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -572,10 +585,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/bin/dchroot/Makefile.am schroot-1.4.25/bin/dchroot/Makefile.am
--- schroot-1.4.23/bin/dchroot/Makefile.am	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/bin/dchroot/Makefile.am	2012-01-23 09:53:35.000000000 +0000
@@ -23,7 +23,7 @@
 
 LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) -I$(top_srcdir)/bin
 
-LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\"
+LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\" -DDCHROOT_CONF=\"$(DCHROOT_CONF)\"
 
 if BUILD_LIBDCHROOT
 noinst_LTLIBRARIES = libdchroot.la
diff -Nru schroot-1.4.23/bin/dchroot/Makefile.in schroot-1.4.25/bin/dchroot/Makefile.in
--- schroot-1.4.23/bin/dchroot/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/bin/dchroot/Makefile.in	2012-02-03 11:09:04.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -182,14 +182,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -264,21 +279,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -342,12 +346,24 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
 AM_LDFLAGS = $(LOCAL_LDFLAGS) $(PTHREAD_LIBS)
 LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) -I$(top_srcdir)/bin
-LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\"
+LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\" -DDCHROOT_CONF=\"$(DCHROOT_CONF)\"
 @BUILD_LIBDCHROOT_TRUE@noinst_LTLIBRARIES = libdchroot.la
 @BUILD_DCHROOT_TRUE@dchroot = dchroot
 libdchroot_la_SOURCES = \
@@ -478,26 +494,23 @@
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -604,10 +617,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/bin/dchroot-dsa/Makefile.am schroot-1.4.25/bin/dchroot-dsa/Makefile.am
--- schroot-1.4.23/bin/dchroot-dsa/Makefile.am	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/bin/dchroot-dsa/Makefile.am	2012-01-23 09:53:35.000000000 +0000
@@ -23,7 +23,7 @@
 
 LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) -I$(top_srcdir)/bin
 
-LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\"
+LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\" -DDCHROOT_CONF=\"$(DCHROOT_CONF)\"
 
 if BUILD_DCHROOT_DSA
 dchroot_dsa = dchroot-dsa
diff -Nru schroot-1.4.23/bin/dchroot-dsa/Makefile.in schroot-1.4.25/bin/dchroot-dsa/Makefile.in
--- schroot-1.4.23/bin/dchroot-dsa/Makefile.in	2011-06-25 11:09:36.000000000 +0000
+++ schroot-1.4.25/bin/dchroot-dsa/Makefile.in	2012-02-03 11:09:04.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -174,14 +174,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -256,21 +271,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -334,12 +338,24 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
 AM_LDFLAGS = $(LOCAL_LDFLAGS) $(PTHREAD_LIBS)
 LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) -I$(top_srcdir)/bin
-LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\"
+LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\" -DDCHROOT_CONF=\"$(DCHROOT_CONF)\"
 @BUILD_DCHROOT_DSA_TRUE@dchroot_dsa = dchroot-dsa
 dchroot_dsa_SOURCES = \
 	dchroot-dsa-chroot-config.h	\
@@ -449,26 +465,23 @@
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -575,10 +588,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/bin/Makefile.in schroot-1.4.25/bin/Makefile.in
--- schroot-1.4.23/bin/Makefile.in	2011-06-25 11:09:36.000000000 +0000
+++ schroot-1.4.25/bin/Makefile.in	2012-02-03 11:09:04.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -163,14 +163,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -245,21 +260,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -323,6 +327,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -586,10 +602,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/bin/schroot/Makefile.am schroot-1.4.25/bin/schroot/Makefile.am
--- schroot-1.4.23/bin/schroot/Makefile.am	2011-06-24 22:22:06.000000000 +0000
+++ schroot-1.4.25/bin/schroot/Makefile.am	2012-01-17 23:41:00.000000000 +0000
@@ -54,10 +54,10 @@
 	chmod 4755 "$(DESTDIR)$(bindir)/schroot"
 
 install-data-hook:
-	$(MKDIR_P) $(DESTDIR)$(SCHROOT_CONF_CHROOT_D)
-	$(MKDIR_P) $(DESTDIR)$(SCHROOT_MOUNT_DIR)
-	$(MKDIR_P) $(DESTDIR)$(SCHROOT_SESSION_DIR)
-	$(MKDIR_P) $(DESTDIR)$(SCHROOT_FILE_UNPACK_DIR)
-	$(MKDIR_P) $(DESTDIR)$(SCHROOT_OVERLAY_DIR)
-	$(MKDIR_P) $(DESTDIR)$(SCHROOT_UNDERLAY_DIR)
+	$(MKDIR_P) $(DESTDIR)$(schroot_sysconf_chrootdir)
+	$(MKDIR_P) $(DESTDIR)$(schroot_mountdir)
+	$(MKDIR_P) $(DESTDIR)$(schroot_sessiondir)
+	$(MKDIR_P) $(DESTDIR)$(schroot_file_unpackdir)
+	$(MKDIR_P) $(DESTDIR)$(schroot_overlaydir)
+	$(MKDIR_P) $(DESTDIR)$(schroot_underlaydir)
 
diff -Nru schroot-1.4.23/bin/schroot/Makefile.in schroot-1.4.25/bin/schroot/Makefile.in
--- schroot-1.4.23/bin/schroot/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/bin/schroot/Makefile.in	2012-02-03 11:09:04.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -183,14 +183,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -265,21 +280,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -343,6 +347,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -477,26 +493,23 @@
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -603,10 +616,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -714,12 +732,12 @@
 	chmod 4755 "$(DESTDIR)$(bindir)/schroot"
 
 install-data-hook:
-	$(MKDIR_P) $(DESTDIR)$(SCHROOT_CONF_CHROOT_D)
-	$(MKDIR_P) $(DESTDIR)$(SCHROOT_MOUNT_DIR)
-	$(MKDIR_P) $(DESTDIR)$(SCHROOT_SESSION_DIR)
-	$(MKDIR_P) $(DESTDIR)$(SCHROOT_FILE_UNPACK_DIR)
-	$(MKDIR_P) $(DESTDIR)$(SCHROOT_OVERLAY_DIR)
-	$(MKDIR_P) $(DESTDIR)$(SCHROOT_UNDERLAY_DIR)
+	$(MKDIR_P) $(DESTDIR)$(schroot_sysconf_chrootdir)
+	$(MKDIR_P) $(DESTDIR)$(schroot_mountdir)
+	$(MKDIR_P) $(DESTDIR)$(schroot_sessiondir)
+	$(MKDIR_P) $(DESTDIR)$(schroot_file_unpackdir)
+	$(MKDIR_P) $(DESTDIR)$(schroot_overlaydir)
+	$(MKDIR_P) $(DESTDIR)$(schroot_underlaydir)
 
 # 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.
diff -Nru schroot-1.4.23/bin/schroot-base/Makefile.in schroot-1.4.25/bin/schroot-base/Makefile.in
--- schroot-1.4.23/bin/schroot-base/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/bin/schroot-base/Makefile.in	2012-02-03 11:09:04.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -170,14 +170,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -252,21 +267,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -330,6 +334,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -406,26 +422,23 @@
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -529,10 +542,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/bin/schroot-listmounts/Makefile.am schroot-1.4.25/bin/schroot-listmounts/Makefile.am
--- schroot-1.4.23/bin/schroot-listmounts/Makefile.am	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/bin/schroot-listmounts/Makefile.am	2012-01-17 23:41:00.000000000 +0000
@@ -21,8 +21,6 @@
 
 include $(top_srcdir)/scripts/global.mk
 
-pkglibexecdir = $(SCHROOT_LIBEXEC_DIR)
-
 LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) -I$(top_srcdir)/bin
 
 LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\"
diff -Nru schroot-1.4.23/bin/schroot-listmounts/Makefile.in schroot-1.4.25/bin/schroot-listmounts/Makefile.in
--- schroot-1.4.23/bin/schroot-listmounts/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/bin/schroot-listmounts/Makefile.in	2012-02-03 11:09:04.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -61,6 +61,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -153,7 +154,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = $(SCHROOT_LIBEXEC_DIR)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -174,14 +174,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -256,21 +271,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -334,6 +338,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -442,26 +458,23 @@
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -568,10 +581,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/bin/schroot-mount/Makefile.am schroot-1.4.25/bin/schroot-mount/Makefile.am
--- schroot-1.4.23/bin/schroot-mount/Makefile.am	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/bin/schroot-mount/Makefile.am	2012-01-17 23:41:00.000000000 +0000
@@ -21,8 +21,6 @@
 
 include $(top_srcdir)/scripts/global.mk
 
-pkglibexecdir = $(SCHROOT_LIBEXEC_DIR)
-
 LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) -I$(top_srcdir)/bin
 
 LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\"
diff -Nru schroot-1.4.23/bin/schroot-mount/Makefile.in schroot-1.4.25/bin/schroot-mount/Makefile.in
--- schroot-1.4.23/bin/schroot-mount/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/bin/schroot-mount/Makefile.in	2012-02-03 11:09:04.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -61,6 +61,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -153,7 +154,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = $(SCHROOT_LIBEXEC_DIR)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -174,14 +174,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -256,21 +271,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -334,6 +338,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -444,26 +460,23 @@
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -570,10 +583,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/bin/schroot-releaselock/Makefile.am schroot-1.4.25/bin/schroot-releaselock/Makefile.am
--- schroot-1.4.23/bin/schroot-releaselock/Makefile.am	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/bin/schroot-releaselock/Makefile.am	2012-01-17 23:41:00.000000000 +0000
@@ -21,8 +21,6 @@
 
 include $(top_srcdir)/scripts/global.mk
 
-pkglibexecdir = $(SCHROOT_LIBEXEC_DIR)
-
 LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) -I$(top_srcdir)/bin
 
 LOCAL_DEFS = -DLOCALEDIR=\"$(localedir)\"
diff -Nru schroot-1.4.23/bin/schroot-releaselock/Makefile.in schroot-1.4.25/bin/schroot-releaselock/Makefile.in
--- schroot-1.4.23/bin/schroot-releaselock/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/bin/schroot-releaselock/Makefile.in	2012-02-03 11:09:04.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -61,6 +61,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -154,7 +155,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibexecdir = $(SCHROOT_LIBEXEC_DIR)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -175,14 +175,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -257,21 +272,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -335,6 +339,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -443,26 +459,23 @@
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -569,10 +582,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/bin/schroot-sbuild/Makefile.in schroot-1.4.25/bin/schroot-sbuild/Makefile.in
--- schroot-1.4.23/bin/schroot-sbuild/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/bin/schroot-sbuild/Makefile.in	2012-02-03 11:09:04.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -174,14 +174,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -256,21 +271,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -334,6 +338,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -443,26 +459,23 @@
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -569,10 +582,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/bootstrap schroot-1.4.25/bootstrap
--- schroot-1.4.23/bootstrap	2011-06-24 22:22:06.000000000 +0000
+++ schroot-1.4.25/bootstrap	2012-01-17 23:41:00.000000000 +0000
@@ -4,7 +4,7 @@
 
 # Generate version information from git release tag
 
-./scripts/git-version > VERSION
+[ -f ./scripts/git-version ] && ./scripts/git-version > VERSION
 
 # To satisfy automake
 touch ChangeLog
diff -Nru schroot-1.4.23/ChangeLog schroot-1.4.25/ChangeLog
--- schroot-1.4.23/ChangeLog	2011-06-25 11:11:25.000000000 +0000
+++ schroot-1.4.25/ChangeLog	2012-02-03 11:25:18.000000000 +0000
@@ -1,3 +1,187 @@
+commit 33d5586b1db439ea6a27f36a8b154c58c7740bcf
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Fri Feb 3 10:57:43 2012 +0000
+
+    debian: Use generic Boost packages
+
+commit c122c9bda2954aeca1ba42dd9dd3887b5ee9779d
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Mon Jan 23 09:56:52 2012 +0000
+
+    NEWS: Document overlayfs addition
+
+commit 8594065a6682c39028b1fe24ff0b2721b323fb43
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Mon Jan 23 09:56:41 2012 +0000
+
+    debian: Close #648450
+
+commit 35481a66ca78edb5c53aef4d294ae4c8080e7b56
+Author: Evan Broder <evan@ebroder.net>
+Date:   Mon Jan 23 09:47:35 2012 +0000
+
+    sbuild::chroot_facet_union: Add support for overlayfs
+    
+    Signed-off-by: Roger Leigh <rleigh@debian.org>
+
+commit 63011fad0455ebe478d7b41b27b595ead9e02240
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Mon Jan 23 09:54:52 2012 +0000
+
+    debian: Bump version to 1.4.25-1
+
+commit 66f67702dbe76f890c74eabee8e95f12b6f1ea6f
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Mon Jan 23 09:54:22 2012 +0000
+
+    NEWS: Bump version to 1.4.25
+
+commit 45a48c05b6cab15bc91b72305a57258945e71e5c
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Tue Jan 17 23:15:30 2012 +0000
+
+    NEWS: Document build backport from 1.5.1
+
+commit eea2bad5313cec0fd3c93807b25d801c4e749c1a
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Tue Jan 17 22:54:19 2012 +0000
+
+    debian: Document backport of build logic
+
+commit e16f92384cad1642090f462d1e1f41fafab51b85
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Tue Jan 17 22:53:47 2012 +0000
+
+    man: Use RELEASE_DATE rather than removed RELEASE_DATE_S
+
+commit 71721880b979ae41701674e356198652d6457ea7
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Sun Nov 27 13:55:43 2011 +0000
+
+    build: Move all path specification to global.mk
+    
+    It's not possible to evaluate directory variables at configure
+    time, even with eval.  Move all preprocessor definitions to
+    DEFS in global.mk.
+    
+    Note that this also required changing the substitution mechanism
+    in the manual pages, which have been changed to source a
+    generated config.man fragment, which is sourced using the .so
+    directive, and the manual page generated using soelim(1).
+    The boilerplate for the authors and copyright sections has also
+    been split out at the same time.
+
+commit 6bde7bc37209ee9b3dfb08ea1d9c6e9c67719835
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Tue Jan 17 21:02:30 2012 +0000
+
+    po: Update
+
+commit 49891cb231978ba0802cba910f4b438b51ffd4b2
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Tue Jan 17 21:01:19 2012 +0000
+
+    debian: use Standards-Version 3.9.2
+
+commit b64e06710a784e2778f73c4cf839aa5f0378fcb6
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Tue Jan 17 20:18:28 2012 +0000
+
+    debian: Require debhelper v9
+
+commit 87ee111e3d2f7bff86bad82f3d00f3d4970fbf67
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Tue Jan 17 20:17:10 2012 +0000
+
+    debian: Close #656239
+
+commit 3b8079b0ff351b7e293896fb261449a4fe2969e5
+Author: Ralf Corsépius <corsepiu@fedoraproject.org>
+Date:   Tue Jan 17 18:29:44 2012 +0000
+
+    sbuild: Fix name lookup issue with GCC 4.7
+
+commit 04472b6aee65338abb39c76a689865f6350def8d
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Sat Nov 26 20:36:43 2011 +0000
+
+    debian: Close #645223
+
+commit 30b189bc52f4c3e353ed561b117df3e32d119d4e
+Author: Patrick Ohly <patrick.ohly@intel.com>
+Date:   Sat Nov 26 20:33:34 2011 +0000
+
+    15killprocs: Warn about race condition when killing processes
+    
+    Invoking /bin/kill on processes fails if the process already
+    quit by itself while the schroot shutdown runs. Because of "set -e"
+    this causes the whole shutdown to fail.
+    
+    I have seen this occasionally in a nightly testing setup involving
+    a D-Bus session: when the D-Bus daemon stops, all other processes
+    depending on it also shut down automatically, with or without being
+    killed.
+
+commit 4d50e256a1268809ade65499b22995423dc40d72
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Wed Jul 27 20:15:21 2011 +0100
+
+    debian: Remove generated install files
+
+commit 60a601c9725abb38b7056cbbfc90511863a68263
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Wed Jul 27 20:14:08 2011 +0100
+
+    build: Distribute 99binfmt
+
+commit 56777ee6c5d873a20499cb295535627383e68210
+Author: Julian Andres Klode <jak@debian.org>
+Date:   Wed Jul 27 20:12:49 2011 +0100
+
+    contrib: Add setup script for qemu
+
+commit e31b5be68e5fc45a8806d05fbd08402ec1cc08bb
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Mon Jul 11 13:29:59 2011 +0100
+
+    debian: Document zip archive feature removal
+
+commit aeb7a329d5bf0721e876c6b17bc22f5b929ba90d
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Mon Jul 11 13:29:29 2011 +0100
+
+    NEWS: Document zip archive feature removal
+
+commit 7d331464226d9cb0efc977b4fc41eed39c12aeed
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Mon Jul 11 13:28:50 2011 +0100
+
+    etc/setup.d/05file: Remove support for zip archives
+
+commit 6e8a8d6dcedcdae53386fc68a4c5f56d371196e0
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Mon Jul 11 13:11:22 2011 +0100
+
+    debian: Use dh 9 and multiarch paths
+
+commit c4d04977ca27b9bd1fcf648fa3fa436161db7855
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Mon Jul 11 12:29:52 2011 +0100
+
+    build: Update bootstrap from master
+
+commit c04b44e0e502ee7a4741ec2b8be05b0efcb98b1e
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Mon Jul 11 12:29:01 2011 +0100
+
+    debian: Bump version to 1.4.24-1
+
+commit 1b2b89a860cafd48fdf1762a4b446eca802e129a
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Mon Jul 11 12:28:40 2011 +0100
+
+    NEWS: Bump version to 1.4.24
+
 commit 4c473d97f162e79e227620656d3b805e23982627
 Author: Roger Leigh <rleigh@debian.org>
 Date:   Sat Jun 25 00:16:30 2011 +0100
diff -Nru schroot-1.4.23/config.h.in schroot-1.4.25/config.h.in
--- schroot-1.4.23/config.h.in	2011-06-25 11:09:36.000000000 +0000
+++ schroot-1.4.25/config.h.in	2012-02-03 11:09:03.000000000 +0000
@@ -8,12 +8,6 @@
    semantics */
 #undef BOOST_PROGRAM_OPTIONS_VALIDATION_ERROR_OLD
 
-/* csbuild config file path */
-#undef CSBUILD_CONF
-
-/* dchroot config file path */
-#undef DCHROOT_CONF
-
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 #undef ENABLE_NLS
@@ -109,21 +103,6 @@
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
-/* Package data directory */
-#undef PACKAGE_DATA_DIR
-
-/* Package libexec directory */
-#undef PACKAGE_LIBEXEC_DIR
-
-/* Package lib directory */
-#undef PACKAGE_LIB_DIR
-
-/* Package locale directory */
-#undef PACKAGE_LOCALE_DIR
-
-/* Package localstate directory */
-#undef PACKAGE_LOCALSTATE_DIR
-
 /* Define to the full name of this package. */
 #undef PACKAGE_NAME
 
@@ -197,48 +176,6 @@
 /* Set if uuid support is present */
 #undef SBUILD_USE_UUID
 
-/* schroot config file path */
-#undef SCHROOT_CONF
-
-/* schroot chroot directory */
-#undef SCHROOT_CONF_CHROOT_D
-
-/* schroot chroot setup directory */
-#undef SCHROOT_CONF_SETUP_D
-
-/* Package data directory */
-#undef SCHROOT_DATADIR
-
-/* Package data directory */
-#undef SCHROOT_DATA_DIR
-
-/* schroot file unpack directory */
-#undef SCHROOT_FILE_UNPACK_DIR
-
-/* Package libexec directory */
-#undef SCHROOT_LIBEXEC_DIR
-
-/* Package module directory */
-#undef SCHROOT_MODULEDIR
-
-/* schroot mount directory */
-#undef SCHROOT_MOUNT_DIR
-
-/* schroot overlay directory */
-#undef SCHROOT_OVERLAY_DIR
-
-/* schroot session directory */
-#undef SCHROOT_SESSION_DIR
-
-/* Package setup_data directory */
-#undef SCHROOT_SETUP_DATA_DIR
-
-/* schroot system configuration directory */
-#undef SCHROOT_SYSCONF_DIR
-
-/* schroot underlay directory */
-#undef SCHROOT_UNDERLAY_DIR
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
diff -Nru schroot-1.4.23/configure schroot-1.4.25/configure
--- schroot-1.4.23/configure	2011-06-25 11:09:35.000000000 +0000
+++ schroot-1.4.25/configure	2012-02-03 11:09:03.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for schroot 1.4.23.
+# Generated by GNU Autoconf 2.68 for schroot 1.4.25.
 #
 # Report bugs to <buildd-tools-devel@lists.alioth.debian.org>.
 #
@@ -588,8 +588,8 @@
 # Identity of this package.
 PACKAGE_NAME='schroot'
 PACKAGE_TARNAME='schroot'
-PACKAGE_VERSION='1.4.23'
-PACKAGE_STRING='schroot 1.4.23'
+PACKAGE_VERSION='1.4.25'
+PACKAGE_STRING='schroot 1.4.25'
 PACKAGE_BUGREPORT='buildd-tools-devel@lists.alioth.debian.org'
 PACKAGE_URL=''
 
@@ -635,20 +635,6 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-CSBUILD_CONF
-DCHROOT_CONF
-SCHROOT_CONF_SETUP_D
-SCHROOT_CONF_CHROOT_D
-SCHROOT_CONF
-SCHROOT_SYSCONF_DIR
-SCHROOT_UNDERLAY_DIR
-SCHROOT_OVERLAY_DIR
-SCHROOT_FILE_UNPACK_DIR
-SCHROOT_SESSION_DIR
-SCHROOT_MOUNT_DIR
-SCHROOT_LIBEXEC_DIR
-SCHROOT_SETUP_DATA_DIR
-SCHROOT_DATA_DIR
 BOOST_FILESYSTEM_LIBS
 BOOST_LIBS
 BUILD_DOXYGEN_FALSE
@@ -697,6 +683,7 @@
 DOXYGEN
 XARGS
 FIND
+SOELIM
 POSUB
 LTLIBINTL
 LIBINTL
@@ -756,6 +743,7 @@
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
 CXXDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -1439,7 +1427,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures schroot 1.4.23 to adapt to many kinds of systems.
+\`configure' configures schroot 1.4.25 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1509,7 +1497,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of schroot 1.4.23:";;
+     short | recursive ) echo "Configuration of schroot 1.4.25:";;
    esac
   cat <<\_ACEOF
 
@@ -1551,7 +1539,7 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-bash-completion-dir
                           bash shell completion directory
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1650,7 +1638,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-schroot configure 1.4.23
+schroot configure 1.4.25
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2225,7 +2213,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by schroot $as_me 1.4.23, which was
+It was created by schroot $as_me 1.4.25, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3063,7 +3051,7 @@
 
 # Define the identity of the package.
  PACKAGE='schroot'
- VERSION='1.4.23'
+ VERSION='1.4.25'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3196,8 +3184,8 @@
 esac
 AM_BACKSLASH='\'
 
-RELEASE_DATE='1308956400'
-RELEASE_DATE_S='25 Jun 2011'
+RELEASE_DATE='1328227200'
+RELEASE_DATE_S='03 Feb 2012'
 
 cat >>confdefs.h <<_ACEOF
 #define RELEASE_DATE_S "$RELEASE_DATE_S"
@@ -4064,6 +4052,7 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -4088,6 +4077,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4147,7 +4137,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -4832,6 +4822,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4891,7 +4882,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -5364,8 +5355,8 @@
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -6139,6 +6130,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -6178,7 +6174,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -6607,7 +6603,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -7248,13 +7244,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -7401,6 +7397,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -7789,7 +7786,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -7800,7 +7797,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -8440,7 +8450,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -8451,6 +8467,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -8483,6 +8500,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -8504,7 +8522,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -8859,7 +8879,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -8937,6 +8972,10 @@
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -9396,7 +9435,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -9487,18 +9528,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -9860,7 +9916,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -10113,8 +10168,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -10494,6 +10548,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -10539,6 +10594,7 @@
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -10567,10 +10623,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -10583,7 +10635,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10622,7 +10674,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -11246,11 +11297,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -11340,7 +11386,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -11349,7 +11395,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -11414,7 +11460,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -11553,7 +11599,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -11561,10 +11607,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -11572,7 +11614,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -11590,7 +11632,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -11610,7 +11652,7 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
@@ -11621,7 +11663,7 @@
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -11682,7 +11724,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -11698,7 +11740,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -11735,9 +11777,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11831,7 +11873,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -11900,7 +11942,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11925,7 +11967,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11949,7 +11991,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -11980,7 +12022,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11990,7 +12032,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12915,7 +12957,6 @@
 hardcode_direct_CXX=no
 hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
@@ -13499,6 +13540,7 @@
   hardcode_shlibpath_var_CXX=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec_CXX=''
   fi
@@ -13543,7 +13585,7 @@
         esac
         ;;
 
-      freebsd[12]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         ld_shlibs_CXX=no
@@ -14219,6 +14261,7 @@
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -15008,7 +15051,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
       exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
@@ -15164,8 +15209,6 @@
 
 
 
-
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -15191,7 +15234,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -15200,7 +15243,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -15265,7 +15308,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -15402,7 +15445,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -15410,10 +15453,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -15421,7 +15460,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -15439,7 +15478,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -15459,7 +15498,7 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
@@ -15470,7 +15509,7 @@
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -15531,7 +15570,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -15547,7 +15586,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -15584,9 +15623,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15680,7 +15719,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -15749,7 +15788,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15774,7 +15813,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -15798,7 +15837,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -15829,7 +15868,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15839,7 +15878,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -15978,6 +16017,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -17700,6 +17741,46 @@
 
 
 
+# Extract the first word of "soelim", so it can be a program name with args.
+set dummy soelim; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SOELIM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SOELIM in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SOELIM="$SOELIM" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_SOELIM="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+SOELIM=$ac_cv_path_SOELIM
+if test -n "$SOELIM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOELIM" >&5
+$as_echo "$SOELIM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 # Extract the first word of "find", so it can be a program name with args.
 set dummy find; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -19330,226 +19411,6 @@
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-
-if test "x${prefix}" = "xNONE"; then
-  cat >>confdefs.h <<_ACEOF
-#define PACKAGE_LOCALE_DIR "${ac_default_prefix}/share/locale"
-_ACEOF
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define PACKAGE_LOCALE_DIR "${prefix}/share/locale"
-_ACEOF
-
-fi
-
-
-if test "x${datadir}" = 'x${prefix}/share' || test "x${datadir}" = 'x${datarootdir}'; then
-  if test "x${prefix}" = "xNONE"; then
-    PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
-  else
-    PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
-  fi
-else
-  PACKAGE_DATA_DIR="${datadir}/${PACKAGE}"
-fi
-
-SCHROOT_DATA_DIR="${PACKAGE_DATA_DIR}"
-
-
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_DATA_DIR "$SCHROOT_DATA_DIR"
-_ACEOF
-
-SCHROOT_SETUP_DATA_DIR="${SCHROOT_DATA_DIR}/setup"
-
-
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_SETUP_DATA_DIR "$SCHROOT_SETUP_DATA_DIR"
-_ACEOF
-
-
-
-if test "x${libdir}" = 'x${exec_prefix}/lib'; then
-  if test "x${exec_prefix}" = "xNONE"; then
-    if test "x${prefix}" = "xNONE"; then
-      PACKAGE_LIB_DIR="${ac_default_prefix}/lib/${PACKAGE}"
-    else
-      PACKAGE_LIB_DIR="${prefix}/lib/${PACKAGE}"
-    fi
-  else
-    PACKAGE_LIB_DIR="${exec_prefix}/lib/${PACKAGE}"
-  fi
-else
-  PACKAGE_LIB_DIR="${libdir}/${PACKAGE}"
-fi
-
-
-if test "x${libexecdir}" = 'x${exec_prefix}/libexec'; then
-  if test "x${exec_prefix}" = "xNONE"; then
-    if test "x${prefix}" = "xNONE"; then
-      PACKAGE_LIBEXEC_DIR="${ac_default_prefix}/libexec/${PACKAGE}"
-    else
-      PACKAGE_LIBEXEC_DIR="${prefix}/libexec/${PACKAGE}"
-    fi
-  else
-    PACKAGE_LIBEXEC_DIR="${exec_prefix}/libexec/${PACKAGE}"
-  fi
-else
-  PACKAGE_LIBEXEC_DIR="${libexecdir}/${PACKAGE}"
-fi
-
-SCHROOT_LIBEXEC_DIR="${PACKAGE_LIBEXEC_DIR}"
-
-
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_LIBEXEC_DIR "$SCHROOT_LIBEXEC_DIR"
-_ACEOF
-
-
-
-if test "x${localstatedir}" = 'x${prefix}/var'; then
-  if test "x${prefix}" = "xNONE"; then
-    if test "x${prefix}" = "xNONE"; then
-      PACKAGE_LOCALSTATE_DIR="${ac_default_prefix}/var"
-    else
-      PACKAGE_LOCALSTATE_DIR="${prefix}/var"
-    fi
-  else
-    PACKAGE_LOCALSTATE_DIR="${prefix}/var"
-  fi
-else
-  PACKAGE_LOCALSTATE_DIR="${localstatedir}"
-fi
-
-SCHROOT_MOUNT_DIR="${PACKAGE_LOCALSTATE_DIR}/lib/${PACKAGE}/mount"
-
-
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_MOUNT_DIR "$SCHROOT_MOUNT_DIR"
-_ACEOF
-
-
-SCHROOT_SESSION_DIR="${PACKAGE_LOCALSTATE_DIR}/lib/${PACKAGE}/session"
-
-
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_SESSION_DIR "$SCHROOT_SESSION_DIR"
-_ACEOF
-
-
-SCHROOT_FILE_UNPACK_DIR="${PACKAGE_LOCALSTATE_DIR}/lib/${PACKAGE}/unpack"
-
-
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_FILE_UNPACK_DIR "$SCHROOT_FILE_UNPACK_DIR"
-_ACEOF
-
-
-SCHROOT_OVERLAY_DIR="${PACKAGE_LOCALSTATE_DIR}/lib/${PACKAGE}/union/overlay"
-
-
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_OVERLAY_DIR "$SCHROOT_OVERLAY_DIR"
-_ACEOF
-
-
-SCHROOT_UNDERLAY_DIR="${PACKAGE_LOCALSTATE_DIR}/lib/${PACKAGE}/union/underlay"
-
-
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_UNDERLAY_DIR "$SCHROOT_UNDERLAY_DIR"
-_ACEOF
-
-
-
-if test "x${sysconfdir}" = 'x${prefix}/etc'; then
-  if test "x${prefix}" = "xNONE"; then
-    PACKAGE_SYSCONF_DIR="${ac_default_prefix}/etc"
-  else
-    PACKAGE_SYSCONF_DIR="${prefix}/etc"
-  fi
-else
-  PACKAGE_SYSCONF_DIR="${sysconfdir}"
-fi
-
-SCHROOT_SYSCONF_DIR="${PACKAGE_SYSCONF_DIR}/schroot"
-
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_SYSCONF_DIR "$SCHROOT_SYSCONF_DIR"
-_ACEOF
-
-
-
-SCHROOT_CONF="${SCHROOT_SYSCONF_DIR}/schroot.conf"
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_CONF "$SCHROOT_CONF"
-_ACEOF
-
-
-SCHROOT_CONF_CHROOT_D="${SCHROOT_SYSCONF_DIR}/chroot.d"
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_CONF_CHROOT_D "$SCHROOT_CONF_CHROOT_D"
-_ACEOF
-
-
-SCHROOT_CONF_SETUP_D="${SCHROOT_SYSCONF_DIR}/setup.d"
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_CONF_SETUP_D "$SCHROOT_CONF_SETUP_D"
-_ACEOF
-
-
-
-SCHROOT_DATADIR="${PACKAGE_DATA_DIR}/${PACKAGE_VERSION}"
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_DATADIR "$SCHROOT_DATADIR"
-_ACEOF
-
-
-
-SCHROOT_MODULEDIR="${PACKAGE_LIB_DIR}/${PACKAGE_VERSION}/modules"
-cat >>confdefs.h <<_ACEOF
-#define SCHROOT_MODULEDIR "$SCHROOT_MODULEDIR"
-_ACEOF
-
-
-if test "x${sysconfdir}" = 'x${prefix}/etc'; then
-  if test "x${prefix}" = "xNONE"; then
-    DCHROOT_SYSCONF_DIR="${ac_default_prefix}/etc"
-  else
-    DCHROOT_SYSCONF_DIR="${prefix}/etc"
-  fi
-else
-  DCHROOT_SYSCONF_DIR="${sysconfdir}"
-fi
-
-DCHROOT_CONF="${DCHROOT_SYSCONF_DIR}/dchroot.conf"
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define DCHROOT_CONF "$DCHROOT_CONF"
-_ACEOF
-
-
-CSBUILD_CONF="${CSBUILD_SYSCONF_DIR}/csbuild.conf"
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define CSBUILD_CONF "$CSBUILD_CONF"
-_ACEOF
-
-
 ac_config_files="$ac_config_files doc/Makefile"
 
 ac_config_files="$ac_config_files doc/sbuild.dox"
@@ -19596,22 +19457,6 @@
 
 ac_config_files="$ac_config_files man/Makefile"
 
-ac_config_files="$ac_config_files man/schroot.1"
-
-ac_config_files="$ac_config_files man/schroot-setup.5"
-
-ac_config_files="$ac_config_files man/schroot.conf.5"
-
-ac_config_files="$ac_config_files man/schroot-script-config.5"
-
-ac_config_files="$ac_config_files man/schroot-faq.7"
-
-ac_config_files="$ac_config_files man/dchroot.1"
-
-ac_config_files="$ac_config_files man/dchroot-dsa.1"
-
-ac_config_files="$ac_config_files man/csbuild.1"
-
 ac_config_files="$ac_config_files scripts/po-notify"
 
 ac_config_files="$ac_config_files test/Makefile"
@@ -20224,7 +20069,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by schroot $as_me 1.4.23, which was
+This file was extended by schroot $as_me 1.4.25, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20290,7 +20135,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-schroot config.status 1.4.23
+schroot config.status 1.4.25
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -20427,6 +20272,7 @@
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -20509,7 +20355,6 @@
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -20581,7 +20426,6 @@
 allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
@@ -20620,6 +20464,7 @@
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -20670,7 +20515,6 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -20704,7 +20548,6 @@
 allow_undefined_flag_CXX \
 no_undefined_flag_CXX \
 hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_flag_spec_ld_CXX \
 hardcode_libdir_separator_CXX \
 exclude_expsyms_CXX \
 include_expsyms_CXX \
@@ -20831,14 +20674,6 @@
     "etc/setup.d/Makefile") CONFIG_FILES="$CONFIG_FILES etc/setup.d/Makefile" ;;
     "etc/bash_completion/Makefile") CONFIG_FILES="$CONFIG_FILES etc/bash_completion/Makefile" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-    "man/schroot.1") CONFIG_FILES="$CONFIG_FILES man/schroot.1" ;;
-    "man/schroot-setup.5") CONFIG_FILES="$CONFIG_FILES man/schroot-setup.5" ;;
-    "man/schroot.conf.5") CONFIG_FILES="$CONFIG_FILES man/schroot.conf.5" ;;
-    "man/schroot-script-config.5") CONFIG_FILES="$CONFIG_FILES man/schroot-script-config.5" ;;
-    "man/schroot-faq.7") CONFIG_FILES="$CONFIG_FILES man/schroot-faq.7" ;;
-    "man/dchroot.1") CONFIG_FILES="$CONFIG_FILES man/dchroot.1" ;;
-    "man/dchroot-dsa.1") CONFIG_FILES="$CONFIG_FILES man/dchroot-dsa.1" ;;
-    "man/csbuild.1") CONFIG_FILES="$CONFIG_FILES man/csbuild.1" ;;
     "scripts/po-notify") CONFIG_FILES="$CONFIG_FILES scripts/po-notify" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
@@ -21553,8 +21388,8 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -21608,6 +21443,9 @@
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -21909,10 +21747,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -22255,10 +22089,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
diff -Nru schroot-1.4.23/configure.ac schroot-1.4.25/configure.ac
--- schroot-1.4.23/configure.ac	2011-06-24 22:22:06.000000000 +0000
+++ schroot-1.4.25/configure.ac	2012-01-23 09:53:35.000000000 +0000
@@ -274,6 +274,7 @@
 AC_PROG_LIBTOOL
 AM_GNU_GETTEXT_VERSION([0.16])
 AM_GNU_GETTEXT([external])
+AC_PATH_PROG([SOELIM], [soelim])
 AC_PATH_PROG([FIND], [find])
 AC_PATH_PROG([XARGS], [xargs])
 HAVE_DOXYGEN="yes"
@@ -697,178 +698,6 @@
                [AC_MSG_RESULT([no])
                 AC_MSG_FAILURE([__gnu_cxx::stdio_filebuf (GNU libstdc++) is not installed, but is required by schroot])])
 
-dnl Set PACKAGE_LOCALE_DIR in config.h
-AH_TEMPLATE(PACKAGE_LOCALE_DIR, [Package locale directory])
-if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, ["${ac_default_prefix}/share/locale"])
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, ["${prefix}/share/locale"])
-fi
-
-dnl Set PACKAGE_DATA_DIR in config.h.
-AH_TEMPLATE(PACKAGE_DATA_DIR, [Package data directory])
-if test "x${datadir}" = 'x${prefix}/share' || test "x${datadir}" = 'x${datarootdir}'; then
-  if test "x${prefix}" = "xNONE"; then
-    PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
-  else
-    PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
-  fi
-else
-  PACKAGE_DATA_DIR="${datadir}/${PACKAGE}"
-fi
-
-SCHROOT_DATA_DIR="${PACKAGE_DATA_DIR}"
-AC_SUBST(SCHROOT_DATA_DIR)
-AH_TEMPLATE(SCHROOT_DATA_DIR, [Package data directory])
-AC_DEFINE_UNQUOTED(SCHROOT_DATA_DIR, ["$SCHROOT_DATA_DIR"])
-SCHROOT_SETUP_DATA_DIR="${SCHROOT_DATA_DIR}/setup"
-AC_SUBST(SCHROOT_SETUP_DATA_DIR)
-AH_TEMPLATE(SCHROOT_SETUP_DATA_DIR, [Package setup_data directory])
-AC_DEFINE_UNQUOTED(SCHROOT_SETUP_DATA_DIR, ["$SCHROOT_SETUP_DATA_DIR"])
-
-dnl Set PACKAGE_LIB_DIR in config.h.
-AH_TEMPLATE(PACKAGE_LIB_DIR, [Package lib directory])
-if test "x${libdir}" = 'x${exec_prefix}/lib'; then
-  if test "x${exec_prefix}" = "xNONE"; then
-    if test "x${prefix}" = "xNONE"; then
-      PACKAGE_LIB_DIR="${ac_default_prefix}/lib/${PACKAGE}"
-    else
-      PACKAGE_LIB_DIR="${prefix}/lib/${PACKAGE}"
-    fi
-  else
-    PACKAGE_LIB_DIR="${exec_prefix}/lib/${PACKAGE}"
-  fi
-else
-  PACKAGE_LIB_DIR="${libdir}/${PACKAGE}"
-fi
-
-dnl Set PACKAGE_LIBEXEC_DIR in config.h.
-AH_TEMPLATE(PACKAGE_LIBEXEC_DIR, [Package libexec directory])
-if test "x${libexecdir}" = 'x${exec_prefix}/libexec'; then
-  if test "x${exec_prefix}" = "xNONE"; then
-    if test "x${prefix}" = "xNONE"; then
-      PACKAGE_LIBEXEC_DIR="${ac_default_prefix}/libexec/${PACKAGE}"
-    else
-      PACKAGE_LIBEXEC_DIR="${prefix}/libexec/${PACKAGE}"
-    fi
-  else
-    PACKAGE_LIBEXEC_DIR="${exec_prefix}/libexec/${PACKAGE}"
-  fi
-else
-  PACKAGE_LIBEXEC_DIR="${libexecdir}/${PACKAGE}"
-fi
-
-SCHROOT_LIBEXEC_DIR="${PACKAGE_LIBEXEC_DIR}"
-AC_SUBST(SCHROOT_LIBEXEC_DIR)
-AH_TEMPLATE(SCHROOT_LIBEXEC_DIR, [Package libexec directory])
-AC_DEFINE_UNQUOTED(SCHROOT_LIBEXEC_DIR, ["$SCHROOT_LIBEXEC_DIR"])
-
-dnl Set PACKAGE_LOCALSTATE_DIR in config.h.
-AH_TEMPLATE(PACKAGE_LOCALSTATE_DIR, [Package localstate directory])
-if test "x${localstatedir}" = 'x${prefix}/var'; then
-  if test "x${prefix}" = "xNONE"; then
-    if test "x${prefix}" = "xNONE"; then
-      PACKAGE_LOCALSTATE_DIR="${ac_default_prefix}/var"
-    else
-      PACKAGE_LOCALSTATE_DIR="${prefix}/var"
-    fi
-  else
-    PACKAGE_LOCALSTATE_DIR="${prefix}/var"
-  fi
-else
-  PACKAGE_LOCALSTATE_DIR="${localstatedir}"
-fi
-
-SCHROOT_MOUNT_DIR="${PACKAGE_LOCALSTATE_DIR}/lib/${PACKAGE}/mount"
-AC_SUBST([SCHROOT_MOUNT_DIR])
-AH_TEMPLATE([SCHROOT_MOUNT_DIR], [schroot mount directory])
-AC_DEFINE_UNQUOTED(SCHROOT_MOUNT_DIR, ["$SCHROOT_MOUNT_DIR"])
-
-SCHROOT_SESSION_DIR="${PACKAGE_LOCALSTATE_DIR}/lib/${PACKAGE}/session"
-AC_SUBST([SCHROOT_SESSION_DIR])
-AH_TEMPLATE([SCHROOT_SESSION_DIR], [schroot session directory])
-AC_DEFINE_UNQUOTED(SCHROOT_SESSION_DIR, ["$SCHROOT_SESSION_DIR"])
-
-SCHROOT_FILE_UNPACK_DIR="${PACKAGE_LOCALSTATE_DIR}/lib/${PACKAGE}/unpack"
-AC_SUBST([SCHROOT_FILE_UNPACK_DIR])
-AH_TEMPLATE([SCHROOT_FILE_UNPACK_DIR], [schroot file unpack directory])
-AC_DEFINE_UNQUOTED(SCHROOT_FILE_UNPACK_DIR, ["$SCHROOT_FILE_UNPACK_DIR"])
-
-SCHROOT_OVERLAY_DIR="${PACKAGE_LOCALSTATE_DIR}/lib/${PACKAGE}/union/overlay"
-AC_SUBST([SCHROOT_OVERLAY_DIR])
-AH_TEMPLATE([SCHROOT_OVERLAY_DIR], [schroot overlay directory])
-AC_DEFINE_UNQUOTED(SCHROOT_OVERLAY_DIR, ["$SCHROOT_OVERLAY_DIR"])
-
-SCHROOT_UNDERLAY_DIR="${PACKAGE_LOCALSTATE_DIR}/lib/${PACKAGE}/union/underlay"
-AC_SUBST([SCHROOT_UNDERLAY_DIR])
-AH_TEMPLATE([SCHROOT_UNDERLAY_DIR], [schroot underlay directory])
-AC_DEFINE_UNQUOTED(SCHROOT_UNDERLAY_DIR, ["$SCHROOT_UNDERLAY_DIR"])
-
-dnl Set SCHROOT_SYSCONF_DIR in config.h.
-AH_TEMPLATE(SCHROOT_SYSCONF_DIR, [Package system configuration directory])
-if test "x${sysconfdir}" = 'x${prefix}/etc'; then
-  if test "x${prefix}" = "xNONE"; then
-    PACKAGE_SYSCONF_DIR="${ac_default_prefix}/etc"
-  else
-    PACKAGE_SYSCONF_DIR="${prefix}/etc"
-  fi
-else
-  PACKAGE_SYSCONF_DIR="${sysconfdir}"
-fi
-
-SCHROOT_SYSCONF_DIR="${PACKAGE_SYSCONF_DIR}/schroot"
-AH_TEMPLATE([SCHROOT_SYSCONF_DIR], [schroot system configuration directory])
-AC_DEFINE_UNQUOTED([SCHROOT_SYSCONF_DIR], ["$SCHROOT_SYSCONF_DIR"])
-AC_SUBST([SCHROOT_SYSCONF_DIR])
-
-SCHROOT_CONF="${SCHROOT_SYSCONF_DIR}/schroot.conf"
-AC_SUBST([SCHROOT_CONF])
-
-AH_TEMPLATE(SCHROOT_CONF, [schroot config file path])
-AC_DEFINE_UNQUOTED(SCHROOT_CONF, ["$SCHROOT_CONF"])
-
-SCHROOT_CONF_CHROOT_D="${SCHROOT_SYSCONF_DIR}/chroot.d"
-AC_SUBST([SCHROOT_CONF_CHROOT_D])
-
-AH_TEMPLATE(SCHROOT_CONF_CHROOT_D, [schroot chroot directory])
-AC_DEFINE_UNQUOTED(SCHROOT_CONF_CHROOT_D, ["$SCHROOT_CONF_CHROOT_D"])
-
-SCHROOT_CONF_SETUP_D="${SCHROOT_SYSCONF_DIR}/setup.d"
-AC_SUBST([SCHROOT_CONF_SETUP_D])
-
-AH_TEMPLATE(SCHROOT_CONF_SETUP_D, [schroot chroot setup directory])
-AC_DEFINE_UNQUOTED(SCHROOT_CONF_SETUP_D, ["$SCHROOT_CONF_SETUP_D"])
-
-AH_TEMPLATE(SCHROOT_DATADIR, [Package data directory])
-SCHROOT_DATADIR="${PACKAGE_DATA_DIR}/${PACKAGE_VERSION}"
-AC_DEFINE_UNQUOTED(SCHROOT_DATADIR, ["$SCHROOT_DATADIR"])
-
-AH_TEMPLATE(SCHROOT_MODULEDIR, [Package module directory])
-SCHROOT_MODULEDIR="${PACKAGE_LIB_DIR}/${PACKAGE_VERSION}/modules"
-AC_DEFINE_UNQUOTED(SCHROOT_MODULEDIR, ["$SCHROOT_MODULEDIR"])
-
-if test "x${sysconfdir}" = 'x${prefix}/etc'; then
-  if test "x${prefix}" = "xNONE"; then
-    DCHROOT_SYSCONF_DIR="${ac_default_prefix}/etc"
-  else
-    DCHROOT_SYSCONF_DIR="${prefix}/etc"
-  fi
-else
-  DCHROOT_SYSCONF_DIR="${sysconfdir}"
-fi
-
-DCHROOT_CONF="${DCHROOT_SYSCONF_DIR}/dchroot.conf"
-AC_SUBST([DCHROOT_CONF])
-
-AH_TEMPLATE(DCHROOT_CONF, [dchroot config file path])
-AC_DEFINE_UNQUOTED(DCHROOT_CONF, ["$DCHROOT_CONF"])
-
-CSBUILD_CONF="${CSBUILD_SYSCONF_DIR}/csbuild.conf"
-AC_SUBST([CSBUILD_CONF])
-
-AH_TEMPLATE(CSBUILD_CONF, [csbuild config file path])
-AC_DEFINE_UNQUOTED(CSBUILD_CONF, ["$CSBUILD_CONF"])
-
 dnl Configure which files to generate.
 AC_CONFIG_FILES([doc/Makefile])
 AC_CONFIG_FILES([doc/sbuild.dox])
@@ -893,14 +722,6 @@
 AC_CONFIG_FILES([etc/setup.d/Makefile])
 AC_CONFIG_FILES([etc/bash_completion/Makefile])
 AC_CONFIG_FILES([man/Makefile])
-AC_CONFIG_FILES([man/schroot.1])
-AC_CONFIG_FILES([man/schroot-setup.5])
-AC_CONFIG_FILES([man/schroot.conf.5])
-AC_CONFIG_FILES([man/schroot-script-config.5])
-AC_CONFIG_FILES([man/schroot-faq.7])
-AC_CONFIG_FILES([man/dchroot.1])
-AC_CONFIG_FILES([man/dchroot-dsa.1])
-AC_CONFIG_FILES([man/csbuild.1])
 AC_CONFIG_FILES([scripts/po-notify])
 AC_CONFIG_FILES([test/Makefile])
 AC_CONFIG_FILES([Makefile])
diff -Nru schroot-1.4.23/contrib/Makefile.in schroot-1.4.25/contrib/Makefile.in
--- schroot-1.4.23/contrib/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/contrib/Makefile.in	2012-02-03 11:09:04.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -163,14 +163,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -245,21 +260,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -323,6 +327,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -576,10 +592,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/contrib/setup.d/99binfmt schroot-1.4.25/contrib/setup.d/99binfmt
--- schroot-1.4.23/contrib/setup.d/99binfmt	1970-01-01 00:00:00.000000000 +0000
+++ schroot-1.4.25/contrib/setup.d/99binfmt	2012-01-17 23:41:00.000000000 +0000
@@ -0,0 +1,46 @@
+#!/bin/sh
+# Copyright © 2011 Julian Andres Klode <jak@debian.org>
+#
+# schroot 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 3 of the License, or
+# (at your option) any later version.
+#
+# schroot 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, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
+
+set -e
+
+. "$SETUP_DATA_DIR/common-data"
+. "$SETUP_DATA_DIR/common-functions"
+
+
+if [ "$STAGE" != "setup-start" ] && \
+   [ "$STAGE" != "setup-stop"  ] && \
+   [ "$STAGE" != "setup-recover" ]; then
+    exit 0
+elif ! which update-binfmts > /dev/null; then
+    info "Missing update-binfmts"
+    exit 0
+fi
+
+shell="${CHROOT_PATH}/bin/sh"
+
+for emulator in $(update-binfmts --find "$shell"); do
+    dst="${CHROOT_PATH}$emulator"
+    if [ ! -e "$emulator" ]; then
+	info "Missing emulator: $emulator"
+    else
+	[ -e "$dst" ] || touch "$dst"
+	mount --bind "$emulator" "$dst"
+	mount -o remount,ro "$dst"
+    fi
+done
diff -Nru schroot-1.4.23/contrib/setup.d/Makefile.am schroot-1.4.25/contrib/setup.d/Makefile.am
--- schroot-1.4.23/contrib/setup.d/Makefile.am	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/contrib/setup.d/Makefile.am	2012-01-17 23:41:00.000000000 +0000
@@ -23,7 +23,8 @@
 
 noinst_SCRIPTS =	\
 	09fsck		\
-	10mount-ssh
+	10mount-ssh	\
+	99binfmt
 
 EXTRA_DIST =			\
 	$(noinst_SCRIPTS)
diff -Nru schroot-1.4.23/contrib/setup.d/Makefile.in schroot-1.4.25/contrib/setup.d/Makefile.in
--- schroot-1.4.23/contrib/setup.d/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/contrib/setup.d/Makefile.in	2012-02-03 11:09:05.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -125,14 +125,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -207,21 +222,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -285,13 +289,26 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
 AM_LDFLAGS = $(LOCAL_LDFLAGS) $(PTHREAD_LIBS)
 noinst_SCRIPTS = \
 	09fsck		\
-	10mount-ssh
+	10mount-ssh	\
+	99binfmt
 
 EXTRA_DIST = \
 	$(noinst_SCRIPTS)
@@ -386,10 +403,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/debian/changelog schroot-1.4.25/debian/changelog
--- schroot-1.4.23/debian/changelog	2011-11-15 20:49:48.000000000 +0000
+++ schroot-1.4.25/debian/changelog	2012-02-03 10:57:34.000000000 +0000
@@ -1,8 +1,31 @@
-schroot (1.4.23-1ubuntu1) precise; urgency=low
+schroot (1.4.25-1) unstable; urgency=low
 
-  * debian/patches/add-overlayfs.patch: add overlayfs support.
+  * New upstream stable release.
+  * Build-Depend on generic Boost pacakges, to build against v1.48.
+  * Support for overlayfs has been added in addition to aufs and
+    unionfs (Closes: #648450).  Thanks to Evan Broder.  Backported
+    from schroot-1.5.2.
+
+ -- Roger Leigh <rleigh@debian.org>  Fri, 03 Feb 2012 10:56:57 +0000
+
+schroot (1.4.24-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * Add multiarch support.  Backported from schroot 1.5.1.
+  * Use debhelper 9 and dh using compat level 9.
+  * Use Standards-Version 3.9.2.
+  * Build-Depend upon groff-base for soelim.
+  * Support for zip file archives has been removed.  zip was not able
+    to archive named pipes and device nodes, and so was not usable
+    for chroot archival.
+  * Don't Suggest unzip now zip is not a supported archive
+    format.
+  * Correct race condition in 15killprocs (Closes: #645223).  Thanks to
+    Patrick Ohly for this patch.
+  * Fix name lookup issue causing FTBFS with GCC 4.7 (Closes: #656239).
+    Thanks to Ralf Corsépius for this patch.
 
- -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Tue, 15 Nov 2011 15:49:02 -0500
+ -- Roger Leigh <rleigh@debian.org>  Tue, 17 Jan 2012 22:40:09 +0000
 
 schroot (1.4.23-1) unstable; urgency=low
 
diff -Nru schroot-1.4.23/debian/compat schroot-1.4.25/debian/compat
--- schroot-1.4.23/debian/compat	2011-06-24 22:22:06.000000000 +0000
+++ schroot-1.4.25/debian/compat	2012-01-17 23:41:00.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru schroot-1.4.23/debian/control schroot-1.4.25/debian/control
--- schroot-1.4.23/debian/control	2011-11-15 20:50:21.000000000 +0000
+++ schroot-1.4.25/debian/control	2012-02-03 10:56:09.000000000 +0000
@@ -1,12 +1,11 @@
 Source: schroot
 Section: admin
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian buildd-tools Developers <buildd-tools-devel@lists.alioth.debian.org>
+Maintainer: Debian buildd-tools Developers <buildd-tools-devel@lists.alioth.debian.org>
 Uploaders: Roger Leigh <rleigh@debian.org>
-Build-Depends: debhelper (>= 7.0.0), autotools-dev, pkg-config, libpam0g-dev, uuid-dev [!kfreebsd-any], liblockdev1-dev, libboost1.46-dev, libboost-program-options1.46-dev, libboost-regex1.46-dev, libboost-filesystem1.46-dev, gettext, libcppunit-dev
+Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, libpam0g-dev, uuid-dev [!kfreebsd-any], liblockdev1-dev, libboost-dev, libboost-iostreams-dev, libboost-program-options-dev, libboost-regex-dev, libboost-filesystem-dev, gettext, libcppunit-dev, groff-base
 Build-Depends-Indep: doxygen, graphviz
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Browser: http://git.debian.org/?p=buildd-tools/schroot.git
 Vcs-Git: git://git.debian.org/git/buildd-tools/schroot
 
@@ -97,7 +96,7 @@
 Replaces: buildd (<< 0.62.3-1), sbuild (<< 0.62.3-1)
 Enhances: sbuild
 Breaks: sbuild (<< 0.62.4-1)
-Suggests: debootstrap, lvm2, btrfs-tools, unzip, aufs-modules | unionfs-modules
+Suggests: debootstrap, lvm2, btrfs-tools, aufs-modules | unionfs-modules
 Description: Execute commands in a chroot environment
  schroot allows users to execute commands or interactive shells in
  different chroots.  Any number of named chroots may be created, and
@@ -110,7 +109,7 @@
  Several different types of chroot are supported, including normal
  directories in the filesystem, and also block devices.  Sessions,
  persistent chroots created on the fly from files (tar with optional
- compression and zip) and LVM snapshots are also supported.
+ compression) and Btrfs and LVM snapshots are also supported.
  .
  schroot supports kernel personalities, allowing the programs run
  inside the chroot to have a different personality.  For example,
@@ -119,7 +118,7 @@
  .
  schroot also integrates with sbuild, to allow building packages with
  all supported chroot types, including session-managed chroot types
- such as LVM snapshots.
+ such as Btrfs and LVM snapshots.
  .
  schroot shares most of its options with dchroot, but offers vastly
  more functionality.
diff -Nru schroot-1.4.23/debian/dchroot-dsa.install schroot-1.4.25/debian/dchroot-dsa.install
--- schroot-1.4.23/debian/dchroot-dsa.install	2011-05-27 16:01:40.000000000 +0000
+++ schroot-1.4.25/debian/dchroot-dsa.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-debian/install/usr/bin/dchroot-dsa               usr/bin
-debian/install/usr/share/man/man1/dchroot-dsa.1  usr/share/man/man1
diff -Nru schroot-1.4.23/debian/dchroot.install schroot-1.4.25/debian/dchroot.install
--- schroot-1.4.23/debian/dchroot.install	2011-05-27 16:01:40.000000000 +0000
+++ schroot-1.4.25/debian/dchroot.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-debian/install/usr/bin/dchroot               usr/bin
-debian/install/usr/share/man/man1/dchroot.1  usr/share/man/man1
diff -Nru schroot-1.4.23/debian/libsbuild1.install schroot-1.4.25/debian/libsbuild1.install
--- schroot-1.4.23/debian/libsbuild1.install	2011-05-27 16:01:40.000000000 +0000
+++ schroot-1.4.25/debian/libsbuild1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/install/usr/lib/libsbuild.so.*        usr/lib
diff -Nru schroot-1.4.23/debian/libsbuild-dev.install schroot-1.4.25/debian/libsbuild-dev.install
--- schroot-1.4.23/debian/libsbuild-dev.install	2011-05-27 16:01:40.000000000 +0000
+++ schroot-1.4.25/debian/libsbuild-dev.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-debian/install/usr/include          usr
-debian/install/usr/lib/libsbuild.a  usr/lib
-debian/install/usr/lib/pkgconfig    usr/lib
diff -Nru schroot-1.4.23/debian/patches/add-overlayfs.patch schroot-1.4.25/debian/patches/add-overlayfs.patch
--- schroot-1.4.23/debian/patches/add-overlayfs.patch	2011-11-12 15:03:36.000000000 +0000
+++ schroot-1.4.25/debian/patches/add-overlayfs.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-Description: Add overlayfs support
-Author: Evan Broder <evan@ebroder.net>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648450
-
-diff --git a/etc/setup.d/10mount b/etc/setup.d/10mount
-index 29636d1..db793fb 100755
---- a/etc/setup.d/10mount
-+++ b/etc/setup.d/10mount
-@@ -92,6 +92,9 @@ do_mount_fs_union()
- 	    aufs)
- 		CHROOT_UNION_MOUNT_OPTIONS="br:${CHROOT_UNION_OVERLAY_DIRECTORY}:${CHROOT_UNION_UNDERLAY_DIRECTORY}=ro"
- 		;;
-+            overlayfs)
-+                CHROOT_UNION_MOUNT_OPTIONS="lowerdir=${CHROOT_UNION_UNDERLAY_DIRECTORY},upperdir=${CHROOT_UNION_OVERLAY_DIRECTORY}"
-+                ;;
- 	esac
-     fi
- 
-diff --git a/man/schroot.conf.5.in b/man/schroot.conf.5.in
-index 28c625a..f3e1325 100644
---- a/man/schroot.conf.5.in
-+++ b/man/schroot.conf.5.in
-@@ -372,15 +372,15 @@ optional.
- .TP
- \f[CBI]union\-type=\fP\f[CI]type\fP
- Set the union filesystem type.  Currently supported filesystems are
--\[oq]aufs\[cq] and \[oq]unionfs\[cq].  The default is \[oq]none\[cq], which
--disables this feature.
-+\[oq]overlayfs\[cq], \[oq]aufs\[cq], and \[oq]unionfs\[cq].  The default is
-+\[oq]none\[cq], which disables this feature.
- .TP
- \f[CBI]union\-mount\-options=\fP\f[CI]options\fP
- Union filesystem mount options (branch configuration), used for mounting the
- union filesystem specified with \fIunion\-type\fP.  This replaces the complete
- \[lq]\-o\[rq] string for mount and allows for the creation of complex
--filesystem unions.  Note that \[oq]aufs\[cq] and \[oq]unionfs\[cq] have
--different supported mount options.
-+filesystem unions.  Note that \[oq]overlayfs\[cq], \[oq]aufs\[cq], and
-+\[oq]unionfs\[cq] each have different supported mount options.
- .B Note:
- One can use the variables \[lq]${CHROOT_UNION_OVERLAY_DIRECTORY}\[rq] and
- \[lq]${CHROOT_UNION_UNDERLAY_DIRECTORY}\[rq] to refer to the writable overlay
-diff --git a/sbuild/sbuild-chroot-facet-union.cc b/sbuild/sbuild-chroot-facet-union.cc
-index 8120024..c3f446d 100644
---- a/sbuild/sbuild-chroot-facet-union.cc
-+++ b/sbuild/sbuild-chroot-facet-union.cc
-@@ -149,7 +149,8 @@ chroot_facet_union::get_union_type () const
- void
- chroot_facet_union::set_union_type (std::string const& type)
- {
--  if (type == "aufs" ||
-+  if (type == "overlayfs" ||
-+      type == "aufs" ||
-       type == "unionfs" ||
-       type == "none")
-     this->union_type = type;
diff -Nru schroot-1.4.23/debian/patches/series schroot-1.4.25/debian/patches/series
--- schroot-1.4.23/debian/patches/series	2011-11-12 15:01:25.000000000 +0000
+++ schroot-1.4.25/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-add-overlayfs.patch
diff -Nru schroot-1.4.23/debian/rules schroot-1.4.25/debian/rules
--- schroot-1.4.23/debian/rules	2011-06-24 22:22:06.000000000 +0000
+++ schroot-1.4.25/debian/rules	2012-01-17 23:41:00.000000000 +0000
@@ -1,15 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-
-# 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)
-DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+LIBDIR = usr/lib/$(DEB_HOST_MULTIARCH)
+LIBEXECDIR = $(LIBDIR)/schroot
 
 ifneq ($(DEB_HOST_ARCH_OS),linux)
 	LVMSNAP_OPTIONS = --disable-lvm-snapshot
@@ -33,20 +29,21 @@
 	CFLAGS += -O2
 endif
 
-debian/build/config.status: configure
-	dh_testdir
+DH_OPTIONS = --with autotools_dev --builddirectory=debian/build --parallel
+
+DH_INSTALL_FILES = $(basename $(wildcard debian/*.install.in))
 
-	[ -d debian/build ] || mkdir debian/build
+# Use debhelper's dh
+%:
+	dh $@ $(DH_OPTIONS)
 
-	cd debian/build; \
-	CFLAGS="$(CFLAGS)" ../../configure \
-	  --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	  --prefix=/usr \
-	  --sysconfdir=/etc \
-	  --libexecdir=/usr/lib \
-	  --localstatedir=/var \
-	  --mandir=\$${prefix}/share/man \
-	  --infodir=\$${prefix}/share/info \
+%.install: %.install.in
+	sed -e 's;@LIBDIR@;$(LIBDIR);g' -e 's;@LIBEXECDIR@;$(LIBEXECDIR);g' <$< >$@
+
+override_dh_auto_configure: debian/build/config.status
+
+debian/build/config.status: configure
+	dh_auto_configure -- \
 	  --enable-dchroot --enable-dchroot-dsa \
 	  --enable-static --disable-shared \
 	  --with-bash-completion-dir=/etc/bash_completion.d \
@@ -55,115 +52,68 @@
 	  BTRFSCTL=/sbin/btrfsctl \
 	  LVCREATE=/sbin/lvcreate \
 	  LVREMOVE=/sbin/lvremove
-
-build: build-indep build-arch
-
-build-indep: debian/build-indep-stamp
-debian/build-indep-stamp: debian/build/config.status
 	dh_testdir
-	$(MAKE) -C debian/build doc
-	touch "$@"
 
-build-arch: debian/build-arch-stamp
-debian/build-arch-stamp: debian/build/config.status
-	dh_testdir
-	$(MAKE) -C debian/build all
-	touch "$@"
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf debian/build
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f $(DH_INSTALL_FILES)
 	rm -rf debian/install
-	rm -f debian/build-indep-stamp
-	rm -f debian/build-arch-stamp
 
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub scripts/config.sub
+override_dh_auto_build:
+ifneq (,$(shell dh_listpackages -a 2>/dev/null))
+	$(MAKE) -C debian/build all
 endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess scripts/config.guess
+ifneq (,$(shell dh_listpackages -i 2>/dev/null))
+	$(MAKE) -C debian/build doc
 endif
 
-	dh_clean
-
-check: build-arch
-	dh_testdir
-	dh_testroot
-	$(MAKE) -C debian/build check
-
-install-indep: build-indep
-	dh_testdir
-	dh_testroot
-	dh_prep -i
-
-	dh_installdirs -i
-
-	$(MAKE) -C debian/build/po install DESTDIR=$(CURDIR)/debian/install
-	dh_install -i
-
-install-arch: build-arch check
-	dh_testdir
-	dh_testroot
-	dh_prep -a
-	rm -rf debian/install
-
-	dh_installdirs -a
-
-	$(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/install
-	dh_install -a
+override_dh_auto_test:
 
+install-arch: build-arch $(DH_INSTALL_FILES)
+	dh $@ $(DH_OPTIONS)
+# Setuid executables
+	chmod 4755 $(CURDIR)/debian/dchroot/usr/bin/dchroot
+	chmod 4755 $(CURDIR)/debian/dchroot-dsa/usr/bin/dchroot-dsa
+	chmod 4755 $(CURDIR)/debian/schroot/usr/bin/schroot
+# Lintian overrides
 	mkdir -p $(CURDIR)/debian/dchroot/usr/share/lintian/overrides
-	mkdir -p $(CURDIR)/debian/dchroot-dsa/usr/share/lintian/overrides
-	mkdir -p $(CURDIR)/debian/schroot/usr/share/lintian/overrides
 	cp $(CURDIR)/debian/dchroot.lintian-overrides $(CURDIR)/debian/dchroot/usr/share/lintian/overrides/dchroot
+	mkdir -p $(CURDIR)/debian/dchroot-dsa/usr/share/lintian/overrides
 	cp $(CURDIR)/debian/dchroot-dsa.lintian-overrides $(CURDIR)/debian/dchroot-dsa/usr/share/lintian/overrides/dchroot-dsa
+	mkdir -p $(CURDIR)/debian/schroot/usr/share/lintian/overrides
 	cp $(CURDIR)/debian/schroot.lintian-overrides $(CURDIR)/debian/schroot/usr/share/lintian/overrides/schroot
-
-# Build architecture-independent files here.
-binary-indep: install-indep
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i ChangeLog
-	dh_installdocs -i
-	find $(CURDIR)/debian/libsbuild-doc/usr/share/doc/libsbuild-doc -name '*.map' -print0 | xargs -0 rm -f
-	find $(CURDIR)/debian/libsbuild-doc/usr/share/doc/libsbuild-doc -name '*.md5' -print0 | xargs -0 rm -f
-	dh_installexamples -i
-	dh_installman -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: install-arch
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
+# Documentation symlinks
 	rm -rf $(CURDIR)/debian/dchroot/usr/share/doc/dchroot
 	ln -sf schroot $(CURDIR)/debian/dchroot/usr/share/doc/dchroot
 	rm -rf $(CURDIR)/debian/dchroot-dsa/usr/share/doc/dchroot-dsa
 	ln -sf schroot $(CURDIR)/debian/dchroot-dsa/usr/share/doc/dchroot-dsa
-	dh_installexamples -a
-	dh_installman -a
-	dh_installinit -a --no-start --update-rcd-params='start 75 S .'
-	dh_link -a
-	dh_strip -a --dbg-package=schroot-dbg
-	dh_compress -a
-	dh_fixperms -a
-	chmod 4755 $(CURDIR)/debian/dchroot/usr/bin/dchroot
-	chmod 4755 $(CURDIR)/debian/dchroot-dsa/usr/bin/dchroot-dsa
-	chmod 4755 $(CURDIR)/debian/schroot/usr/bin/schroot
-	dh_makeshlibs -a
-	dh_installdeb -a
-	dh_shlibdeps -a -L libsbuild1 -l$(CURDIR)/debian/libsbuild1/usr/lib
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+# Requires fakeroot, so tests need running here.
+	dh_auto_test
+
+install-indep: build-indep $(DH_INSTALL_FILES)
+	dh $@ $(DH_OPTIONS)
+# Remove cruft
+	find $(CURDIR)/debian/libsbuild-doc/usr/share/doc/libsbuild-doc -name '*.map' -print0 | xargs -0 rm -f
+	find $(CURDIR)/debian/libsbuild-doc/usr/share/doc/libsbuild-doc -name '*.md5' -print0 | xargs -0 rm -f
+
+install: build $(DH_INSTALL_FILES)
+	dh $@ $(DH_OPTIONS)
+
+override_dh_auto_install:
+ifneq (,$(shell dh_listpackages -a 2>/dev/null))
+	$(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/install
+endif
+ifneq (,$(shell dh_listpackages -i 2>/dev/null))
+	$(MAKE) -C debian/build/po install DESTDIR=$(CURDIR)/debian/install
+endif
+
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
+
+override_dh_installinit:
+	dh_installinit --no-start --update-rcd-params='start 75 S .'
+
+override_dh_strip:
+	dh_strip --dbg-package=schroot-dbg
 
-binary: binary-indep binary-arch
-.PHONY: build-indep build-arch check clean binary-indep binary-arch binary install-indep install-arch
+.PHONY: override_dh_auto_configure override_dh_auto_clean override_dh_auto_build override_dh_auto_test override_dh_auto_install override_dh_installchangelogs override_dh_installinit override_dh_strip install-arch install-indep
diff -Nru schroot-1.4.23/debian/schroot-common.install schroot-1.4.25/debian/schroot-common.install
--- schroot-1.4.23/debian/schroot-common.install	2011-05-27 16:01:39.000000000 +0000
+++ schroot-1.4.25/debian/schroot-common.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/install/usr/share/locale              usr/share
diff -Nru schroot-1.4.23/debian/schroot.install schroot-1.4.25/debian/schroot.install
--- schroot-1.4.23/debian/schroot.install	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/debian/schroot.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-debian/install/etc/bash_completion.d/schroot     etc/bash_completion.d
-debian/install/etc/pam.d                         etc
-debian/install/etc/schroot                       etc
-debian/install/usr/bin/schroot                   usr/bin
-debian/install/usr/lib/schroot                   usr/lib
-debian/install/usr/share/schroot                 usr/share
-contrib/setup.d/09fsck                           usr/share/doc/schroot/contrib/setup.d
-contrib/setup.d/10mount-ssh                      usr/share/doc/schroot/contrib/setup.d
-debian/install/usr/share/man/man1/schroot.1      usr/share/man/man1
-debian/install/usr/share/man/man5                usr/share/man
-debian/install/usr/share/man/man7/schroot-faq.7  usr/share/man/man7
-debian/install/var/lib                           var
diff -Nru schroot-1.4.23/doc/Makefile.in schroot-1.4.25/doc/Makefile.in
--- schroot-1.4.23/doc/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/doc/Makefile.in	2012-02-03 11:09:05.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -124,14 +124,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -206,21 +221,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -284,6 +288,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -397,10 +413,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/etc/bash_completion/Makefile.in schroot-1.4.25/etc/bash_completion/Makefile.in
--- schroot-1.4.23/etc/bash_completion/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/etc/bash_completion/Makefile.in	2012-02-03 11:09:05.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -124,6 +124,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(bashcompletiondir)"
 DATA = $(bashcompletion_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -147,14 +153,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -229,21 +250,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -307,6 +317,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -373,9 +395,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(bashcompletion_DATA)'; test -n "$(bashcompletiondir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bashcompletiondir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bashcompletiondir)" && rm -f $$files
+	dir='$(DESTDIR)$(bashcompletiondir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -430,10 +450,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/etc/Makefile.am schroot-1.4.25/etc/Makefile.am
--- schroot-1.4.23/etc/Makefile.am	2011-06-24 22:22:06.000000000 +0000
+++ schroot-1.4.25/etc/Makefile.am	2012-01-23 09:15:46.000000000 +0000
@@ -23,9 +23,7 @@
 
 SUBDIRS = pam setup.d bash_completion
 
-pkgsysconfdir = $(SCHROOT_SYSCONF_DIR)
-
-pkgsysconf_DATA = 		\
+schroot_sysconf_DATA = 		\
 	schroot.conf
 
 PROFILES =		\
@@ -47,9 +45,9 @@
 
 install-data-hook:
 	for profile in $(PROFILES); do 						\
-	  $(MKDIR_P) "$(DESTDIR)$(SCHROOT_SYSCONF_DIR)/$$profile";			\
+	  $(MKDIR_P) "$(DESTDIR)$(schroot_sysconfdir)/$$profile";			\
 	  for file in "profiles/$$profile"/*; do						\
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(SCHROOT_SYSCONF_DIR)/$$profile";	\
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(schroot_sysconfdir)/$$profile";	\
 	  done;									\
 	done
 
@@ -58,7 +56,7 @@
 	$(RM) -f profiles-stamp
 
 EXTRA_DIST =			\
-	$(pkgsysconf_DATA)	\
+	$(schroot_sysconf_DATA)	\
 	genprofile		\
 	profile-templates
 
diff -Nru schroot-1.4.23/etc/Makefile.in schroot-1.4.25/etc/Makefile.in
--- schroot-1.4.23/etc/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/etc/Makefile.in	2012-02-03 11:09:05.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -131,8 +131,14 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgsysconfdir)"
-DATA = $(pkgsysconf_DATA)
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(schroot_sysconfdir)"
+DATA = $(schroot_sysconf_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -187,14 +193,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -269,21 +290,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -347,13 +357,24 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
 AM_LDFLAGS = $(LOCAL_LDFLAGS) $(PTHREAD_LIBS)
 SUBDIRS = pam setup.d bash_completion
-pkgsysconfdir = $(SCHROOT_SYSCONF_DIR)
-pkgsysconf_DATA = \
+schroot_sysconf_DATA = \
 	schroot.conf
 
 PROFILES = \
@@ -364,7 +385,7 @@
 	sbuild
 
 EXTRA_DIST = \
-	$(pkgsysconf_DATA)	\
+	$(schroot_sysconf_DATA)	\
 	genprofile		\
 	profile-templates
 
@@ -407,26 +428,24 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-pkgsysconfDATA: $(pkgsysconf_DATA)
+install-schroot_sysconfDATA: $(schroot_sysconf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)"
-	@list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \
+	test -z "$(schroot_sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(schroot_sysconfdir)"
+	@list='$(schroot_sysconf_DATA)'; test -n "$(schroot_sysconfdir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgsysconfdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgsysconfdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schroot_sysconfdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(schroot_sysconfdir)" || exit $$?; \
 	done
 
-uninstall-pkgsysconfDATA:
+uninstall-schroot_sysconfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \
+	@list='$(schroot_sysconf_DATA)'; test -n "$(schroot_sysconfdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgsysconfdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgsysconfdir)" && rm -f $$files
+	dir='$(DESTDIR)$(schroot_sysconfdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -626,7 +645,7 @@
 all-am: Makefile $(DATA) all-local
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(pkgsysconfdir)"; do \
+	for dir in "$(DESTDIR)$(schroot_sysconfdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -639,10 +658,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -674,7 +698,7 @@
 
 info-am:
 
-install-data-am: install-pkgsysconfDATA
+install-data-am: install-schroot_sysconfDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-recursive
@@ -719,7 +743,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-pkgsysconfDATA
+uninstall-am: uninstall-schroot_sysconfDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 	install-am install-data-am install-strip tags-recursive
@@ -732,12 +756,12 @@
 	install-data install-data-am install-data-hook install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkgsysconfDATA install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-schroot_sysconfDATA install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-pkgsysconfDATA
+	uninstall uninstall-am uninstall-schroot_sysconfDATA
 
 
 profiles: profiles-stamp
@@ -752,9 +776,9 @@
 
 install-data-hook:
 	for profile in $(PROFILES); do 						\
-	  $(MKDIR_P) "$(DESTDIR)$(SCHROOT_SYSCONF_DIR)/$$profile";			\
+	  $(MKDIR_P) "$(DESTDIR)$(schroot_sysconfdir)/$$profile";			\
 	  for file in "profiles/$$profile"/*; do						\
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(SCHROOT_SYSCONF_DIR)/$$profile";	\
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(schroot_sysconfdir)/$$profile";	\
 	  done;									\
 	done
 
diff -Nru schroot-1.4.23/etc/pam/Makefile.in schroot-1.4.25/etc/pam/Makefile.in
--- schroot-1.4.23/etc/pam/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/etc/pam/Makefile.in	2012-02-03 11:09:05.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -124,6 +124,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(pamdir)"
 DATA = $(pam_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -147,14 +153,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -229,21 +250,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -307,6 +317,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -370,9 +392,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pam_DATA)'; test -n "$(pamdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pamdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pamdir)" && rm -f $$files
+	dir='$(DESTDIR)$(pamdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -427,10 +447,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/etc/setup.d/05file schroot-1.4.25/etc/setup.d/05file
--- schroot-1.4.23/etc/setup.d/05file	2011-06-24 22:22:06.000000000 +0000
+++ schroot-1.4.25/etc/setup.d/05file	2012-01-17 23:41:00.000000000 +0000
@@ -37,8 +37,6 @@
 	filetype="tgz"
     elif echo "$CHROOT_FILE" | egrep -q '(\.tar\.bz2|\.tbz)$'; then
 	filetype="tbz"
-    elif echo "$CHROOT_FILE" | grep -q '\.zip$'; then
-	filetype="zip"
     else
 	fatal "Unsupported filetype for $CHROOT_FILE"
     fi
@@ -57,8 +55,6 @@
 	tar $TAR_VERBOSE -xzf "$CHROOT_FILE"
     elif [ "$filetype" = "tbz" ]; then
 	tar $TAR_VERBOSE -xjf "$CHROOT_FILE"
-    elif [ "$filetype" = "zip" ]; then
-	unzip $ZIP_VERBOSE "$CHROOT_FILE"
     else
 	fatal "Unsupported filetype for $CHROOT_FILE"
     fi
@@ -77,8 +73,6 @@
 	tar $TAR_VERBOSE -czf "$NEWFILE" .
     elif [ "$filetype" = "tbz" ]; then
 	tar $TAR_VERBOSE -cjf "$NEWFILE" .
-    elif [ "$filetype" = "zip" ]; then
-	zip $ZIP_VERBOSE -r "$NEWFILE" .
     else
 	fatal "Unsupported filetype for $CHROOT_FILE"
     fi
@@ -100,8 +94,6 @@
 
 if [ "$VERBOSE" = "verbose" ]; then
     TAR_VERBOSE="-v"
-else
-    ZIP_VERBOSE="-q"
 fi
 
 if [ "$CHROOT_TYPE" = "file" ]; then
diff -Nru schroot-1.4.23/etc/setup.d/10mount schroot-1.4.25/etc/setup.d/10mount
--- schroot-1.4.23/etc/setup.d/10mount	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/etc/setup.d/10mount	2012-01-23 09:55:07.000000000 +0000
@@ -92,6 +92,9 @@
 	    aufs)
 		CHROOT_UNION_MOUNT_OPTIONS="br:${CHROOT_UNION_OVERLAY_DIRECTORY}:${CHROOT_UNION_UNDERLAY_DIRECTORY}=ro"
 		;;
+	    overlayfs)
+                CHROOT_UNION_MOUNT_OPTIONS="lowerdir=${CHROOT_UNION_UNDERLAY_DIRECTORY},upperdir=${CHROOT_UNION_OVERLAY_DIRECTORY}"
+                ;;
 	esac
     fi
 
diff -Nru schroot-1.4.23/etc/setup.d/15killprocs schroot-1.4.25/etc/setup.d/15killprocs
--- schroot-1.4.23/etc/setup.d/15killprocs	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/etc/setup.d/15killprocs	2012-01-17 23:41:00.000000000 +0000
@@ -29,6 +29,17 @@
     fatal "script-config file '$CHROOT_SCRIPT_CONFIG' does not exist"
 fi
 
+# Wrapper around kill command. Turns errors into
+# warnings when running in verbose mode, otherwise
+# it ignores them.
+# args: parameters for kill
+kill_proc()
+{
+    if ! kill "$@" 2>/dev/null; then
+        info "kill $@ failed: process already terminated?"
+    fi
+}
+
 # Kill all processes that were run from within the chroot environment
 # $1: mount base location
 do_kill_all()
@@ -51,7 +62,7 @@
 		info "Killing left-over pid $pid (${exe##$1})"
 		info "  Sending SIGTERM to pid $pid"
 
-		/bin/kill -TERM "$pid" 2>/dev/null
+		kill_proc -TERM "$pid"
 
 		count=0
 		max=5
@@ -62,7 +73,7 @@
                 # Wait for $max seconds for process to die before -9'ing it
                     if [ "$count" -eq "$max" ]; then
 			info "  Sending SIGKILL to pid $pid"
-			/bin/kill -KILL "$pid" 2>/dev/null
+			kill_proc -KILL "$pid"
 			sleep 1
 			break
                     fi
@@ -74,4 +85,4 @@
 
 if [ $STAGE = "setup-recover" ] || [ $STAGE = "setup-stop" ]; then
     do_kill_all "$CHROOT_MOUNT_LOCATION"
-fi
\ No newline at end of file
+fi
diff -Nru schroot-1.4.23/etc/setup.d/Makefile.am schroot-1.4.25/etc/setup.d/Makefile.am
--- schroot-1.4.23/etc/setup.d/Makefile.am	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/etc/setup.d/Makefile.am	2012-01-17 23:41:00.000000000 +0000
@@ -21,31 +21,27 @@
 
 include $(top_srcdir)/scripts/global.mk
 
-setupdir = $(SCHROOT_CONF_SETUP_D)
-
-setupdatadir = $(SCHROOT_SETUP_DATA_DIR)
-
-setupdata_DATA =		\
+schroot_setupdata_DATA =	\
 	common-data		\
 	common-functions
 
-setup_SCRIPTS =		\
-	00check		\
-	05file		\
-	05btrfs		\
-	05lvm		\
-	05union		\
-	10mount		\
-	15killprocs	\
-	20copyfiles	\
-	20nssdatabases	\
+schroot_sysconf_setup_SCRIPTS =	\
+	00check			\
+	05file			\
+	05btrfs			\
+	05lvm			\
+	05union			\
+	10mount			\
+	15killprocs		\
+	20copyfiles		\
+	20nssdatabases		\
 	50chrootname
 
 install-exec-hook:
-	$(MKDIR_P) "$(DESTDIR)$(setupdir)"
-	ln -sf "00check" "$(DESTDIR)$(setupdir)/99check"
+	$(MKDIR_P) "$(DESTDIR)$(schroot_sysconf_setupdir)"
+	ln -sf "00check" "$(DESTDIR)$(schroot_sysconf_setupdir)/99check"
 
-EXTRA_DIST =			\
-	$(setupdata_DATA)	\
-	$(setup_SCRIPTS)
+EXTRA_DIST =					\
+	$(schroot_setupdata_DATA)		\
+	$(schroot_sysconf_setup_SCRIPTS)
 
diff -Nru schroot-1.4.23/etc/setup.d/Makefile.in schroot-1.4.25/etc/setup.d/Makefile.in
--- schroot-1.4.23/etc/setup.d/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/etc/setup.d/Makefile.in	2012-02-03 11:09:05.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -117,8 +117,15 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(setupdir)" "$(DESTDIR)$(setupdatadir)"
-SCRIPTS = $(setup_SCRIPTS)
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(schroot_sysconf_setupdir)" \
+	"$(DESTDIR)$(schroot_setupdatadir)"
+SCRIPTS = $(schroot_sysconf_setup_SCRIPTS)
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
@@ -127,7 +134,7 @@
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
-DATA = $(setupdata_DATA)
+DATA = $(schroot_setupdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,14 +156,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -231,21 +253,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -309,31 +320,41 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
 AM_LDFLAGS = $(LOCAL_LDFLAGS) $(PTHREAD_LIBS)
-setupdir = $(SCHROOT_CONF_SETUP_D)
-setupdatadir = $(SCHROOT_SETUP_DATA_DIR)
-setupdata_DATA = \
+schroot_setupdata_DATA = \
 	common-data		\
 	common-functions
 
-setup_SCRIPTS = \
-	00check		\
-	05file		\
-	05btrfs		\
-	05lvm		\
-	05union		\
-	10mount		\
-	15killprocs	\
-	20copyfiles	\
-	20nssdatabases	\
+schroot_sysconf_setup_SCRIPTS = \
+	00check			\
+	05file			\
+	05btrfs			\
+	05lvm			\
+	05union			\
+	10mount			\
+	15killprocs		\
+	20copyfiles		\
+	20nssdatabases		\
 	50chrootname
 
 EXTRA_DIST = \
-	$(setupdata_DATA)	\
-	$(setup_SCRIPTS)
+	$(schroot_setupdata_DATA)		\
+	$(schroot_sysconf_setup_SCRIPTS)
 
 all: all-am
 
@@ -368,10 +389,10 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-setupSCRIPTS: $(setup_SCRIPTS)
+install-schroot_sysconf_setupSCRIPTS: $(schroot_sysconf_setup_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(setupdir)" || $(MKDIR_P) "$(DESTDIR)$(setupdir)"
-	@list='$(setup_SCRIPTS)'; test -n "$(setupdir)" || list=; \
+	test -z "$(schroot_sysconf_setupdir)" || $(MKDIR_P) "$(DESTDIR)$(schroot_sysconf_setupdir)"
+	@list='$(schroot_sysconf_setup_SCRIPTS)'; test -n "$(schroot_sysconf_setupdir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -389,45 +410,41 @@
 	while read type dir files; do \
 	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(setupdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(setupdir)$$dir" || exit $$?; \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(schroot_sysconf_setupdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(schroot_sysconf_setupdir)$$dir" || exit $$?; \
 	     } \
 	; done
 
-uninstall-setupSCRIPTS:
+uninstall-schroot_sysconf_setupSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(setup_SCRIPTS)'; test -n "$(setupdir)" || exit 0; \
+	@list='$(schroot_sysconf_setup_SCRIPTS)'; test -n "$(schroot_sysconf_setupdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(setupdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(setupdir)" && rm -f $$files
+	dir='$(DESTDIR)$(schroot_sysconf_setupdir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-setupdataDATA: $(setupdata_DATA)
+install-schroot_setupdataDATA: $(schroot_setupdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(setupdatadir)" || $(MKDIR_P) "$(DESTDIR)$(setupdatadir)"
-	@list='$(setupdata_DATA)'; test -n "$(setupdatadir)" || list=; \
+	test -z "$(schroot_setupdatadir)" || $(MKDIR_P) "$(DESTDIR)$(schroot_setupdatadir)"
+	@list='$(schroot_setupdata_DATA)'; test -n "$(schroot_setupdatadir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(setupdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(setupdatadir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schroot_setupdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(schroot_setupdatadir)" || exit $$?; \
 	done
 
-uninstall-setupdataDATA:
+uninstall-schroot_setupdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(setupdata_DATA)'; test -n "$(setupdatadir)" || list=; \
+	@list='$(schroot_setupdata_DATA)'; test -n "$(schroot_setupdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(setupdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(setupdatadir)" && rm -f $$files
+	dir='$(DESTDIR)$(schroot_setupdatadir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -469,7 +486,7 @@
 check: check-am
 all-am: Makefile $(SCRIPTS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(setupdir)" "$(DESTDIR)$(setupdatadir)"; do \
+	for dir in "$(DESTDIR)$(schroot_sysconf_setupdir)" "$(DESTDIR)$(schroot_setupdatadir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -482,10 +499,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -517,7 +539,8 @@
 
 info-am:
 
-install-data-am: install-setupSCRIPTS install-setupdataDATA
+install-data-am: install-schroot_setupdataDATA \
+	install-schroot_sysconf_setupSCRIPTS
 
 install-dvi: install-dvi-am
 
@@ -562,7 +585,8 @@
 
 ps-am:
 
-uninstall-am: uninstall-setupSCRIPTS uninstall-setupdataDATA
+uninstall-am: uninstall-schroot_setupdataDATA \
+	uninstall-schroot_sysconf_setupSCRIPTS
 
 .MAKE: install-am install-exec-am install-strip
 
@@ -573,16 +597,18 @@
 	install-exec install-exec-am install-exec-hook install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
-	install-setupSCRIPTS install-setupdataDATA install-strip \
+	install-schroot_setupdataDATA \
+	install-schroot_sysconf_setupSCRIPTS install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-setupSCRIPTS uninstall-setupdataDATA
+	uninstall-schroot_setupdataDATA \
+	uninstall-schroot_sysconf_setupSCRIPTS
 
 
 install-exec-hook:
-	$(MKDIR_P) "$(DESTDIR)$(setupdir)"
-	ln -sf "00check" "$(DESTDIR)$(setupdir)/99check"
+	$(MKDIR_P) "$(DESTDIR)$(schroot_sysconf_setupdir)"
+	ln -sf "00check" "$(DESTDIR)$(schroot_sysconf_setupdir)/99check"
 
 # 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.
diff -Nru schroot-1.4.23/INSTALL schroot-1.4.25/INSTALL
--- schroot-1.4.23/INSTALL	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/INSTALL	2012-02-03 11:09:05.000000000 +0000
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
diff -Nru schroot-1.4.23/m4/libtool.m4 schroot-1.4.25/m4/libtool.m4
--- schroot-1.4.23/m4/libtool.m4	2011-06-25 11:09:32.000000000 +0000
+++ schroot-1.4.25/m4/libtool.m4	2012-02-03 11:08:59.000000000 +0000
@@ -1,8 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -146,6 +146,8 @@
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -637,7 +639,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -801,6 +803,7 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -822,6 +825,31 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -852,6 +880,10 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -954,7 +986,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1000,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -973,6 +1012,7 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -990,7 +1030,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1035,8 +1077,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1047,6 +1089,8 @@
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -1330,14 +1374,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1414,13 +1471,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -1600,6 +1657,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1639,7 +1701,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -2185,7 +2247,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2194,7 +2256,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2259,7 +2321,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2398,7 +2460,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2406,10 +2468,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2417,7 +2475,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2435,7 +2493,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2455,7 +2513,7 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
@@ -2466,7 +2524,7 @@
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -2527,7 +2585,7 @@
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2543,7 +2601,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -2580,9 +2638,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2657,7 +2715,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2726,7 +2784,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2751,7 +2809,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2775,7 +2833,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2806,7 +2864,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2816,7 +2874,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3238,7 +3296,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3658,6 +3716,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4242,7 +4301,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -4334,18 +4395,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -4505,7 +4581,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4533,7 +4611,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4787,8 +4864,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5084,6 +5160,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5130,10 +5207,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5146,7 +5219,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5185,7 +5258,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5627,9 +5699,6 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5787,7 +5856,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6157,7 +6225,7 @@
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6918,12 +6986,18 @@
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7120,7 +7194,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7253,7 +7326,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7440,6 +7512,77 @@
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7509,6 +7652,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
diff -Nru schroot-1.4.23/m4/ltoptions.m4 schroot-1.4.25/m4/ltoptions.m4
--- schroot-1.4.23/m4/ltoptions.m4	2011-06-25 11:09:32.000000000 +0000
+++ schroot-1.4.25/m4/ltoptions.m4	2012-02-03 11:09:00.000000000 +0000
@@ -326,9 +326,24 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
diff -Nru schroot-1.4.23/m4/ltversion.m4 schroot-1.4.25/m4/ltversion.m4
--- schroot-1.4.23/m4/ltversion.m4	2011-06-25 11:09:32.000000000 +0000
+++ schroot-1.4.25/m4/ltversion.m4	2012-02-03 11:09:00.000000000 +0000
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff -Nru schroot-1.4.23/m4/schroot_release.m4 schroot-1.4.25/m4/schroot_release.m4
--- schroot-1.4.23/m4/schroot_release.m4	2011-06-11 15:53:38.000000000 +0000
+++ schroot-1.4.25/m4/schroot_release.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#                                                              -*- Autoconf -*-
-# Copyright © 2001-2002,2006  Roger Leigh <rleigh@debian.org>
-#
-# schroot 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 3 of the License, or
-# (at your option) any later version.
-#
-# schroot 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, see
-# <http://www.gnu.org/licenses/>.
-#
-#####################################################################
-
-# SCHROOT_RELEASE_DATE
-# --------------------
-# Hard-code the release date into the generated configure script and
-# Makefiles.
-AC_DEFUN([SCHROOT_RELEASE_DATE],
-[dnl Set package release date
-AC_DEFINE_UNQUOTED([RELEASE_DATE], 1307807618, [Package release date.])
-RELEASE_DATE="11 Jun 2011"
-AC_SUBST([RELEASE_DATE])])
diff -Nru schroot-1.4.23/Makefile.in schroot-1.4.25/Makefile.in
--- schroot-1.4.23/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/Makefile.in	2012-02-03 11:09:05.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -192,6 +192,8 @@
 GZIP_ENV = --best
 DIST_ARCHIVES = $(distdir).tar.bz2
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -213,14 +215,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -295,21 +312,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -374,6 +380,18 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -414,7 +432,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(top_srcdir)/scripts/git-dist.mk $(am__configure_deps)
 	@for dep in $?; do \
@@ -450,10 +468,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -692,7 +708,7 @@
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -700,7 +716,7 @@
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -717,7 +733,7 @@
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -750,6 +766,7 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -778,8 +795,16 @@
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -810,10 +835,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/man/authors.man schroot-1.4.25/man/authors.man
--- schroot-1.4.23/man/authors.man	1970-01-01 00:00:00.000000000 +0000
+++ schroot-1.4.25/man/authors.man	2012-01-17 23:41:00.000000000 +0000
@@ -0,0 +1,2 @@
+.SH AUTHORS
+Roger Leigh.
diff -Nru schroot-1.4.23/man/copyright.man schroot-1.4.25/man/copyright.man
--- schroot-1.4.23/man/copyright.man	1970-01-01 00:00:00.000000000 +0000
+++ schroot-1.4.25/man/copyright.man	2012-01-23 09:53:35.000000000 +0000
@@ -0,0 +1,7 @@
+.SH COPYRIGHT
+Copyright \(co 2005\-2011  Roger Leigh \f[CR]<rleigh@debian.org>\fP
+.PP
+\fB\*[PROGRAM]\fP 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 3 of the License, or (at your option) any later
+version.
diff -Nru schroot-1.4.23/man/csbuild.1.in schroot-1.4.25/man/csbuild.1.in
--- schroot-1.4.23/man/csbuild.1.in	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/man/csbuild.1.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,317 +0,0 @@
-.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
-.\"
-.\" schroot 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 3 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" schroot 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, see
-.\" <http://www.gnu.org/licenses/>.
-.\"
-.TH CSBUILD 1 "@RELEASE_DATE_S@" "Version @VERSION@" "Debian sbuild"
-.SH NAME
-csbuild \- build debian packages from source
-.SH SYNOPSIS
-.B csbuild
-.RB [ \-h \[or] \-\-help " \[or] " \-V \[or] \-\-version
-.RB " \[or] " \-l \[or] \-\-list " \[or] " \-i \[or] \-\-info
-.RB " \[or] " \-\-config " \[or] " \-\-location ]
-.RB [ "\-\-directory=\fIdirectory\fP" ]
-.RB [ \-d \[or] \-\-preserve\-environment ]
-.RB [ \-q \[or] \-\-quiet " \[or] " \-v \[or] \-\-verbose ]
-.RB [ "\-c \fIchroot\fP" \[or] "\-\-chroot=\fIchroot\fP"
-.RB " \[or] " \-\-all ]
-.RB [ COMMAND " [ " ARG1 " [ " ARG2 " [ " ARGn ]]]]
-.SH DESCRIPTION
-\fBcsbuild\fP allows the user to run a command or a login shell in a chroot
-environment.  If no command is specified, a login shell will be started in the
-user's home directory inside the chroot.
-.PP
-The command is one or more arguments which will be run in the user's default
-shell using its \fI\-c\fP option.  As a result, shell code may be embedded
-in this argument.  If multiple command options are used, they are concatenated
-together, separated by spaces.  Users should be aware of the shell quoting
-issues this presents, and should use \fBschroot\fP if necessary, which does not
-have any quoting issues.
-.PP
-The directory the command or login shell is run in depends upon the context.
-See \fI\-\-directory\fP option below for a complete description.
-.PP
-This version of csbuild is a compatibility wrapper around the
-.BR schroot (1)
-program.  It is provided for backward compatibility with the csbuild
-command-line options, but schroot is recommended for future use.  See the
-section \[lq]\fIMigration\fP\[rq] below for help migrating an existing csbuild
-configuration to schroot.  See the section \[lq]\fIIncompatibilities\fP\[rq]
-below for known incompatibilities with older versions of csbuild.
-.PP
-If no chroot is specified, the chroot name or alias \[oq]default\[cq] will be
-used as a fallback.  If using the configuration in \fI@CSBUILD_CONF@\fP, the
-first chroot in the file is the default.
-.SH OPTIONS
-\fBcsbuild\fP accepts the following options:
-.SS Basic options
-.TP
-.BR \-h ", " \-\-help
-Show help summary.
-.TP
-.BR \-a ", " \-\-all
-Select all chroots.
-.TP
-.BR \-c ", " \-\-chroot=\fIchroot\fP
-Specify a chroot to use.  This option may be used multiple times to specify
-more than one chroot, in which case its effect is similar to \fI\-\-all\fP.
-.TP
-.BR \-l ", " \-\-list
-List all available chroots.
-.TP
-.BR \-i ", " \-\-info
-Print detailed information about the specified chroots.  Note that earlier
-versions of csbuild did not include this option.
-.TP
-.BR \-p ", " \-\-path
-Print location (path) of the specified chroots.
-.TP
-.BR \-\-config
-Print configuration of the specified chroots.  This is useful for testing that
-the configuration in use is the same as the configuration file.  Any comments
-in the original file will be missing.  Note that earlier versions of csbuild
-did not include this option.
-.TP
-.BR \-d ", " \-\-directory=\fIdirectory\fP
-Change to \fIdirectory\fP inside the chroot before running the command or login
-shell.  If \fIdirectory\fP is not available, csbuild will exit with an error
-status.
-.IP
-The default behaviour is as follows (all directory paths are inside the
-chroot).  Unless the \fI\-\-preserve\-environment\fP option is used to preserve
-the environment, the login shell or command will run in the user's home
-directory, or \fI/\fP if the home directory is not available.  When the
-\fI\-\-preserve\-environment\fP option is used, it will attempt to use the
-current working directory, again falling back to \fI/\fP if it is not
-accessible.  If none of the directories are available, csbuild will exit with
-an error status.
-.TP
-.BR \-d ", " \-\-preserve\-environment
-Preserve the user's environment inside the chroot environment.  The default is
-to use a clean environment; this option copies the entire user environment and
-sets it in the session.
-.TP
-.BR \-q ", " \-\-quiet
-Print only essential messages.
-.TP
-.BR \-v ", " \-\-verbose
-Print all messages.  Note that earlier versions of csbuild did not include this
-option.
-.TP
-.BR \-V ", " \-\-version
-Print version information.
-.PP
-Note that earlier versions of csbuild did not provide long options.
-.SH CONFIGURATION
-The csbuild configuration file, \fI@CSBUILD_CONF@\fP, used by earlier versions
-of csbuild, has the following format:
-.IP \[bu]
-\[oq]#\[cq] starts a comment line.
-.IP \[bu]
-Blank lines are ignored.
-.IP \[bu]
-Chroot definitions are a single line containing an \f[CBI]identifier\fP,
-\f[CBI]path\fP, and an optional \f[CBI]personality\fP separated by whitespace.
-.IP \[bu]
-The first chroot is also the default chroot.
-.PP
-An example file:
-.PP
-.RS
-\f[CR]# Example comment\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]sarge /srv/chroot/sarge\fP
-.br
-\f[CR]sid /srv/chroot/sid linux32\fP
-.br
-.RE
-.PP
-This file defines a chroot called \[oq]sarge\[cq], located at
-\fI/srv/chroot/sarge\fP, and a second chroot called \[oq]sid\[cq], located at
-\fI/srv/chroot/sid\fP.  The second chroot uses the \[oq]linux32\[cq]
-personality, which allows a 32-bit chroot to be used on a 64-bit system.
-\[oq]sarge\[cq] is the default chroot, because it was listed first, which means
-if the \fI\-c\fP option is omitted this chroot will be used.
-.SH INCOMPATIBILITIES
-.SS Debian csbuild prior to version 0.99.0
-.IP \[bu]
-Log messages are worded and formatted differently.
-.IP \[bu]
-The parsing of \fI@CSBUILD_CONF@\fP uses a smaller list of allowed whitespace
-characters (space and tab), which may cause a parse error during tokenising if
-the file contains odd characters as separators, such as carriage returns,
-vertical tabs and form feeds.
-.IP \[bu]
-.BR su (1)
-is no longer used to run commands in the chroot; this is done by csbuild
-internally.  This change may cause subtle differences.  If you find an
-incompatibility, please report it so it may be corrected.
-.IP \[bu]
-csbuild provides a restricted subset of the functionality implemented by
-\fBschroot\fP, but is still schroot underneath.  Thus csbuild is still subject
-to schroot security checking, including PAM authentication and authorisation,
-and session management, for example, and hence may behave slightly differently
-to older csbuild versions in some circumstances.
-.SS DSA csbuild
-Machines run by the Debian System Administrators for the Debian Project have a
-\fBcsbuild-dsa\fP package which provides an alternate csbuild implementation.
-.IP \[bu]
-All the above incompatibilities apply.
-.IP \[bu]
-This version of csbuild has incompatible command-line options, and while some
-of those options are supported or have equivalent options by a different name,
-the \fI\-c\fP option is not required to specify a chroot, and this version of
-csbuild cannot implement this behaviour in a backward-compatible manner
-(because if \fI\-c\fP is omitted, the default chroot is used).  DSA csbuild
-uses the first non-option as the chroot to use, only allowing one chroot to be
-used at once.
-.IP \[bu]
-This version of csbuild has an incompatible format for \fIcsbuild.conf\fP.
-While the first two fields are the same, the remaining fields are an optional
-\f[CBI]users\fP, a list of users permitted to access the chroot, instead of the
-\f[CI]personality\fP field allowed by this version.  If access restrictions are
-needed, please use \fI@SCHROOT_CONF@\fP and add the allowed users there, as
-shown in \[lq]\fIMigration\fP\[rq] below.
-.SH MIGRATION
-To migrate an existing \fBcsbuild\fP configuration to \fBschroot\fP, perform
-the following steps:
-.IP 1
-Dump the csbuild configuration in schroot keyfile format to
-\fI@SCHROOT_CONF@\fP.
-.PP
-.RS
-\f[CR]# \f[CB]csbuild --config >> @SCHROOT_CONF@
-.br
-.RE
-.PP
-.IP 2
-Edit \fI@SCHROOT_CONF@\fP to add access to the users and/or groups which are to
-be allowed to access the chroots, and make any other desired changes to the
-configuration.  See
-.BR schroot.conf (5).
-.IP 3
-Remove \fI@CSBUILD_CONF@\fP, so that csbuild will subsequently use
-\fI@SCHROOT_CONF@\fP for its configuration.
-.SH EXAMPLES
-\f[CR]$ \f[CB]csbuild \-l\fP\fP
-.br
-\f[CR]Available chroots: sarge [default], sid\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]$ \f[CB]csbuild \-p sid\fP\fP
-.br
-\f[CR]/srv/chroot/sid\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]$ \f[CB]csbuild \-q \-c sid \-\- uname \-smr\fP\fP
-.br
-\f[CR]Linux 2.6.16.17 ppc\fP
-.br
-\f[CR]$ \f[CB]csbuild \-q \-c sid \-\- "uname \-smr"\fP\fP
-.br
-\f[CR]Linux 2.6.16.17 ppc\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]$ \f[CB]csbuild -q -c sid "ls -1 / | tac | head -n 4"\fP\fP
-.br
-\f[CR]var\fP
-.br
-\f[CR]usr\fP
-.br
-\f[CR]tmp\fP
-.br
-\f[CR]sys\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]$ \f[CB]csbuild \-c sid\fP\fP
-.br
-\f[CR]I: [sid chroot] Running login shell: \[lq]/bin/bash\[rq]\fP
-.br
-\f[CR]$ \fP
-.br
-.LP
-Use \fI\-\-\fP to allow options beginning with \[oq]\-\[cq] or \[oq]\-\-\[cq]
-in the command to run in the chroot.  This prevents them being interpreted as
-options for csbuild itself.  Note that the top line was echoed to standard
-error, and the remaining lines to standard output.  This is intentional, so
-that program output from commands run in the chroot may be piped and redirected
-as required; the data will be the same as if the command was run directly on
-the host system.
-.SH TROUBLESHOOTING
-If something is not working, and it's not clear from the error messages what is
-wrong, try using the \fB\-\-debug=\fP\fIlevel\fP option to turn on debugging
-messages.  This gives a great deal more information.  Valid debug levels are
-\[oq]none\[cq], and \[oq]notice\[cq], \[oq]info\[cq], \[oq]warning\[cq] and
-\[oq]critical\[cq] in order of increasing severity.  The lower the severity
-level, the more output.
-.PP
-If you are still having trouble, the developers may be contacted on the mailing
-list:
-.br
-\f[CR]Debian\ buildd-tools\ Developers
-.br
-<buildd-tools-devel@lists.alioth.debian.org>\fP
-.SH BUGS
-On the \fBmips\fP and \fBmipsel\fP architectures, Linux kernels up to and
-including at least version 2.6.17 have broken
-.BR personality (2)
-support, which results in a failure to set the personality.  This will be seen
-as an \[lq]Operation not permitted\[rq] (EPERM) error.  To work around this
-problem, set \f[CI]personality\fP to \[oq]undefined\[cq], or upgrade to a more
-recent kernel.
-.SH FILES
-.TP
-\f[BI]@CSBUILD_CONF@\fP
-The system-wide \fBcsbuild\fP chroot definition file.  This file must be owned
-by the root user, and not be writable by other.  If present, this file will be
-used in preference to \fI@SCHROOT_CONF@\fP.
-.TP
-\f[BI]@SCHROOT_CONF@\fP
-The system-wide \fBschroot\fP definition file.  This file must be owned by the
-root user, and not be writable by other.  It is recommended that this file be
-used in preference to \fI@CSBUILD_CONF@\fP, because the chroots can be used
-interchangeably with schroot, and the user and group security policies provided
-by schroot are also enforced.
-.SH AUTHORS
-Roger Leigh.
-.PP
-This implementation of csbuild uses the same command-line options as the
-original \fBsbuild\fP by David Kimdon \f[CR]<dwhedon@debian.org>\fP, but is an
-independent implementation.
-.SH COPYRIGHT
-Copyright \(co 2005\-2010  Roger Leigh \f[CR]<rleigh@debian.org>\fP
-.PP
-\fBcsbuild\fP 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 3 of the License, or (at your option) any later
-version.
-.SH SEE ALSO
-.BR schroot (1),
-.BR sbuild (1),
-.BR chroot (2),
-.BR schroot-setup (5),
-.BR schroot.conf (5).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff -Nru schroot-1.4.23/man/csbuild.1.man schroot-1.4.25/man/csbuild.1.man
--- schroot-1.4.23/man/csbuild.1.man	1970-01-01 00:00:00.000000000 +0000
+++ schroot-1.4.25/man/csbuild.1.man	2012-01-23 09:53:35.000000000 +0000
@@ -0,0 +1,312 @@
+.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
+.\"
+.\" schroot 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 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" schroot 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, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
+.so config.man
+.ds PROGRAM csbuild
+.TH CSBUILD 1 "\*[RELEASE_DATE]" "Version \*[VERSION]" "Debian sbuild"
+.SH NAME
+csbuild \- build debian packages from source
+.SH SYNOPSIS
+.B csbuild
+.RB [ \-h \[or] \-\-help " \[or] " \-V \[or] \-\-version
+.RB " \[or] " \-l \[or] \-\-list " \[or] " \-i \[or] \-\-info
+.RB " \[or] " \-\-config " \[or] " \-\-location ]
+.RB [ "\-\-directory=\fIdirectory\fP" ]
+.RB [ \-d \[or] \-\-preserve\-environment ]
+.RB [ \-q \[or] \-\-quiet " \[or] " \-v \[or] \-\-verbose ]
+.RB [ "\-c \fIchroot\fP" \[or] "\-\-chroot=\fIchroot\fP"
+.RB " \[or] " \-\-all ]
+.RB [ COMMAND " [ " ARG1 " [ " ARG2 " [ " ARGn ]]]]
+.SH DESCRIPTION
+\fBcsbuild\fP allows the user to run a command or a login shell in a chroot
+environment.  If no command is specified, a login shell will be started in the
+user's home directory inside the chroot.
+.PP
+The command is one or more arguments which will be run in the user's default
+shell using its \fI\-c\fP option.  As a result, shell code may be embedded
+in this argument.  If multiple command options are used, they are concatenated
+together, separated by spaces.  Users should be aware of the shell quoting
+issues this presents, and should use \fBschroot\fP if necessary, which does not
+have any quoting issues.
+.PP
+The directory the command or login shell is run in depends upon the context.
+See \fI\-\-directory\fP option below for a complete description.
+.PP
+This version of csbuild is a compatibility wrapper around the
+.BR schroot (1)
+program.  It is provided for backward compatibility with the csbuild
+command-line options, but schroot is recommended for future use.  See the
+section \[lq]\fIMigration\fP\[rq] below for help migrating an existing csbuild
+configuration to schroot.  See the section \[lq]\fIIncompatibilities\fP\[rq]
+below for known incompatibilities with older versions of csbuild.
+.PP
+If no chroot is specified, the chroot name or alias \[oq]default\[cq] will be
+used as a fallback.  If using the configuration in \fI\*[CSBUILD_CONF]\fP, the
+first chroot in the file is the default.
+.SH OPTIONS
+\fBcsbuild\fP accepts the following options:
+.SS Basic options
+.TP
+.BR \-h ", " \-\-help
+Show help summary.
+.TP
+.BR \-a ", " \-\-all
+Select all chroots.
+.TP
+.BR \-c ", " \-\-chroot=\fIchroot\fP
+Specify a chroot to use.  This option may be used multiple times to specify
+more than one chroot, in which case its effect is similar to \fI\-\-all\fP.
+.TP
+.BR \-l ", " \-\-list
+List all available chroots.
+.TP
+.BR \-i ", " \-\-info
+Print detailed information about the specified chroots.  Note that earlier
+versions of csbuild did not include this option.
+.TP
+.BR \-p ", " \-\-path
+Print location (path) of the specified chroots.
+.TP
+.BR \-\-config
+Print configuration of the specified chroots.  This is useful for testing that
+the configuration in use is the same as the configuration file.  Any comments
+in the original file will be missing.  Note that earlier versions of csbuild
+did not include this option.
+.TP
+.BR \-d ", " \-\-directory=\fIdirectory\fP
+Change to \fIdirectory\fP inside the chroot before running the command or login
+shell.  If \fIdirectory\fP is not available, csbuild will exit with an error
+status.
+.IP
+The default behaviour is as follows (all directory paths are inside the
+chroot).  Unless the \fI\-\-preserve\-environment\fP option is used to preserve
+the environment, the login shell or command will run in the user's home
+directory, or \fI/\fP if the home directory is not available.  When the
+\fI\-\-preserve\-environment\fP option is used, it will attempt to use the
+current working directory, again falling back to \fI/\fP if it is not
+accessible.  If none of the directories are available, csbuild will exit with
+an error status.
+.TP
+.BR \-d ", " \-\-preserve\-environment
+Preserve the user's environment inside the chroot environment.  The default is
+to use a clean environment; this option copies the entire user environment and
+sets it in the session.
+.TP
+.BR \-q ", " \-\-quiet
+Print only essential messages.
+.TP
+.BR \-v ", " \-\-verbose
+Print all messages.  Note that earlier versions of csbuild did not include this
+option.
+.TP
+.BR \-V ", " \-\-version
+Print version information.
+.PP
+Note that earlier versions of csbuild did not provide long options.
+.SH CONFIGURATION
+The csbuild configuration file, \fI\*[CSBUILD_CONF]\fP, used by earlier versions
+of csbuild, has the following format:
+.IP \[bu]
+\[oq]#\[cq] starts a comment line.
+.IP \[bu]
+Blank lines are ignored.
+.IP \[bu]
+Chroot definitions are a single line containing an \f[CBI]identifier\fP,
+\f[CBI]path\fP, and an optional \f[CBI]personality\fP separated by whitespace.
+.IP \[bu]
+The first chroot is also the default chroot.
+.PP
+An example file:
+.PP
+.RS
+\f[CR]# Example comment\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]sarge /srv/chroot/sarge\fP
+.br
+\f[CR]sid /srv/chroot/sid linux32\fP
+.br
+.RE
+.PP
+This file defines a chroot called \[oq]sarge\[cq], located at
+\fI/srv/chroot/sarge\fP, and a second chroot called \[oq]sid\[cq], located at
+\fI/srv/chroot/sid\fP.  The second chroot uses the \[oq]linux32\[cq]
+personality, which allows a 32-bit chroot to be used on a 64-bit system.
+\[oq]sarge\[cq] is the default chroot, because it was listed first, which means
+if the \fI\-c\fP option is omitted this chroot will be used.
+.SH INCOMPATIBILITIES
+.SS Debian csbuild prior to version 0.99.0
+.IP \[bu]
+Log messages are worded and formatted differently.
+.IP \[bu]
+The parsing of \fI\*[CSBUILD_CONF]\fP uses a smaller list of allowed whitespace
+characters (space and tab), which may cause a parse error during tokenising if
+the file contains odd characters as separators, such as carriage returns,
+vertical tabs and form feeds.
+.IP \[bu]
+.BR su (1)
+is no longer used to run commands in the chroot; this is done by csbuild
+internally.  This change may cause subtle differences.  If you find an
+incompatibility, please report it so it may be corrected.
+.IP \[bu]
+csbuild provides a restricted subset of the functionality implemented by
+\fBschroot\fP, but is still schroot underneath.  Thus csbuild is still subject
+to schroot security checking, including PAM authentication and authorisation,
+and session management, for example, and hence may behave slightly differently
+to older csbuild versions in some circumstances.
+.SS DSA csbuild
+Machines run by the Debian System Administrators for the Debian Project have a
+\fBcsbuild-dsa\fP package which provides an alternate csbuild implementation.
+.IP \[bu]
+All the above incompatibilities apply.
+.IP \[bu]
+This version of csbuild has incompatible command-line options, and while some
+of those options are supported or have equivalent options by a different name,
+the \fI\-c\fP option is not required to specify a chroot, and this version of
+csbuild cannot implement this behaviour in a backward-compatible manner
+(because if \fI\-c\fP is omitted, the default chroot is used).  DSA csbuild
+uses the first non-option as the chroot to use, only allowing one chroot to be
+used at once.
+.IP \[bu]
+This version of csbuild has an incompatible format for \fIcsbuild.conf\fP.
+While the first two fields are the same, the remaining fields are an optional
+\f[CBI]users\fP, a list of users permitted to access the chroot, instead of the
+\f[CI]personality\fP field allowed by this version.  If access restrictions are
+needed, please use \fI\*[SCHROOT_CONF]\fP and add the allowed users there, as
+shown in \[lq]\fIMigration\fP\[rq] below.
+.SH MIGRATION
+To migrate an existing \fBcsbuild\fP configuration to \fBschroot\fP, perform
+the following steps:
+.IP 1
+Dump the csbuild configuration in schroot keyfile format to
+\fI\*[SCHROOT_CONF]\fP.
+.PP
+.RS
+\f[CR]# \f[CB]csbuild --config >> \*[SCHROOT_CONF]
+.br
+.RE
+.PP
+.IP 2
+Edit \fI\*[SCHROOT_CONF]\fP to add access to the users and/or groups which are to
+be allowed to access the chroots, and make any other desired changes to the
+configuration.  See
+.BR schroot.conf (5).
+.IP 3
+Remove \fI\*[CSBUILD_CONF]\fP, so that csbuild will subsequently use
+\fI\*[SCHROOT_CONF]\fP for its configuration.
+.SH EXAMPLES
+\f[CR]$ \f[CB]csbuild \-l\fP\fP
+.br
+\f[CR]Available chroots: sarge [default], sid\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]$ \f[CB]csbuild \-p sid\fP\fP
+.br
+\f[CR]/srv/chroot/sid\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]$ \f[CB]csbuild \-q \-c sid \-\- uname \-smr\fP\fP
+.br
+\f[CR]Linux 2.6.16.17 ppc\fP
+.br
+\f[CR]$ \f[CB]csbuild \-q \-c sid \-\- "uname \-smr"\fP\fP
+.br
+\f[CR]Linux 2.6.16.17 ppc\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]$ \f[CB]csbuild -q -c sid "ls -1 / | tac | head -n 4"\fP\fP
+.br
+\f[CR]var\fP
+.br
+\f[CR]usr\fP
+.br
+\f[CR]tmp\fP
+.br
+\f[CR]sys\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]$ \f[CB]csbuild \-c sid\fP\fP
+.br
+\f[CR]I: [sid chroot] Running login shell: \[lq]/bin/bash\[rq]\fP
+.br
+\f[CR]$ \fP
+.br
+.LP
+Use \fI\-\-\fP to allow options beginning with \[oq]\-\[cq] or \[oq]\-\-\[cq]
+in the command to run in the chroot.  This prevents them being interpreted as
+options for csbuild itself.  Note that the top line was echoed to standard
+error, and the remaining lines to standard output.  This is intentional, so
+that program output from commands run in the chroot may be piped and redirected
+as required; the data will be the same as if the command was run directly on
+the host system.
+.SH TROUBLESHOOTING
+If something is not working, and it's not clear from the error messages what is
+wrong, try using the \fB\-\-debug=\fP\fIlevel\fP option to turn on debugging
+messages.  This gives a great deal more information.  Valid debug levels are
+\[oq]none\[cq], and \[oq]notice\[cq], \[oq]info\[cq], \[oq]warning\[cq] and
+\[oq]critical\[cq] in order of increasing severity.  The lower the severity
+level, the more output.
+.PP
+If you are still having trouble, the developers may be contacted on the mailing
+list:
+.br
+\f[CR]Debian\ buildd-tools\ Developers
+.br
+<buildd-tools-devel@lists.alioth.debian.org>\fP
+.SH BUGS
+On the \fBmips\fP and \fBmipsel\fP architectures, Linux kernels up to and
+including at least version 2.6.17 have broken
+.BR personality (2)
+support, which results in a failure to set the personality.  This will be seen
+as an \[lq]Operation not permitted\[rq] (EPERM) error.  To work around this
+problem, set \f[CI]personality\fP to \[oq]undefined\[cq], or upgrade to a more
+recent kernel.
+.SH FILES
+.TP
+\f[BI]\*[CSBUILD_CONF]\fP
+The system-wide \fBcsbuild\fP chroot definition file.  This file must be owned
+by the root user, and not be writable by other.  If present, this file will be
+used in preference to \fI\*[SCHROOT_CONF]\fP.
+.TP
+\f[BI]\*[SCHROOT_CONF]\fP
+The system-wide \fBschroot\fP definition file.  This file must be owned by the
+root user, and not be writable by other.  It is recommended that this file be
+used in preference to \fI\*[CSBUILD_CONF]\fP, because the chroots can be used
+interchangeably with schroot, and the user and group security policies provided
+by schroot are also enforced.
+.so authors.man
+.PP
+This implementation of csbuild uses the same command-line options as the
+original \fBsbuild\fP by David Kimdon \f[CR]<dwhedon@debian.org>\fP, but is an
+independent implementation.
+.so copyright.man
+.SH SEE ALSO
+.BR schroot (1),
+.BR sbuild (1),
+.BR chroot (2),
+.BR schroot-setup (5),
+.BR schroot.conf (5).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff -Nru schroot-1.4.23/man/dchroot.1.in schroot-1.4.25/man/dchroot.1.in
--- schroot-1.4.23/man/dchroot.1.in	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/man/dchroot.1.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,317 +0,0 @@
-.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
-.\"
-.\" schroot 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 3 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" schroot 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, see
-.\" <http://www.gnu.org/licenses/>.
-.\"
-.TH DCHROOT 1 "@RELEASE_DATE_S@" "Version @VERSION@" "Debian sbuild"
-.SH NAME
-dchroot \- enter a chroot environment
-.SH SYNOPSIS
-.B dchroot
-.RB [ \-h \[or] \-\-help " \[or] " \-V \[or] \-\-version
-.RB " \[or] " \-l \[or] \-\-list " \[or] " \-i \[or] \-\-info
-.RB " \[or] " \-\-config " \[or] " \-\-location ]
-.RB [ "\-\-directory=\fIdirectory\fP" ]
-.RB [ \-d \[or] \-\-preserve\-environment ]
-.RB [ \-q \[or] \-\-quiet " \[or] " \-v \[or] \-\-verbose ]
-.RB [ "\-c \fIchroot\fP" \[or] "\-\-chroot=\fIchroot\fP"
-.RB " \[or] " \-\-all ]
-.RB [ COMMAND " [ " ARG1 " [ " ARG2 " [ " ARGn ]]]]
-.SH DESCRIPTION
-\fBdchroot\fP allows the user to run a command or a login shell in a chroot
-environment.  If no command is specified, a login shell will be started in the
-user's home directory inside the chroot.
-.PP
-The command is one or more arguments which will be run in the user's default
-shell using its \fI\-c\fP option.  As a result, shell code may be embedded
-in this argument.  If multiple command options are used, they are concatenated
-together, separated by spaces.  Users should be aware of the shell quoting
-issues this presents, and should use \fBschroot\fP if necessary, which does not
-have any quoting issues.
-.PP
-The directory the command or login shell is run in depends upon the context.
-See \fI\-\-directory\fP option below for a complete description.
-.PP
-This version of dchroot is a compatibility wrapper around the
-.BR schroot (1)
-program.  It is provided for backward compatibility with the dchroot
-command-line options, but schroot is recommended for future use.  See the
-section \[lq]\fIMigration\fP\[rq] below for help migrating an existing dchroot
-configuration to schroot.  See the section \[lq]\fIIncompatibilities\fP\[rq]
-below for known incompatibilities with older versions of dchroot.
-.PP
-If no chroot is specified, the chroot name or alias \[oq]default\[cq] will be
-used as a fallback.  If using the configuration in \fI@DCHROOT_CONF@\fP, the
-first chroot in the file is the default.
-.SH OPTIONS
-\fBdchroot\fP accepts the following options:
-.SS Basic options
-.TP
-.BR \-h ", " \-\-help
-Show help summary.
-.TP
-.BR \-a ", " \-\-all
-Select all chroots.
-.TP
-.BR \-c ", " \-\-chroot=\fIchroot\fP
-Specify a chroot to use.  This option may be used multiple times to specify
-more than one chroot, in which case its effect is similar to \fI\-\-all\fP.
-.TP
-.BR \-l ", " \-\-list
-List all available chroots.
-.TP
-.BR \-i ", " \-\-info
-Print detailed information about the specified chroots.  Note that earlier
-versions of dchroot did not include this option.
-.TP
-.BR \-p ", " \-\-path
-Print location (path) of the specified chroots.
-.TP
-.BR \-\-config
-Print configuration of the specified chroots.  This is useful for testing that
-the configuration in use is the same as the configuration file.  Any comments
-in the original file will be missing.  Note that earlier versions of dchroot
-did not include this option.
-.TP
-.BR \-\-directory=\fIdirectory\fP
-Change to \fIdirectory\fP inside the chroot before running the command or login
-shell.  If \fIdirectory\fP is not available, dchroot will exit with an error
-status.
-.IP
-The default behaviour is as follows (all directory paths are inside the
-chroot).  Unless the \fI\-\-preserve\-environment\fP option is used to preserve
-the environment, the login shell or command will run in the user's home
-directory, or \fI/\fP if the home directory is not available.  When the
-\fI\-\-preserve\-environment\fP option is used, it will attempt to use the
-current working directory, again falling back to \fI/\fP if it is not
-accessible.  If none of the directories are available, dchroot will exit with
-an error status.
-.TP
-.BR \-d ", " \-\-preserve\-environment
-Preserve the user's environment inside the chroot environment.  The default is
-to use a clean environment; this option copies the entire user environment and
-sets it in the session.
-.TP
-.BR \-q ", " \-\-quiet
-Print only essential messages.
-.TP
-.BR \-v ", " \-\-verbose
-Print all messages.  Note that earlier versions of dchroot did not include this
-option.
-.TP
-.BR \-V ", " \-\-version
-Print version information.
-.PP
-Note that earlier versions of dchroot did not provide long options.
-.SH CONFIGURATION
-The dchroot configuration file, \fI@DCHROOT_CONF@\fP, used by earlier versions
-of dchroot, has the following format:
-.IP \[bu]
-\[oq]#\[cq] starts a comment line.
-.IP \[bu]
-Blank lines are ignored.
-.IP \[bu]
-Chroot definitions are a single line containing an \f[CBI]identifier\fP,
-\f[CBI]path\fP, and an optional \f[CBI]personality\fP separated by whitespace.
-.IP \[bu]
-The first chroot is also the default chroot.
-.PP
-An example file:
-.PP
-.RS
-\f[CR]# Example comment\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]sarge /srv/chroot/sarge\fP
-.br
-\f[CR]sid /srv/chroot/sid linux32\fP
-.br
-.RE
-.PP
-This file defines a chroot called \[oq]sarge\[cq], located at
-\fI/srv/chroot/sarge\fP, and a second chroot called \[oq]sid\[cq], located at
-\fI/srv/chroot/sid\fP.  The second chroot uses the \[oq]linux32\[cq]
-personality, which allows a 32-bit chroot to be used on a 64-bit system.
-\[oq]sarge\[cq] is the default chroot, because it was listed first, which means
-if the \fI\-c\fP option is omitted this chroot will be used.
-.SH INCOMPATIBILITIES
-.SS Debian dchroot prior to version 0.99.0
-.IP \[bu]
-Log messages are worded and formatted differently.
-.IP \[bu]
-The parsing of \fI@DCHROOT_CONF@\fP uses a smaller list of allowed whitespace
-characters (space and tab), which may cause a parse error during tokenising if
-the file contains odd characters as separators, such as carriage returns,
-vertical tabs and form feeds.
-.IP \[bu]
-.BR su (1)
-is no longer used to run commands in the chroot; this is done by dchroot
-internally.  This change may cause subtle differences.  If you find an
-incompatibility, please report it so it may be corrected.
-.IP \[bu]
-dchroot provides a restricted subset of the functionality implemented by
-\fBschroot\fP, but is still schroot underneath.  Thus dchroot is still subject
-to schroot security checking, including PAM authentication and authorisation,
-and session management, for example, and hence may behave slightly differently
-to older dchroot versions in some circumstances.
-.SS DSA dchroot
-Machines run by the Debian System Administrators for the Debian Project have a
-\fBdchroot-dsa\fP package which provides an alternate dchroot implementation.
-.IP \[bu]
-All the above incompatibilities apply.
-.IP \[bu]
-This version of dchroot has incompatible command-line options, and while some
-of those options are supported or have equivalent options by a different name,
-the \fI\-c\fP option is not required to specify a chroot, and this version of
-dchroot cannot implement this behaviour in a backward-compatible manner
-(because if \fI\-c\fP is omitted, the default chroot is used).  DSA dchroot
-uses the first non-option as the chroot to use, only allowing one chroot to be
-used at once.
-.IP \[bu]
-This version of dchroot has an incompatible format for \fIdchroot.conf\fP.
-While the first two fields are the same, the remaining fields are an optional
-\f[CBI]users\fP, a list of users permitted to access the chroot, instead of the
-\f[CI]personality\fP field allowed by this version.  If access restrictions are
-needed, please use \fI@SCHROOT_CONF@\fP and add the allowed users there, as
-shown in \[lq]\fIMigration\fP\[rq] below.
-.SH MIGRATION
-To migrate an existing \fBdchroot\fP configuration to \fBschroot\fP, perform
-the following steps:
-.IP 1
-Dump the dchroot configuration in schroot keyfile format to
-\fI@SCHROOT_CONF@\fP.
-.PP
-.RS
-\f[CR]# \f[CB]dchroot --config >> @SCHROOT_CONF@
-.br
-.RE
-.PP
-.IP 2
-Edit \fI@SCHROOT_CONF@\fP to add access to the users and/or groups which are to
-be allowed to access the chroots, and make any other desired changes to the
-configuration.  See
-.BR schroot.conf (5).
-.IP 3
-Remove \fI@DCHROOT_CONF@\fP, so that dchroot will subsequently use
-\fI@SCHROOT_CONF@\fP for its configuration.
-.SH EXAMPLES
-\f[CR]$ \f[CB]dchroot \-l\fP\fP
-.br
-\f[CR]Available chroots: sarge [default], sid\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]$ \f[CB]dchroot \-p sid\fP\fP
-.br
-\f[CR]/srv/chroot/sid\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]$ \f[CB]dchroot \-q \-c sid \-\- uname \-smr\fP\fP
-.br
-\f[CR]Linux 2.6.16.17 ppc\fP
-.br
-\f[CR]$ \f[CB]dchroot \-q \-c sid \-\- "uname \-smr"\fP\fP
-.br
-\f[CR]Linux 2.6.16.17 ppc\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]$ \f[CB]dchroot -q -c sid "ls -1 / | tac | head -n 4"\fP\fP
-.br
-\f[CR]var\fP
-.br
-\f[CR]usr\fP
-.br
-\f[CR]tmp\fP
-.br
-\f[CR]sys\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]$ \f[CB]dchroot \-c sid\fP\fP
-.br
-\f[CR]I: [sid chroot] Running login shell: \[lq]/bin/bash\[rq]\fP
-.br
-\f[CR]$ \fP
-.br
-.LP
-Use \fI\-\-\fP to allow options beginning with \[oq]\-\[cq] or \[oq]\-\-\[cq]
-in the command to run in the chroot.  This prevents them being interpreted as
-options for dchroot itself.  Note that the top line was echoed to standard
-error, and the remaining lines to standard output.  This is intentional, so
-that program output from commands run in the chroot may be piped and redirected
-as required; the data will be the same as if the command was run directly on
-the host system.
-.SH TROUBLESHOOTING
-If something is not working, and it's not clear from the error messages what is
-wrong, try using the \fB\-\-debug=\fP\fIlevel\fP option to turn on debugging
-messages.  This gives a great deal more information.  Valid debug levels are
-\[oq]none\[cq], and \[oq]notice\[cq], \[oq]info\[cq], \[oq]warning\[cq] and
-\[oq]critical\[cq] in order of increasing severity.  The lower the severity
-level, the more output.
-.PP
-If you are still having trouble, the developers may be contacted on the mailing
-list:
-.br
-\f[CR]Debian\ buildd-tools\ Developers
-.br
-<buildd-tools-devel@lists.alioth.debian.org>\fP
-.SH BUGS
-On the \fBmips\fP and \fBmipsel\fP architectures, Linux kernels up to and
-including at least version 2.6.17 have broken
-.BR personality (2)
-support, which results in a failure to set the personality.  This will be seen
-as an \[lq]Operation not permitted\[rq] (EPERM) error.  To work around this
-problem, set \f[CI]personality\fP to \[oq]undefined\[cq], or upgrade to a more
-recent kernel.
-.SH FILES
-.TP
-\f[BI]@DCHROOT_CONF@\fP
-The system-wide \fBdchroot\fP chroot definition file.  This file must be owned
-by the root user, and not be writable by other.  If present, this file will be
-used in preference to \fI@SCHROOT_CONF@\fP.
-.TP
-\f[BI]@SCHROOT_CONF@\fP
-The system-wide \fBschroot\fP definition file.  This file must be owned by the
-root user, and not be writable by other.  It is recommended that this file be
-used in preference to \fI@DCHROOT_CONF@\fP, because the chroots can be used
-interchangeably with schroot, and the user and group security policies provided
-by schroot are also enforced.
-.SH AUTHORS
-Roger Leigh.
-.PP
-This implementation of dchroot uses the same command-line options as the
-original \fBdchroot\fP by David Kimdon \f[CR]<dwhedon@debian.org>\fP, but is an
-independent implementation.
-.SH COPYRIGHT
-Copyright \(co 2005\-2010  Roger Leigh \f[CR]<rleigh@debian.org>\fP
-.PP
-\fBdchroot\fP 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 3 of the License, or (at your option) any later
-version.
-.SH SEE ALSO
-.BR schroot (1),
-.BR sbuild (1),
-.BR chroot (2),
-.BR schroot-setup (5),
-.BR schroot.conf (5).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff -Nru schroot-1.4.23/man/dchroot.1.man schroot-1.4.25/man/dchroot.1.man
--- schroot-1.4.23/man/dchroot.1.man	1970-01-01 00:00:00.000000000 +0000
+++ schroot-1.4.25/man/dchroot.1.man	2012-01-23 09:53:35.000000000 +0000
@@ -0,0 +1,312 @@
+.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
+.\"
+.\" schroot 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 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" schroot 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, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
+.so config.man
+.ds PROGRAM dchroot
+.TH DCHROOT 1 "\*[RELEASE_DATE]" "Version \*[VERSION]" "Debian sbuild"
+.SH NAME
+dchroot \- enter a chroot environment
+.SH SYNOPSIS
+.B dchroot
+.RB [ \-h \[or] \-\-help " \[or] " \-V \[or] \-\-version
+.RB " \[or] " \-l \[or] \-\-list " \[or] " \-i \[or] \-\-info
+.RB " \[or] " \-\-config " \[or] " \-\-location ]
+.RB [ "\-\-directory=\fIdirectory\fP" ]
+.RB [ \-d \[or] \-\-preserve\-environment ]
+.RB [ \-q \[or] \-\-quiet " \[or] " \-v \[or] \-\-verbose ]
+.RB [ "\-c \fIchroot\fP" \[or] "\-\-chroot=\fIchroot\fP"
+.RB " \[or] " \-\-all ]
+.RB [ COMMAND " [ " ARG1 " [ " ARG2 " [ " ARGn ]]]]
+.SH DESCRIPTION
+\fBdchroot\fP allows the user to run a command or a login shell in a chroot
+environment.  If no command is specified, a login shell will be started in the
+user's home directory inside the chroot.
+.PP
+The command is one or more arguments which will be run in the user's default
+shell using its \fI\-c\fP option.  As a result, shell code may be embedded
+in this argument.  If multiple command options are used, they are concatenated
+together, separated by spaces.  Users should be aware of the shell quoting
+issues this presents, and should use \fBschroot\fP if necessary, which does not
+have any quoting issues.
+.PP
+The directory the command or login shell is run in depends upon the context.
+See \fI\-\-directory\fP option below for a complete description.
+.PP
+This version of dchroot is a compatibility wrapper around the
+.BR schroot (1)
+program.  It is provided for backward compatibility with the dchroot
+command-line options, but schroot is recommended for future use.  See the
+section \[lq]\fIMigration\fP\[rq] below for help migrating an existing dchroot
+configuration to schroot.  See the section \[lq]\fIIncompatibilities\fP\[rq]
+below for known incompatibilities with older versions of dchroot.
+.PP
+If no chroot is specified, the chroot name or alias \[oq]default\[cq] will be
+used as a fallback.  If using the configuration in \fI\*[DCHROOT_CONF]\fP, the
+first chroot in the file is the default.
+.SH OPTIONS
+\fBdchroot\fP accepts the following options:
+.SS Basic options
+.TP
+.BR \-h ", " \-\-help
+Show help summary.
+.TP
+.BR \-a ", " \-\-all
+Select all chroots.
+.TP
+.BR \-c ", " \-\-chroot=\fIchroot\fP
+Specify a chroot to use.  This option may be used multiple times to specify
+more than one chroot, in which case its effect is similar to \fI\-\-all\fP.
+.TP
+.BR \-l ", " \-\-list
+List all available chroots.
+.TP
+.BR \-i ", " \-\-info
+Print detailed information about the specified chroots.  Note that earlier
+versions of dchroot did not include this option.
+.TP
+.BR \-p ", " \-\-path
+Print location (path) of the specified chroots.
+.TP
+.BR \-\-config
+Print configuration of the specified chroots.  This is useful for testing that
+the configuration in use is the same as the configuration file.  Any comments
+in the original file will be missing.  Note that earlier versions of dchroot
+did not include this option.
+.TP
+.BR \-\-directory=\fIdirectory\fP
+Change to \fIdirectory\fP inside the chroot before running the command or login
+shell.  If \fIdirectory\fP is not available, dchroot will exit with an error
+status.
+.IP
+The default behaviour is as follows (all directory paths are inside the
+chroot).  Unless the \fI\-\-preserve\-environment\fP option is used to preserve
+the environment, the login shell or command will run in the user's home
+directory, or \fI/\fP if the home directory is not available.  When the
+\fI\-\-preserve\-environment\fP option is used, it will attempt to use the
+current working directory, again falling back to \fI/\fP if it is not
+accessible.  If none of the directories are available, dchroot will exit with
+an error status.
+.TP
+.BR \-d ", " \-\-preserve\-environment
+Preserve the user's environment inside the chroot environment.  The default is
+to use a clean environment; this option copies the entire user environment and
+sets it in the session.
+.TP
+.BR \-q ", " \-\-quiet
+Print only essential messages.
+.TP
+.BR \-v ", " \-\-verbose
+Print all messages.  Note that earlier versions of dchroot did not include this
+option.
+.TP
+.BR \-V ", " \-\-version
+Print version information.
+.PP
+Note that earlier versions of dchroot did not provide long options.
+.SH CONFIGURATION
+The dchroot configuration file, \fI\*[DCHROOT_CONF]\fP, used by earlier versions
+of dchroot, has the following format:
+.IP \[bu]
+\[oq]#\[cq] starts a comment line.
+.IP \[bu]
+Blank lines are ignored.
+.IP \[bu]
+Chroot definitions are a single line containing an \f[CBI]identifier\fP,
+\f[CBI]path\fP, and an optional \f[CBI]personality\fP separated by whitespace.
+.IP \[bu]
+The first chroot is also the default chroot.
+.PP
+An example file:
+.PP
+.RS
+\f[CR]# Example comment\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]sarge /srv/chroot/sarge\fP
+.br
+\f[CR]sid /srv/chroot/sid linux32\fP
+.br
+.RE
+.PP
+This file defines a chroot called \[oq]sarge\[cq], located at
+\fI/srv/chroot/sarge\fP, and a second chroot called \[oq]sid\[cq], located at
+\fI/srv/chroot/sid\fP.  The second chroot uses the \[oq]linux32\[cq]
+personality, which allows a 32-bit chroot to be used on a 64-bit system.
+\[oq]sarge\[cq] is the default chroot, because it was listed first, which means
+if the \fI\-c\fP option is omitted this chroot will be used.
+.SH INCOMPATIBILITIES
+.SS Debian dchroot prior to version 0.99.0
+.IP \[bu]
+Log messages are worded and formatted differently.
+.IP \[bu]
+The parsing of \fI\*[DCHROOT_CONF]\fP uses a smaller list of allowed whitespace
+characters (space and tab), which may cause a parse error during tokenising if
+the file contains odd characters as separators, such as carriage returns,
+vertical tabs and form feeds.
+.IP \[bu]
+.BR su (1)
+is no longer used to run commands in the chroot; this is done by dchroot
+internally.  This change may cause subtle differences.  If you find an
+incompatibility, please report it so it may be corrected.
+.IP \[bu]
+dchroot provides a restricted subset of the functionality implemented by
+\fBschroot\fP, but is still schroot underneath.  Thus dchroot is still subject
+to schroot security checking, including PAM authentication and authorisation,
+and session management, for example, and hence may behave slightly differently
+to older dchroot versions in some circumstances.
+.SS DSA dchroot
+Machines run by the Debian System Administrators for the Debian Project have a
+\fBdchroot-dsa\fP package which provides an alternate dchroot implementation.
+.IP \[bu]
+All the above incompatibilities apply.
+.IP \[bu]
+This version of dchroot has incompatible command-line options, and while some
+of those options are supported or have equivalent options by a different name,
+the \fI\-c\fP option is not required to specify a chroot, and this version of
+dchroot cannot implement this behaviour in a backward-compatible manner
+(because if \fI\-c\fP is omitted, the default chroot is used).  DSA dchroot
+uses the first non-option as the chroot to use, only allowing one chroot to be
+used at once.
+.IP \[bu]
+This version of dchroot has an incompatible format for \fIdchroot.conf\fP.
+While the first two fields are the same, the remaining fields are an optional
+\f[CBI]users\fP, a list of users permitted to access the chroot, instead of the
+\f[CI]personality\fP field allowed by this version.  If access restrictions are
+needed, please use \fI\*[SCHROOT_CONF]\fP and add the allowed users there, as
+shown in \[lq]\fIMigration\fP\[rq] below.
+.SH MIGRATION
+To migrate an existing \fBdchroot\fP configuration to \fBschroot\fP, perform
+the following steps:
+.IP 1
+Dump the dchroot configuration in schroot keyfile format to
+\fI\*[SCHROOT_CONF]\fP.
+.PP
+.RS
+\f[CR]# \f[CB]dchroot --config >> \*[SCHROOT_CONF]
+.br
+.RE
+.PP
+.IP 2
+Edit \fI\*[SCHROOT_CONF]\fP to add access to the users and/or groups which are to
+be allowed to access the chroots, and make any other desired changes to the
+configuration.  See
+.BR schroot.conf (5).
+.IP 3
+Remove \fI\*[DCHROOT_CONF]\fP, so that dchroot will subsequently use
+\fI\*[SCHROOT_CONF]\fP for its configuration.
+.SH EXAMPLES
+\f[CR]$ \f[CB]dchroot \-l\fP\fP
+.br
+\f[CR]Available chroots: sarge [default], sid\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]$ \f[CB]dchroot \-p sid\fP\fP
+.br
+\f[CR]/srv/chroot/sid\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]$ \f[CB]dchroot \-q \-c sid \-\- uname \-smr\fP\fP
+.br
+\f[CR]Linux 2.6.16.17 ppc\fP
+.br
+\f[CR]$ \f[CB]dchroot \-q \-c sid \-\- "uname \-smr"\fP\fP
+.br
+\f[CR]Linux 2.6.16.17 ppc\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]$ \f[CB]dchroot -q -c sid "ls -1 / | tac | head -n 4"\fP\fP
+.br
+\f[CR]var\fP
+.br
+\f[CR]usr\fP
+.br
+\f[CR]tmp\fP
+.br
+\f[CR]sys\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]$ \f[CB]dchroot \-c sid\fP\fP
+.br
+\f[CR]I: [sid chroot] Running login shell: \[lq]/bin/bash\[rq]\fP
+.br
+\f[CR]$ \fP
+.br
+.LP
+Use \fI\-\-\fP to allow options beginning with \[oq]\-\[cq] or \[oq]\-\-\[cq]
+in the command to run in the chroot.  This prevents them being interpreted as
+options for dchroot itself.  Note that the top line was echoed to standard
+error, and the remaining lines to standard output.  This is intentional, so
+that program output from commands run in the chroot may be piped and redirected
+as required; the data will be the same as if the command was run directly on
+the host system.
+.SH TROUBLESHOOTING
+If something is not working, and it's not clear from the error messages what is
+wrong, try using the \fB\-\-debug=\fP\fIlevel\fP option to turn on debugging
+messages.  This gives a great deal more information.  Valid debug levels are
+\[oq]none\[cq], and \[oq]notice\[cq], \[oq]info\[cq], \[oq]warning\[cq] and
+\[oq]critical\[cq] in order of increasing severity.  The lower the severity
+level, the more output.
+.PP
+If you are still having trouble, the developers may be contacted on the mailing
+list:
+.br
+\f[CR]Debian\ buildd-tools\ Developers
+.br
+<buildd-tools-devel@lists.alioth.debian.org>\fP
+.SH BUGS
+On the \fBmips\fP and \fBmipsel\fP architectures, Linux kernels up to and
+including at least version 2.6.17 have broken
+.BR personality (2)
+support, which results in a failure to set the personality.  This will be seen
+as an \[lq]Operation not permitted\[rq] (EPERM) error.  To work around this
+problem, set \f[CI]personality\fP to \[oq]undefined\[cq], or upgrade to a more
+recent kernel.
+.SH FILES
+.TP
+\f[BI]\*[DCHROOT_CONF]\fP
+The system-wide \fBdchroot\fP chroot definition file.  This file must be owned
+by the root user, and not be writable by other.  If present, this file will be
+used in preference to \fI\*[SCHROOT_CONF]\fP.
+.TP
+\f[BI]\*[SCHROOT_CONF]\fP
+The system-wide \fBschroot\fP definition file.  This file must be owned by the
+root user, and not be writable by other.  It is recommended that this file be
+used in preference to \fI\*[DCHROOT_CONF]\fP, because the chroots can be used
+interchangeably with schroot, and the user and group security policies provided
+by schroot are also enforced.
+.so authors.man
+.PP
+This implementation of dchroot uses the same command-line options as the
+original \fBdchroot\fP by David Kimdon \f[CR]<dwhedon@debian.org>\fP, but is an
+independent implementation.
+.so copyright.man
+.SH SEE ALSO
+.BR schroot (1),
+.BR sbuild (1),
+.BR chroot (2),
+.BR schroot-setup (5),
+.BR schroot.conf (5).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff -Nru schroot-1.4.23/man/dchroot-dsa.1.in schroot-1.4.25/man/dchroot-dsa.1.in
--- schroot-1.4.23/man/dchroot-dsa.1.in	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/man/dchroot-dsa.1.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,269 +0,0 @@
-.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
-.\"
-.\" schroot 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 3 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" schroot 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, see
-.\" <http://www.gnu.org/licenses/>.
-.\"
-.TH DCHROOT-DSA 1 "@RELEASE_DATE_S@" "Version @VERSION@" "Debian sbuild"
-.SH NAME
-dchroot\-dsa \- enter a chroot environment
-.SH SYNOPSIS
-.B dchroot\-dsa
-.RB [ \-h \[or] \-\-help " \[or] " \-V \[or] \-\-version
-.RB " \[or] " \-l \[or] \-\-list " \[or] " \-i \[or] \-\-info
-.RB " \[or] " \-\-config " \[or] " -p | \-\-listpaths ]
-.RB [ "\-d \fIdirectory\fP" \[or] "\-\-directory=\fIdirectory\fP" ]
-.RB [ \-q \[or] \-\-quiet " \[or] " \-v \[or] \-\-verbose ]
-.RB [ "\-c \fIchroot\fP" \[or] "\-\-chroot=\fIchroot\fP"
-.RB " \[or] " \-\-all " \[or] " CHROOT]
-.RB [ COMMAND ]
-.SH DESCRIPTION
-\fBdchroot\-dsa\fP allows the user to run a command or a login shell in a
-chroot environment.  If no command is specified, a login shell will be started
-in the user's home directory inside the chroot.
-.PP
-The user's environment will be preserved inside the chroot.
-.PP
-The command is a single argument which must be an absolute path to the program.
-Additional options are not permitted.
-.PP
-The directory the command or login shell is run in depends upon the context.
-See \fI\-\-directory\fP option below for a complete description.
-.PP
-This version of dchroot\-dsa is a compatibility wrapper around the
-.BR schroot (1)
-program.  It is provided for backward compatibility with the dchroot\-dsa
-command-line options, but schroot is recommended for future use.  See the
-section \[lq]\fIMigration\fP\[rq] below for help migrating your existing
-dchroot\-dsa configuration to schroot.  See the section
-\[lq]\fIIncompatibilities\fP\[rq] below for known incompatibilities with older
-versions of dchroot\-dsa.
-.PP
-.SH OPTIONS
-\fBdchroot\-dsa\fP accepts the following options:
-.SS Basic options
-.TP
-.BR \-h ", " \-\-help
-Show help summary.
-.TP
-.BR \-a ", " \-\-all
-Select all chroots.  Note that earlier versions of dchroot\-dsa did not include
-this option.
-.TP
-.BR \-c ", " \-\-chroot=\fIchroot\fP
-Specify a chroot to use.  This option may be used multiple times to specify
-more than one chroot, in which case its effect is similar to \fI\-\-all\fP.  If
-this option is not used, the first non-option argument specified the chroot to
-use.  Note that earlier versions of dchroot\-dsa did not include this option.
-.TP
-.BR \-l ", " \-\-list
-List all available chroots.
-.TP
-.BR \-i ", " \-\-info
-Print detailed information about the available chroots.  Note that earlier
-versions of dchroot\-dsa did not include this option.
-.TP
-.BR \-p ", " \-\-listpaths
-Print absolute locations (paths) of the available chroots.
-.TP
-.BR \-\-config
-Print configuration of the available chroots.  This is useful for testing that
-the configuration in use is the same as the configuration file.  Any comments
-in the original file will be missing.  Note that earlier versions of
-dchroot\-dsa did not include this option.
-.TP
-.BR \-d ", " \-\-directory=\fIdirectory\fP
-Change to \fIdirectory\fP inside the chroot before running the command or login
-shell.  If \fIdirectory\fP is not available, dchroot\-dsa will exit with an
-error status.
-.IP
-The default behaviour (all directory paths are inside the chroot) is to run the
-login shell or command in the user's home directory, or \fI/\fP if the home
-directory is not available.  If none of the directories are available,
-dchroot\-dsa will exit with an error status.
-.TP
-.BR \-q ", " \-\-quiet
-Print only essential messages.  Note that earlier versions of dchroot\-dsa did
-not include this option.
-.TP
-.BR \-v ", " \-\-verbose
-Print all messages.  Note that earlier versions of dchroot\-dsa did not include
-this option.
-.TP
-.BR \-V ", " \-\-version
-Print version information.
-.SH CONFIGURATION
-The original \fBdchroot\-dsa\fP configuration file, \fI@DCHROOT_CONF@\fP, used
-by earlier versions of dchroot\-dsa, has the following format:
-.IP \[bu]
-\[oq]#\[cq] starts a comment line.
-.IP \[bu]
-Blank lines are ignored.
-.IP \[bu]
-Chroot definitions are a single line containing an \f[CBI]identifier\fP,
-\f[CBI]path\fP, and \f[CBI]users\fP, an optional user list separated by
-whitespace (space and tab), or a colon (\[oq]:\[cq]), semicolon (\[oq];\[cq]),
-or comma (\[oq],\[cq]).
-.PP
-An example file:
-.PP
-.RS
-\f[CR]# Example comment\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]sarge /srv/chroot/sarge\fP
-.br
-\f[CR]sid /srv/chroot/sid rleigh,fred\fP
-.br
-.RE
-.PP
-This file defines a chroot called \[oq]sarge\[cq], located at
-\fI/srv/chroot/sarge\fP, and a second chroot called \[oq]sid\[cq], located at
-\fI/srv/chroot/sid\fP.  The second chroot specifies that it may only be used by
-the users \[lq]rleigh\[rq] and \[lq]fred\[rq].
-.SH INCOMPATIBILITIES
-.SS DSA dchroot 
-.IP \[bu]
-Log messages are worded and formatted differently.
-.IP \[bu]
-dchroot\-dsa provides a restricted subset of the functionality implemented by
-\fBschroot\fP, but is still schroot underneath.  Thus dchroot\-dsa is still
-subject to schroot security checking, including PAM authentication and
-authorisation, and session management, for example, and hence may behave
-slightly differently to earlier versions of dchroot\-dsa in some circumstances.
-.SS Debian dchroot
-A \fBdchroot\fP package provides an alternative dchroot implementation.
-.IP \[bu]
-All the above incompatibilities apply.
-.IP \[bu]
-This version of dchroot has incompatible command-line options, and while some
-of those options are supported or have equivalent options by a different name,
-the \fI\-c\fP option is required to specify a chroot.  It also allows a shell
-script to be used as the option instead of a single absolute path, and allows
-multiple command options instead of a single option.
-.IP \[bu]
-This version of dchroot has an incompatible format for \fIdchroot.conf\fP.
-While the first two fields are the same, the third field is a optional
-\f[CBI]personality\fP, instead of the \f[CI]users\fP user list permitted to
-access the chroot allowed by this version.  If personality support is needed,
-please use \fIschroot.conf\fP and add the allowed users there, as shown in
-\[lq]\fIMigration\fP\[rq] below.
-.SH MIGRATION
-To migrate an existing \fBdchroot\-dsa\fP configuration to \fBschroot\fP,
-perform the following steps:
-.IP 1
-Dump the dchroot\-dsa configuration in schroot keyfile format to
-\fI@SCHROOT_CONF@\fP.
-.PP
-.RS
-\f[CR]# \f[CB]dchroot\-dsa --config >> @SCHROOT_CONF@
-.br
-.RE
-.PP
-.IP 2
-Edit \fI@SCHROOT_CONF@\fP to add access to the users and/or groups which are to
-be allowed to access the chroots, and make any other desired changes to the
-configuration.  See
-.BR schroot.conf (5).
-.IP 3
-Remove \fI@DCHROOT_CONF@\fP, so that dchroot\-dsa will subsequently use
-\fI@SCHROOT_CONF@\fP for its configuration.
-.SH EXAMPLES
-\f[CR]$ \f[CB]dchroot\-dsa -l\fP\fP
-.br
-\f[CR]Available chroots: sarge, sid\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]$ \f[CB]dchroot\-dsa \-\-listpaths\fP\fP
-.br
-\f[CR]/srv/chroot/sarge\fP
-.br
-\f[CR]/srv/chroot/sid\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]$ \f[CB]dchroot\-dsa \-q sid \-\- /bin/uname\fP\fP
-.br
-\f[CR]Linux\fP
-.br
-\f[CR]\fP
-.br
-\f[CR]$ \f[CB]dchroot\-dsa sid\fP\fP
-.br
-\f[CR]I: [sid chroot] Running login shell: \[lq]/bin/bash\[rq]\fP
-.br
-\f[CR]$ \fP
-.br
-.LP
-Note that the top line was echoed to standard error, and the remaining lines to
-standard output.  This is intentional, so that program output from commands run
-in the chroot may be piped and redirected as required; the data will be the
-same as if the command was run directly on the host system.
-.SH TROUBLESHOOTING
-If something is not working, and it's not clear from the error messages what is
-wrong, try using the \fB\-\-debug=\fP\fIlevel\fP option to turn on debugging
-messages.  This gives a great deal more information.  Valid debug levels are
-\[oq]none\[cq], and \[oq]notice\[cq], \[oq]info\[cq], \[oq]warning\[cq] and
-\[oq]critical\[cq] in order of increasing severity.  The lower the severity
-level, the more output.
-.PP
-If you are still having trouble, the developers may be contacted on the mailing
-list:
-.br
-\f[CR]Debian\ buildd-tools\ Developers
-.br
-<buildd-tools-devel@lists.alioth.debian.org>\fP
-.SH BUGS
-None known at this time.
-.SH FILES
-.TP
-\f[BI]@DCHROOT_CONF@\fP
-The system-wide \fBdchroot\-dsa\fP chroot definition file.  This file must be
-owned by the root user, and not be writable by other.  If present, this file
-will be used in preference to \fI@SCHROOT_CONF@\fP.
-.TP
-\f[BI]@SCHROOT_CONF@\fP
-The system-wide \fBschroot\fP definition file.  This file must be owned by the
-root user, and not be writable by other.  It is recommended that this file be
-used in preference to \fI@DCHROOT_CONF@\fP, because the chroots can be used
-interchangeably with schroot, and the user and group security policies provided
-by schroot are also enforced.
-.SH AUTHORS
-Roger Leigh.
-.PP
-This implementation of dchroot\-dsa uses the same command-line options as
-the \fBdchroot\fP found on machines run by the Debian System Administrators for
-the Debian Project.  These machines have a \fBdchroot-dsa\fP source package
-which provides a \fBdchroot\-dsa\fP package, written by Ben Collins
-\f[CR]<bcollins@debian.org>\fP and Martin Schulze \f[CR]<joey@debian.org>\fP.
-.SH COPYRIGHT
-Copyright \(co 2005\-2010  Roger Leigh \f[CR]<rleigh@debian.org>\fP
-.PP
-\fBdchroot-dsa\fP 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 3 of the License, or (at your option) any
-later version.
-.SH SEE ALSO
-.BR schroot (1),
-.BR sbuild (1),
-.BR chroot (2),
-.BR schroot-setup (5),
-.BR schroot.conf (5).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff -Nru schroot-1.4.23/man/dchroot-dsa.1.man schroot-1.4.25/man/dchroot-dsa.1.man
--- schroot-1.4.23/man/dchroot-dsa.1.man	1970-01-01 00:00:00.000000000 +0000
+++ schroot-1.4.25/man/dchroot-dsa.1.man	2012-01-23 09:53:35.000000000 +0000
@@ -0,0 +1,264 @@
+.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
+.\"
+.\" schroot 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 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" schroot 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, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
+.so config.man
+.ds PROGRAM dchroot\-dsa
+.TH DCHROOT-DSA 1 "\*[RELEASE_DATE]" "Version \*[VERSION]" "Debian sbuild"
+.SH NAME
+dchroot\-dsa \- enter a chroot environment
+.SH SYNOPSIS
+.B dchroot\-dsa
+.RB [ \-h \[or] \-\-help " \[or] " \-V \[or] \-\-version
+.RB " \[or] " \-l \[or] \-\-list " \[or] " \-i \[or] \-\-info
+.RB " \[or] " \-\-config " \[or] " -p | \-\-listpaths ]
+.RB [ "\-d \fIdirectory\fP" \[or] "\-\-directory=\fIdirectory\fP" ]
+.RB [ \-q \[or] \-\-quiet " \[or] " \-v \[or] \-\-verbose ]
+.RB [ "\-c \fIchroot\fP" \[or] "\-\-chroot=\fIchroot\fP"
+.RB " \[or] " \-\-all " \[or] " CHROOT]
+.RB [ COMMAND ]
+.SH DESCRIPTION
+\fBdchroot\-dsa\fP allows the user to run a command or a login shell in a
+chroot environment.  If no command is specified, a login shell will be started
+in the user's home directory inside the chroot.
+.PP
+The user's environment will be preserved inside the chroot.
+.PP
+The command is a single argument which must be an absolute path to the program.
+Additional options are not permitted.
+.PP
+The directory the command or login shell is run in depends upon the context.
+See \fI\-\-directory\fP option below for a complete description.
+.PP
+This version of dchroot\-dsa is a compatibility wrapper around the
+.BR schroot (1)
+program.  It is provided for backward compatibility with the dchroot\-dsa
+command-line options, but schroot is recommended for future use.  See the
+section \[lq]\fIMigration\fP\[rq] below for help migrating your existing
+dchroot\-dsa configuration to schroot.  See the section
+\[lq]\fIIncompatibilities\fP\[rq] below for known incompatibilities with older
+versions of dchroot\-dsa.
+.PP
+.SH OPTIONS
+\fBdchroot\-dsa\fP accepts the following options:
+.SS Basic options
+.TP
+.BR \-h ", " \-\-help
+Show help summary.
+.TP
+.BR \-a ", " \-\-all
+Select all chroots.  Note that earlier versions of dchroot\-dsa did not include
+this option.
+.TP
+.BR \-c ", " \-\-chroot=\fIchroot\fP
+Specify a chroot to use.  This option may be used multiple times to specify
+more than one chroot, in which case its effect is similar to \fI\-\-all\fP.  If
+this option is not used, the first non-option argument specified the chroot to
+use.  Note that earlier versions of dchroot\-dsa did not include this option.
+.TP
+.BR \-l ", " \-\-list
+List all available chroots.
+.TP
+.BR \-i ", " \-\-info
+Print detailed information about the available chroots.  Note that earlier
+versions of dchroot\-dsa did not include this option.
+.TP
+.BR \-p ", " \-\-listpaths
+Print absolute locations (paths) of the available chroots.
+.TP
+.BR \-\-config
+Print configuration of the available chroots.  This is useful for testing that
+the configuration in use is the same as the configuration file.  Any comments
+in the original file will be missing.  Note that earlier versions of
+dchroot\-dsa did not include this option.
+.TP
+.BR \-d ", " \-\-directory=\fIdirectory\fP
+Change to \fIdirectory\fP inside the chroot before running the command or login
+shell.  If \fIdirectory\fP is not available, dchroot\-dsa will exit with an
+error status.
+.IP
+The default behaviour (all directory paths are inside the chroot) is to run the
+login shell or command in the user's home directory, or \fI/\fP if the home
+directory is not available.  If none of the directories are available,
+dchroot\-dsa will exit with an error status.
+.TP
+.BR \-q ", " \-\-quiet
+Print only essential messages.  Note that earlier versions of dchroot\-dsa did
+not include this option.
+.TP
+.BR \-v ", " \-\-verbose
+Print all messages.  Note that earlier versions of dchroot\-dsa did not include
+this option.
+.TP
+.BR \-V ", " \-\-version
+Print version information.
+.SH CONFIGURATION
+The original \fBdchroot\-dsa\fP configuration file, \fI\*[DCHROOT_CONF]\fP, used
+by earlier versions of dchroot\-dsa, has the following format:
+.IP \[bu]
+\[oq]#\[cq] starts a comment line.
+.IP \[bu]
+Blank lines are ignored.
+.IP \[bu]
+Chroot definitions are a single line containing an \f[CBI]identifier\fP,
+\f[CBI]path\fP, and \f[CBI]users\fP, an optional user list separated by
+whitespace (space and tab), or a colon (\[oq]:\[cq]), semicolon (\[oq];\[cq]),
+or comma (\[oq],\[cq]).
+.PP
+An example file:
+.PP
+.RS
+\f[CR]# Example comment\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]sarge /srv/chroot/sarge\fP
+.br
+\f[CR]sid /srv/chroot/sid rleigh,fred\fP
+.br
+.RE
+.PP
+This file defines a chroot called \[oq]sarge\[cq], located at
+\fI/srv/chroot/sarge\fP, and a second chroot called \[oq]sid\[cq], located at
+\fI/srv/chroot/sid\fP.  The second chroot specifies that it may only be used by
+the users \[lq]rleigh\[rq] and \[lq]fred\[rq].
+.SH INCOMPATIBILITIES
+.SS DSA dchroot
+.IP \[bu]
+Log messages are worded and formatted differently.
+.IP \[bu]
+dchroot\-dsa provides a restricted subset of the functionality implemented by
+\fBschroot\fP, but is still schroot underneath.  Thus dchroot\-dsa is still
+subject to schroot security checking, including PAM authentication and
+authorisation, and session management, for example, and hence may behave
+slightly differently to earlier versions of dchroot\-dsa in some circumstances.
+.SS Debian dchroot
+A \fBdchroot\fP package provides an alternative dchroot implementation.
+.IP \[bu]
+All the above incompatibilities apply.
+.IP \[bu]
+This version of dchroot has incompatible command-line options, and while some
+of those options are supported or have equivalent options by a different name,
+the \fI\-c\fP option is required to specify a chroot.  It also allows a shell
+script to be used as the option instead of a single absolute path, and allows
+multiple command options instead of a single option.
+.IP \[bu]
+This version of dchroot has an incompatible format for \fIdchroot.conf\fP.
+While the first two fields are the same, the third field is a optional
+\f[CBI]personality\fP, instead of the \f[CI]users\fP user list permitted to
+access the chroot allowed by this version.  If personality support is needed,
+please use \fIschroot.conf\fP and add the allowed users there, as shown in
+\[lq]\fIMigration\fP\[rq] below.
+.SH MIGRATION
+To migrate an existing \fBdchroot\-dsa\fP configuration to \fBschroot\fP,
+perform the following steps:
+.IP 1
+Dump the dchroot\-dsa configuration in schroot keyfile format to
+\fI\*[SCHROOT_CONF]\fP.
+.PP
+.RS
+\f[CR]# \f[CB]dchroot\-dsa --config >> \*[SCHROOT_CONF]
+.br
+.RE
+.PP
+.IP 2
+Edit \fI\*[SCHROOT_CONF]\fP to add access to the users and/or groups which are to
+be allowed to access the chroots, and make any other desired changes to the
+configuration.  See
+.BR schroot.conf (5).
+.IP 3
+Remove \fI\*[DCHROOT_CONF]\fP, so that dchroot\-dsa will subsequently use
+\fI\*[SCHROOT_CONF]\fP for its configuration.
+.SH EXAMPLES
+\f[CR]$ \f[CB]dchroot\-dsa -l\fP\fP
+.br
+\f[CR]Available chroots: sarge, sid\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]$ \f[CB]dchroot\-dsa \-\-listpaths\fP\fP
+.br
+\f[CR]/srv/chroot/sarge\fP
+.br
+\f[CR]/srv/chroot/sid\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]$ \f[CB]dchroot\-dsa \-q sid \-\- /bin/uname\fP\fP
+.br
+\f[CR]Linux\fP
+.br
+\f[CR]\fP
+.br
+\f[CR]$ \f[CB]dchroot\-dsa sid\fP\fP
+.br
+\f[CR]I: [sid chroot] Running login shell: \[lq]/bin/bash\[rq]\fP
+.br
+\f[CR]$ \fP
+.br
+.LP
+Note that the top line was echoed to standard error, and the remaining lines to
+standard output.  This is intentional, so that program output from commands run
+in the chroot may be piped and redirected as required; the data will be the
+same as if the command was run directly on the host system.
+.SH TROUBLESHOOTING
+If something is not working, and it's not clear from the error messages what is
+wrong, try using the \fB\-\-debug=\fP\fIlevel\fP option to turn on debugging
+messages.  This gives a great deal more information.  Valid debug levels are
+\[oq]none\[cq], and \[oq]notice\[cq], \[oq]info\[cq], \[oq]warning\[cq] and
+\[oq]critical\[cq] in order of increasing severity.  The lower the severity
+level, the more output.
+.PP
+If you are still having trouble, the developers may be contacted on the mailing
+list:
+.br
+\f[CR]Debian\ buildd-tools\ Developers
+.br
+<buildd-tools-devel@lists.alioth.debian.org>\fP
+.SH BUGS
+None known at this time.
+.SH FILES
+.TP
+\f[BI]\*[DCHROOT_CONF]\fP
+The system-wide \fBdchroot\-dsa\fP chroot definition file.  This file must be
+owned by the root user, and not be writable by other.  If present, this file
+will be used in preference to \fI\*[SCHROOT_CONF]\fP.
+.TP
+\f[BI]\*[SCHROOT_CONF]\fP
+The system-wide \fBschroot\fP definition file.  This file must be owned by the
+root user, and not be writable by other.  It is recommended that this file be
+used in preference to \fI\*[DCHROOT_CONF]\fP, because the chroots can be used
+interchangeably with schroot, and the user and group security policies provided
+by schroot are also enforced.
+.so authors.man
+.PP
+This implementation of dchroot\-dsa uses the same command-line options as
+the \fBdchroot\fP found on machines run by the Debian System Administrators for
+the Debian Project.  These machines have a \fBdchroot-dsa\fP source package
+which provides a \fBdchroot\-dsa\fP package, written by Ben Collins
+\f[CR]<bcollins@debian.org>\fP and Martin Schulze \f[CR]<joey@debian.org>\fP.
+.so copyright.man
+.SH SEE ALSO
+.BR schroot (1),
+.BR sbuild (1),
+.BR chroot (2),
+.BR schroot-setup (5),
+.BR schroot.conf (5).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff -Nru schroot-1.4.23/man/Makefile.am schroot-1.4.25/man/Makefile.am
--- schroot-1.4.23/man/Makefile.am	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/man/Makefile.am	2012-01-23 09:53:35.000000000 +0000
@@ -33,6 +33,21 @@
 csbuild_mans = csbuild.1
 endif
 
+MAN_FILES = \
+	csbuild.1.man \
+	dchroot.1.man \
+	dchroot-dsa.1.man \
+	schroot.1.man \
+	schroot.conf.5.man \
+	schroot-faq.7.man \
+	schroot-script-config.5.man \
+	schroot-setup.5.man
+
+EXPAND = \
+	config.man \
+	$(srcdir)/authors.man \
+	$(srcdir)/copyright.man
+
 man_MANS =			\
 	schroot.1		\
 	schroot-setup.5		\
@@ -42,3 +57,45 @@
 	$(dchroot_mans)		\
 	$(dchroot_dsa_mans)	\
 	$(csbuild_mans)
+
+EXTRA_DIST = \
+	$(MAN_FILES) \
+	authors.man \
+	copyright.man
+
+CLEANFILES = \
+	config.man \
+	$(basename $(MAN_FILES))
+
+%.1: %.1.man $(EXPAND)
+	$(SOELIM) -I "$(srcdir)" $< >$@
+
+%.5: %.5.man $(EXPAND)
+	$(SOELIM) -I "$(srcdir)" $< >$@
+
+%.7: %.7.man $(EXPAND)
+	$(SOELIM) -I "$(srcdir)" $< >$@
+
+CONFIG =\
+.ds RELEASE_DATE $(RELEASE_DATE_S)\n\
+.ds VERSION $(VERSION)\n\
+.ds SCHROOT_LIBEXEC_DIR $(pkglibexecdir)\n\
+.ds SCHROOT_MOUNT_DIR $(schroot_mountdir)\n\
+.ds SCHROOT_SESSION_DIR $(schroot_sessiondir)\n\
+.ds SCHROOT_FILE_UNPACK_DIR $(schroot_file_unpackdir)\n\
+.ds SCHROOT_OVERLAY_DIR $(schroot_overlaydir)\n\
+.ds SCHROOT_UNDERLAY_DIR $(schroot_underlaydir)\n\
+.ds SCHROOT_SYSCONF_DIR $(schroot_sysconfdir)\n\
+.ds SCHROOT_CONF $(SCHROOT_CONF)\n\
+.ds SCHROOT_CONF_CHROOT_D $(schroot_sysconf_chrootdir)\n\
+.ds SCHROOT_CONF_SETUP_D $(schroot_sysconf_setupdir)\n\
+.ds SCHROOT_DATA_DIR $(pkgdatadir)\n\
+.ds SCHROOT_SETUP_DATA_DIR $(schroot_setupdatadir)\n\
+.ds PACKAGE_LOCALE_DIR $(prefix)/share/locale\n\
+.ds DCHROOT_CONF $(DCHROOT_CONF)\n\
+.ds CSBUILD_CONF $(CSBUILD_CONF)\n\
+.ds PROGRAM schroot
+
+config.man: Makefile
+	echo -e "$(CONFIG)" | sed -e 's/^[ ]//' > $@
+
diff -Nru schroot-1.4.23/man/Makefile.in schroot-1.4.25/man/Makefile.in
--- schroot-1.4.23/man/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/man/Makefile.in	2012-02-03 11:09:05.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -76,11 +76,7 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/csbuild.1.in $(srcdir)/dchroot-dsa.1.in \
-	$(srcdir)/dchroot.1.in $(srcdir)/schroot-faq.7.in \
-	$(srcdir)/schroot-script-config.5.in \
-	$(srcdir)/schroot-setup.5.in $(srcdir)/schroot.1.in \
-	$(srcdir)/schroot.conf.5.in $(top_srcdir)/scripts/global.mk
+	$(top_srcdir)/scripts/global.mk
 subdir = man
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
@@ -96,9 +92,7 @@
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h \
 	$(top_builddir)/sbuild/sbuild-config.h
-CONFIG_CLEAN_FILES = schroot.1 schroot-setup.5 schroot.conf.5 \
-	schroot-script-config.5 schroot-faq.7 dchroot.1 dchroot-dsa.1 \
-	csbuild.1
+CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
@@ -129,6 +123,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
 	"$(DESTDIR)$(man7dir)"
@@ -157,14 +157,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -239,21 +254,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -317,6 +321,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -324,6 +340,21 @@
 @BUILD_DCHROOT_TRUE@dchroot_mans = dchroot.1
 @BUILD_DCHROOT_DSA_TRUE@dchroot_dsa_mans = dchroot-dsa.1
 @BUILD_CSBUILD_TRUE@csbuild_mans = csbuild.1
+MAN_FILES = \
+	csbuild.1.man \
+	dchroot.1.man \
+	dchroot-dsa.1.man \
+	schroot.1.man \
+	schroot.conf.5.man \
+	schroot-faq.7.man \
+	schroot-script-config.5.man \
+	schroot-setup.5.man
+
+EXPAND = \
+	config.man \
+	$(srcdir)/authors.man \
+	$(srcdir)/copyright.man
+
 man_MANS = \
 	schroot.1		\
 	schroot-setup.5		\
@@ -334,6 +365,35 @@
 	$(dchroot_dsa_mans)	\
 	$(csbuild_mans)
 
+EXTRA_DIST = \
+	$(MAN_FILES) \
+	authors.man \
+	copyright.man
+
+CLEANFILES = \
+	config.man \
+	$(basename $(MAN_FILES))
+
+CONFIG = \
+.ds RELEASE_DATE $(RELEASE_DATE_S)\n\
+.ds VERSION $(VERSION)\n\
+.ds SCHROOT_LIBEXEC_DIR $(pkglibexecdir)\n\
+.ds SCHROOT_MOUNT_DIR $(schroot_mountdir)\n\
+.ds SCHROOT_SESSION_DIR $(schroot_sessiondir)\n\
+.ds SCHROOT_FILE_UNPACK_DIR $(schroot_file_unpackdir)\n\
+.ds SCHROOT_OVERLAY_DIR $(schroot_overlaydir)\n\
+.ds SCHROOT_UNDERLAY_DIR $(schroot_underlaydir)\n\
+.ds SCHROOT_SYSCONF_DIR $(schroot_sysconfdir)\n\
+.ds SCHROOT_CONF $(SCHROOT_CONF)\n\
+.ds SCHROOT_CONF_CHROOT_D $(schroot_sysconf_chrootdir)\n\
+.ds SCHROOT_CONF_SETUP_D $(schroot_sysconf_setupdir)\n\
+.ds SCHROOT_DATA_DIR $(pkgdatadir)\n\
+.ds SCHROOT_SETUP_DATA_DIR $(schroot_setupdatadir)\n\
+.ds PACKAGE_LOCALE_DIR $(prefix)/share/locale\n\
+.ds DCHROOT_CONF $(DCHROOT_CONF)\n\
+.ds CSBUILD_CONF $(CSBUILD_CONF)\n\
+.ds PROGRAM schroot
+
 all: all-am
 
 .SUFFIXES:
@@ -367,22 +427,6 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-schroot.1: $(top_builddir)/config.status $(srcdir)/schroot.1.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-schroot-setup.5: $(top_builddir)/config.status $(srcdir)/schroot-setup.5.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-schroot.conf.5: $(top_builddir)/config.status $(srcdir)/schroot.conf.5.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-schroot-script-config.5: $(top_builddir)/config.status $(srcdir)/schroot-script-config.5.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-schroot-faq.7: $(top_builddir)/config.status $(srcdir)/schroot-faq.7.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-dchroot.1: $(top_builddir)/config.status $(srcdir)/dchroot.1.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-dchroot-dsa.1: $(top_builddir)/config.status $(srcdir)/dchroot-dsa.1.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-csbuild.1: $(top_builddir)/config.status $(srcdir)/csbuild.1.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -424,9 +468,7 @@
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man5: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
@@ -462,9 +504,7 @@
 	  sed -n '/\.5[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
 install-man7: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man7dir)" || $(MKDIR_P) "$(DESTDIR)$(man7dir)"
@@ -500,9 +540,7 @@
 	  sed -n '/\.7[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man7dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man7dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -570,13 +608,19 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -669,6 +713,18 @@
 	uninstall-man uninstall-man1 uninstall-man5 uninstall-man7
 
 
+%.1: %.1.man $(EXPAND)
+	$(SOELIM) -I "$(srcdir)" $< >$@
+
+%.5: %.5.man $(EXPAND)
+	$(SOELIM) -I "$(srcdir)" $< >$@
+
+%.7: %.7.man $(EXPAND)
+	$(SOELIM) -I "$(srcdir)" $< >$@
+
+config.man: Makefile
+	echo -e "$(CONFIG)" | sed -e 's/^[ ]//' > $@
+
 # 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 -Nru schroot-1.4.23/man/schroot.1.in schroot-1.4.25/man/schroot.1.in
--- schroot-1.4.23/man/schroot.1.in	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/man/schroot.1.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,690 +0,0 @@
-.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
-.\" Copyright © 2006       Andreas Bombe <aeb@debian.org>
-.\"
-.\" schroot 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 3 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" schroot 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, see
-.\" <http://www.gnu.org/licenses/>.
-.\"
-.TH SCHROOT 1 "@RELEASE_DATE_S@" "Version @VERSION@" "Debian sbuild"
-.SH NAME
-schroot \- securely enter a chroot environment
-.SH SYNOPSIS
-.B schroot
-.RB [ \-h \[or] \-\-help " \[or] " \-V \[or] \-\-version
-.RB " \[or] " \-l \[or] \-\-list " \[or] " \-i \[or] \-\-info
-.RB " \[or] " \-\-config " \[or] " \-\-location
-.RB " \[or] " \-\-automatic\-session
-.RB " \[or] " \-b \[or] \-\-begin\-session " \[or] " \-\-recover\-session
-.RB " \[or] " \-r \[or] \-\-run\-session " \[or] " \-e \[or] \-\-end\-session ]
-.RB [ \-f \[or] "\-\-force" ]
-.RB [ "\-n \fIsession-name\fP" \[or] "\-\-session\-name=\fIsession-name\fP" ]
-.RB [ "\-d \fIdirectory\fP" \[or] "\-\-directory=\fIdirectory\fP" ]
-.RB [ "\-u \fIuser\fP" \[or] "\-\-user=\fIuser\fP" ]
-.RB [ \-p \[or] \-\-preserve\-environment ]
-.RB [ \-q \[or] \-\-quiet " \[or] " \-v \[or] \-\-verbose ]
-.RB [ "\-c \fIchroot\fP" \[or] "\-\-chroot=\fIchroot\fP"
-.RB " \[or] " \-\-all " \[or] " \-\-all\-chroots " \[or] " \-\-all\-source\-chroots " \[or] " \-\-all\-sessions ]
-.RB [ \-\- ]
-.RB [ COMMAND " [ " ARG1 " [ " ARG2 " [ " ARGn ]]]]
-.SH DESCRIPTION
-\fBschroot\fP allows the user to run a command or a login shell in a chroot
-environment.  If no command is specified, a login shell will be started in the
-user's current working directory inside the chroot.
-.PP
-The command is a program, plus as many optional arguments as required.  Each
-argument may be separately quoted.
-.PP
-The directory the command or login shell is run in depends upon the context.
-See \fI\-\-directory\fP option below for a complete description.
-.PP
-All chroot usage will be logged in the system logs.  Under some circumstances,
-the user may be required to authenticate themselves; see the section
-\[lq]\fIAuthentication\fP\[rq], below.
-.PP
-If no chroot is specified, the chroot name or alias \[oq]default\[cq] will be
-used as a fallback.  This is equivalent to \[lq]\-\-chroot=default\[rq].
-.SH OVERVIEW
-There is often a need to run programs in a virtualised environment rather than
-on the host system directly.  Unlike other virtualisation systems such as
-\fBkvm\fP or \fPXen\fP, schroot does not virtualise the entire system; it only
-virtualises the filesystem, and some parts of the filesystem may still be
-shared with the host.  It is therefore fast, lightweight and flexible.
-However, it does not virtualise other aspects of the system, such as shared
-memory, networking, devices etc., and so may be less secure than other systems,
-depending upon its intended use.  Some examples of existing uses for schroot
-include:
-.IP \[bu]
-Running an untrusted program in a sandbox, so that it can't interfere with
-files on the host system; this may also be used to limit the damage a
-compromised service can inflict upon the host
-.IP \[bu]
-Using a \fIdefined\fP or \fIclean\fP environment, to guarantee the
-reproducibility and integrity of a given task
-.IP \[bu]
-Using different versions of an operating system, or even different operating
-systems altogether, e.g. different GNU/Linux distributions
-.IP \[bu]
-Running 32-bit programs using a 32-bit chroot on a 64-bit host system
-.IP \[bu]
-Automatic building of Debian packages using
-.BR sbuild (1),
-which builds each package in a pristine chroot snapshot when using LVM
-snapshots or unions
-.IP \[bu]
-Supporting multiple system images in a cluster setup, where modifying the base
-image is time-consuming and/or supporting all the required configurations
-needed by users is difficult: different chroots can support all the different
-configurations required, and cluster users may be given access to the chroots
-they need (which can include root access for trusted users to maintain their
-own images)
-.PP
-A chroot may be used directly as root by running
-.BR chroot (8),
-but normal users are not able to use this command.  \fBschroot\fP allows access
-to chroots for normal users using the same mechanism, but with permissions
-checking and allowing additional automated setup of the chroot environment,
-such as mounting additional filesystems and other configuration tasks.  This
-automated setup is done through the action of \fIsetup scripts\fP which may be
-customised and extended to perform any actions required.
-.SH OPTIONS
-\fBschroot\fP accepts the following options:
-.SS Actions
-.TP
-.BR \-h ", " \-\-help
-Show help summary.
-.TP
-.BR \-V ", " \-\-version
-Print version information.
-.TP
-.BR \-l ", " \-\-list
-List all available chroots.
-.TP
-.BR \-i ", " \-\-info
-Print detailed information about the specified chroots.
-.TP
-.BR \-\-config
-Print configuration of the specified chroots.  This is useful for testing that
-the configuration in use is the same as the configuration file.  Any comments
-in the original file will be missing.
-.TP
-.BR \-\-location
-Print location (path) of the specified chroots.  Note that chroot types which
-can only be used within a session will not have a location until they are
-active.
-.SS General options
-.TP
-.BR \-q ", " \-\-quiet
-Print only essential messages.
-.TP
-.BR \-v ", " \-\-verbose
-Print all messages.
-.SS Chroot selection
-.TP
-.BR \-c ", " \-\-chroot=\fIchroot\fP
-Specify a chroot or active session to use.  This option may be used multiple
-times to specify more than one chroot, in which case its effect is similar to
-\fI\-\-all\fP.  The chroot name may be prefixed with a \fInamespace\fP; see the
-section \[lq]\fIChroot Namespaces\fP\[rq], below.
-.TP
-.BR \-a ", " \-\-all
-Select all chroots, source chroots and active sessions.  When a command has
-been specified, the command will be run in all chroots, source chroots and
-active sessions.  If \fI\-\-info\fP has been used, display information about
-all chroots.  This option does not make sense to use with a login shell (when
-no command has been specified).  This option is equivalent to
-\[lq]\-\-all\-chroots \-\-all\-source\-chroots \-\-all\-sessions\[rq].
-.TP
-.BR \-\-all\-chroots
-Select all chroots.  Identical to \fI\-\-all\fP, except that source chroots and
-active sessions are not considered.
-.TP
-.BR \-\-all\-sessions
-Select all active sessions.  Identical to \fI\-\-all\fP, except that chroots
-and source chroots are not considered.
-.TP
-.BR \-\-all\-source\-chroots
-Select all source chroots.  Identical to \fI\-\-all\fP, except that chroots
-and sessions are not considered.
-.SS Chroot environment
-.TP
-.BR \-d ", " \-\-directory=\fIdirectory\fP
-Change to \fIdirectory\fP inside the chroot before running the command or login
-shell.  If \fIdirectory\fP is not available, schroot will exit with an error
-status.
-.IP
-The default behaviour is as follows (all directory paths are inside the
-chroot).  A login shell is run in the current working directory.  If this is
-not available, it will try $HOME (when \fI\-\-preserve\-environment\fP is
-used), then the user's home directory, and \fI/\fP inside the chroot in turn.
-A command is always run in the current working directory inside the chroot.  If
-none of the directories are available, schroot will exit with an error status.
-.TP
-.BR \-u ", " \-\-user=\fIuser\fP
-Run as a different user.  The default is to run as the current user.  If
-required, the user may be required to authenticate themselves with a password.
-For further information, see the section \[lq]\fIAuthentication\fP\[rq], below.
-.TP
-.BR \-p ", " \-\-preserve\-environment
-Preserve the user's environment inside the chroot environment.  The default is
-to use a clean environment; this option copies the entire user environment and
-sets it in the session.  The environment variables allowed are subject to
-certain restrictions; see the section \[lq]\fIEnvironment\fP\[rq], below.
-.SS Session actions
-.TP
-.BR \-\-automatic\-session
-Begin, run and end a session automatically.  This is the default action, so
-does not require specifying in normal operation.
-.TP
-.BR \-b ", " \-\-begin\-session
-Begin a session.  A unique session identifier (session ID) is returned on
-standard output.  The session ID is required to use the other session options.
-Note that the session identifier may be specified with the
-\fI\-\-session\-name\fP option.
-.TP
-.BR \-\-recover\-session
-Recover an existing session.  If an existing session has become unavailable,
-for example becoming unmounted due to a reboot, this option will make the
-session available for use again, for example by remounting it.  The session ID
-is specified with the \fI\-\-chroot\fP option.
-.TP
-.BR \-r ", " \-\-run\-session
-Run an existing session.  The session ID is specified with the \fI\-\-chroot\fP
-option.
-.TP
-.BR \-e ", " \-\-end\-session
-End an existing session.  The session ID is specified with the \fI\-\-chroot\fP
-option.
-.SS Session options
-.TP
-.BR \-n ", " \-\-session\-name=\fIsession-name\fP
-Name a session.  The specified \fIsession-name\fP replaces the default session
-name containing an automatically-generated session ID.  The session name must
-not contain a namespace qualifier, since sessions are always created within the
-\[oq]session:\[cq] namespace.  The session name is also subject to the chroot
-naming restrictions documented in
-.BR schroot.conf (5).
-.TP
-.BR \-f ", " \-\-force
-Force a session operation, even if it would otherwise fail.  This may be used
-to forcibly end a session, even if it has active users.  This does not
-guarantee that the session will be ended cleanly; filesystems may not be
-unmounted, for example.
-.SS Separator
-.TP
-.BR \-\-
-End of options.  Used to indicate the end of the schroot options; any following
-options will be passed to the command being run, rather than to schroot.
-.SH AUTHENTICATION
-If the user is not an allowed user, or a member of the allowed groups (or if
-changing to root, the allowed root users or allowed root groups) for the
-specified chroot(s), permission will be immediately denied.  If switching
-users, and the user running the command has access, the user will be required
-to authenticate themselves using the credentials of the user being switched to.
-.PP
-On systems supporting Pluggable Authentication Modules (PAM), schroot will use
-PAM for authentication and authorisation of users.  If and when required,
-schroot will prompt for a password.  If PAM is not available, all
-authentication will automatically fail (user switching is \fInot\fP supported
-without PAM).
-.PP
-Note that when PAM is in use, the root user is not granted any special
-privileges by default in the program.  However, the default PAM configuration
-permits root to log in without a password (\fIpam_rootok.so\fP), but this may
-be disabled to prevent root from accessing any chroots except if specifically
-permitted.  In such a situation, root must be added to the allowed users or
-groups as for any other user or group.  If PAM is not available, the root user
-will be permitted to access all chroots, even when not explicitly granted
-access.
-.SH CHROOT NAMESPACES
-.SS Namespace basics
-There are three different types of chroot: regular chroots, source chroots and
-session chroots.  These different types of chroot are separated into different
-\fInamespaces\fP.  A namespace is a prefix to a chroot name.  Currently there
-are three namespaces: \[oq]chroot:\[cq], \[oq]source:\[cq] and
-\[oq]session:\[cq].  Use \fI\-\-list \-\-all\fP to list all available chroots
-in all namespaces.  Because \[oq]:\[cq] is used as the separator between
-namespace and chroot names, it is not permitted to use this character in chroot
-names.
-.PP
-Depending upon the action you request schroot to take, it may look for the
-chroot in one of the three namespaces, or a particular namespace may be
-specified.  For example, a chroot named \[lq]sid\[rq] is actually named
-\[lq]chroot:sid\[rq] if the namespace is included, but the namespace may be
-omitted for most actions.
-.SS Source chroots
-Some chroot types, for example LVM snapshots and Btrfs snapshots, provide
-session-managed copy-on-write snapshots of the chroot.  These also provide a
-\fIsource chroot\fP to allow easy access to the filesystem used as a source for
-snapshotting.  These are regular chroots as well, just with the snapshotting
-disabled.  For a chroot named \[lq]sid\-snapshot\[rq] (i.e. with a fully
-qualified name of \[lq]chroot:sid\-snapshot\[rq]), there will also be a
-corresponding source chroot named \[lq]source:sid\-snapshot\[rq].  Earlier
-versions of schroot provided source chroots with a \[oq]\-source\[cq] suffix.
-These are also provided for compatibility.  In this example, this would be
-called \[lq]chroot:sid\-snapshot\-source\[rq].  These compatibility names will
-be dropped in a future version, so programs and scripts should switch to using
-the namespace-qualified names rather than the old suffix.
-.SS Session chroots
-All sessions created with \fI\-\-begin\-session\fP are placed within the
-\[oq]session:\[cq] namespace.  A session named with \fI\-\-session\-name\fP may
-have any name, even the same name as the chroot it was created from, providing
-that it is unique within this namespace.  This was not permitted in previous
-versions of schroot which did not have namespaces.
-.SS Actions and default namespaces
-All actions use \[oq]chroot:\[cq] as the default namespace, with some session
-actions being the exception.  \fI\-\-run\-session\fP,
-\fI\-\-recover\-session\fP and \fI\-\-end\-session\fP use \[oq]session:\[cq] as
-the default namespace instead, since these actions work on session chroots.
-The upshot is that the namespace is usually never required except when you need
-to work with a chroot in a namespace other than the default, such as when using
-a source chroot.  To make chroot selection unambiguous, it is always possible
-to use the full name including the namespace, even when not strictly required.
-.SH PERFORMANCE
-.PP
-Performance on some filesystems, for example Btrfs, is bad when running dpkg
-due to the amount of fsync operations performed.  This may be mitigated by
-installing the eatmydata package and then adding eatmydata to the
-\f[CI]command\-prefix\fP configuration key, which disables all fsync
-operations.  Note that this should only be done in snapshot chroots where data
-loss is not an issue.  This is useful when using a chroot for package building,
-for example.
-.SH EXAMPLES
-.SS List available chroots
-\f[CR]%\ \f[CB]schroot \-l\fP\fP\[CR]
-.br
-\f[CR]chroot:default\fP
-.br
-\f[CR]chroot:etch\fP
-.br
-\f[CR]chroot:sid\fP
-.br
-\f[CR]chroot:testing\fP
-.br
-\f[CR]chroot:unstable\fP
-.SS Get information about a chroot
-\f[CR]%\ \f[CB]schroot\ \-i\ \-c\ sid\fP\fP\[CR]
-.br
-\f[CR]\ \ \[em]\[em]\[em]\ Chroot\ \[em]\[em]\[em]\fP
-.br
-\f[CR]\ \ Name\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sid\fP
-.br
-\f[CR]\ \ Description\ \ \ \ \ \ \ \ \ \ \ \ Debian sid (unstable)\fP
-.br
-\f[CR]\ \ Type\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ plain\fP
-.br
-\f[CR]\ \ Priority\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 3\fP
-.br
-\f[CR]\ \ Users\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ rleigh\fP
-.br
-\f[CR]\ \ Groups\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sbuild\fP
-.br
-\f[CR]\ \ Root\ Users\fP
-.br
-\f[CR]\ \ Root\ Groups\ \ \ \ \ \ \ \ \ \ \ \ sbuild\fP
-.br
-\f[CR]\ \ Aliases\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ unstable\ unstable\-sbuild\ unstable\-p\fP
-.br
-\f[CR]owerpc\-sbuild\fP
-.br
-\f[CR]\ \ Environment\ Filter\ \ \ \ \ ^(BASH_ENV|CDPATH|ENV|HOSTALIASES|I\fP
-.br
-\f[CR]FS|KRB5_CONFIG|KRBCONFDIR|KRBTKFILE|KRB_CONF|LD_.*|LOCALDOMA\fP
-.br
-\f[CR]IN|NLSPATH|PATH_LOCALE|RES_OPTIONS|TERMINFO|TERMINFO_DIRS|TE\fP
-.br
-\f[CR]RMPATH)$\fP
-.br
-\f[CR]\ \ Run\ Setup\ Scripts\ \ \ \ \ \ true\fP
-.br
-\f[CR]\ \ Script\ Configuration\ \ \ script\-defaults\fP
-.br
-\f[CR]\ \ Session\ Managed\ \ \ \ \ \ \ \ true\fP
-.br
-\f[CR]\ \ Personality\ \ \ \ \ \ \ \ \ \ \ \ linux32\fP
-.br
-\f[CR]\ \ Location\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ /srv/chroot/sid\fP
-.LP
-Use \fI\-\-all\fP or \fI\-c\fP multiple times to use all or multiple chroots,
-respectively.
-.SS Running commands in a chroot
-\f[CR]%\ \f[CB]schroot \-c sid /bin/ls\fP\fP\[CR]
-.br
-\f[CR][sid chroot] Running command: \[lq]/bin/ls\[rq]\fP
-.br
-\f[CR]CVS          sbuild\-chroot.c   sbuild\-session.h  schroot.conf.5\fP
-.br
-\f[CR]Makefile     sbuild\-chroot.h   schroot.1         schroot.conf.5.in\fP
-.br
-\f[CR]Makefile.am  sbuild\-config.c   schroot.1.in\fP
-.br
-\f[CR]Makefile.in  sbuild\-config.h   schroot.c\fP
-.br
-\f[CR]pam          sbuild\-session.c  schroot.conf\fP
-.PP
-\f[CR]%\ \f[CB]schroot \-c sid \-\- ls \-1 | head \-n 5\fP\fP\[CR]
-.br
-\f[CR][sid chroot] Running command: \[lq]ls \-1\[rq]\fP
-.br
-\f[CR]ABOUT\-NLS\fP
-.br
-\f[CR]AUTHORS\fP
-.br
-\f[CR]COPYING\fP
-.br
-\f[CR]ChangeLog\fP
-.br
-\f[CR]INSTALL\fP
-.LP
-Use \fI\-\-\fP to allow options beginning with \[oq]\-\[cq] or \[oq]\-\-\[cq]
-in the command to run in the chroot.  This prevents them being interpreted as
-options for schroot itself.  Note that the top line was echoed to standard
-error, and the remaining lines to standard output.  This is intentional, so
-that program output from commands run in the chroot may be piped and redirected
-as required; the data will be the same as if the command was run directly on
-the host system.
-.SS Switching users
-\f[CR]%\ \f[CB]schroot \-c sid \-u root\fP\fP\[CR]
-.br
-\f[CR]Password:\fP
-.br
-\f[CR][sid chroot] (rleigh\[->]root) Running login shell: \[lq]/bin/bash\[rq]\fP
-.br
-\f[CR]# \fP
-.LP
-If the user \[oq]rleigh\[cq] was in \f[CI]root\-users\fP in
-\fI@SCHROOT_CONF@\fP, or one of the groups he belonged to was in
-\f[CI]root\-groups\fP, they would be granted root access without
-authentication, but the PAM authorisation step is still applied.
-.SS Sessions
-A chroot may be needed to run more than one command.  In particular, where the
-chroot is created on the fly from an LVM LV or a file on disc, there is a need
-to make the chroot persistent while a given task (or set of tasks) is
-performed.  Sessions exist for this purpose.  For simple chroot types such as
-\[oq]plain\[cq] and \[oq]directory\[cq], sessions may be created but are not
-strictly necessary.
-.PP
-Let's start by looking at a session-capable chroot:
-.PP
-\f[CR]%\ \f[CB]schroot\ \-i\ \-c\ sid\-snap\fP\fP\[CR]
-.br
-\f[CR]\ \ \[em]\[em]\[em]\ Chroot\ \[em]\[em]\[em]\fP
-.br
-\f[CR]\ \ Name\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sid\-snap\fP
-.br
-\f[CR]\ \ Description\ \ \ \ \ \ \ \ \ \ \ \ Debian sid snapshot\fP
-.br
-\f[CR]\ \ Type\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ lvm\-snapshot\fP
-.br
-\f[CR]\ \ Priority\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 3\fP
-.br
-\f[CR]\ \ Users\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ maks rleigh\fP
-.br
-\f[CR]\ \ Groups\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sbuild\fP
-.br
-\f[CR]\ \ Root\ Users\fP
-.br
-\f[CR]\ \ Root\ Groups\ \ \ \ \ \ \ \ \ \ \ \ root sbuild\fP
-.br
-\f[CR]\ \ Aliases\fP
-.br
-\f[CR]\ \ Environment\ Filter\ \ \ \ \ ^(BASH_ENV|CDPATH|ENV|HOSTALIASES|I\fP
-.br
-\f[CR]FS|KRB5_CONFIG|KRBCONFDIR|KRBTKFILE|KRB_CONF|LD_.*|LOCALDOMA\fP
-.br
-\f[CR]IN|NLSPATH|PATH_LOCALE|RES_OPTIONS|TERMINFO|TERMINFO_DIRS|TE\fP
-.br
-\f[CR]RMPATH)$\fP
-.br
-\f[CR]\ \ Run\ Setup\ Scripts\ \ \ \ \ \ true\fP
-.br
-\f[CR]\ \ Script\ Configuration\ \ \ script\-defaults\fP
-.br
-\f[CR]\ \ Session\ Managed\ \ \ \ \ \ \ \ true\fP
-.br
-\f[CR]\ \ Personality\ \ \ \ \ \ \ \ \ \ \ \ linux\fP
-.br
-\f[CR]\ \ Device\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ /dev/hda_vg/sid_chroot\fP
-.br
-\f[CR]\ \ Mount\ Options\ \ \ \ \ \ \ \ \ \ \-o atime,async,user_xattr\fP
-.br
-\f[CR]\ \ Source\ Users\fP
-.br
-\f[CR]\ \ Source\ Groups\ \ \ \ \ \ \ \ \ \ root rleigh\fP
-.br
-\f[CR]\ \ Source\ Root\ Users\fP
-.br
-\f[CR]\ \ Source\ Root\ Groups\ \ \ \ \ root rleigh\fP
-.br
-\f[CR]\ \ LVM\ Snapshot\ Options\ \ \ \-\-size 2G \-c 128\fP
-.PP
-Note that the \fISession Managed\fP option is set to \[oq]true\[cq].  This is a
-requirement in order to use session management, and is supported by most chroot
-types.  Next, we will create a new session:
-.PP
-\f[CR]%\ \f[CB]schroot \-b \-c sid\-snap\fP\fP\[CR]
-.br
-\f[CR]sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d4ccc899f0f\fP
-.PP
-The session ID of the newly-created session is returned on standard output.  It
-is common to store it like this:
-.PP
-\f[CR]%\ \f[CB]SESSION=$(schroot \-b \-c sid\-snap)\fP\fP\[CR]
-.br
-\f[CR]%\ \f[CB]echo $SESSION\fP\fP\[CR]
-.br
-\f[CR]sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d4ccc899f0f\fP
-.PP
-The session may be used just like any normal chroot.  This is what the session
-looks like:
-.PP
-\f[CR]%\ \f[CB]schroot\ \-i\ \-c\ sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d4ccc899f0f\fP\fP\[CR]
-.br
-\f[CR]\ \ \[em]\[em]\[em]\ Session\ \[em]\[em]\[em]\fP
-.br
-\f[CR]\ \ Name\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d\fP
-.br
-\f[CR]4ccc899f0f\fP
-.br
-\f[CR]\ \ Description\ \ \ \ \ \ \ \ \ \ \ \ Debian sid snapshot\fP
-.br
-\f[CR]\ \ Type\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ lvm\-snapshot\fP
-.br
-\f[CR]\ \ Priority\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 3\fP
-.br
-\f[CR]\ \ Users\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ maks rleigh\fP
-.br
-\f[CR]\ \ Groups\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sbuild\fP
-.br
-\f[CR]\ \ Root\ Users\fP
-.br
-\f[CR]\ \ Root\ Groups\ \ \ \ \ \ \ \ \ \ \ \ root sbuild\fP
-.br
-\f[CR]\ \ Aliases\fP
-.br
-\f[CR]\ \ Environment\ Filter\ \ \ \ \ ^(BASH_ENV|CDPATH|ENV|HOSTALIASES|I\fP
-.br
-\f[CR]FS|KRB5_CONFIG|KRBCONFDIR|KRBTKFILE|KRB_CONF|LD_.*|LOCALDOMA\fP
-.br
-\f[CR]IN|NLSPATH|PATH_LOCALE|RES_OPTIONS|TERMINFO|TERMINFO_DIRS|TE\fP
-.br
-\f[CR]RMPATH)$\fP
-.br
-\f[CR]\ \ Run\ Setup\ Scripts\ \ \ \ \ \ true\fP
-.br
-\f[CR]\ \ Script\ Configuration\ \ \ script\-defaults\fP
-.br
-\f[CR]\ \ Session\ Managed\ \ \ \ \ \ \ \ true\fP
-.br
-\f[CR]\ \ Personality\ \ \ \ \ \ \ \ \ \ \ \ linux\fP
-.br
-\f[CR]\ \ Mount\ Location\ \ \ \ \ \ \ \ \ /var/lib/schroot/mount/sid\-snap\-461\fP
-.br
-\f[CR]95b04\-0893\-49bf\-beb8\-0d4ccc899f0f\fP
-.br
-\f[CR]\ \ Path\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ /var/lib/schroot/mount/sid\-snap\-461\fP
-.br
-\f[CR]95b04\-0893\-49bf\-beb8\-0d4ccc899f0f\fP
-.br
-\f[CR]\ \ Mount\ Device\ \ \ \ \ \ \ \ \ \ \ /dev/hda_vg/sid\-snap\-46195b04\-0893\-\fP
-.br
-\f[CR]49bf\-beb8\-0d4ccc899f0f\fP
-.br
-\f[CR]\ \ Device\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ /dev/hda_vg/sid_chroot\fP
-.br
-\f[CR]\ \ Mount\ Options\ \ \ \ \ \ \ \ \ \ \-o\ atime,async,user_xattr\fP
-.br
-\f[CR]\ \ Source\ Users\fP
-.br
-\f[CR]\ \ Source\ Groups\ \ \ \ \ \ \ \ \ \ root\ rleigh\fP
-.br
-\f[CR]\ \ Source\ Root\ Users\fP
-.br
-\f[CR]\ \ Source\ Root\ Groups\ \ \ \ \ root\ rleigh\fP
-.br
-\f[CR]\ \ LVM\ Snapshot\ Device\ \ \ \ /dev/hda_vg/sid\-snap\-46195b04\-0893\-\fP
-.br
-\f[CR]49bf\-beb8\-0d4ccc899f0f\fP
-.br
-\f[CR]\ \ LVM\ Snapshot\ Options\ \ \ \-\-size\ 2G\ \-c\ 128\fP
-.PP
-Now the session has been created, commands may be run in it:
-.PP
-\f[CR]%\ \f[CB]schroot \-r \-c sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d4ccc899f0f \-\- uname \-sr\fP\fP\[CR]
-.br
-\f[CR]I: [sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d4ccc899f0f chroot] Running command: \[lq]uname \-sr\[rq]\fP
-.br
-\f[CR]Linux 2.6.18\-3\-powerpc\fP
-.br
-\f[CR]%\ \f[CB]schroot \-r \-c $SESSION \-\- uname \-sr\fP\fP\[CR]
-.br
-\f[CR]I: [sid\-snap\-fe170af9\-d9be\-4800\-b1bd\-de275858b938 chroot] Running command: \[lq]uname \-sr\[rq]\fP
-.br
-\f[CR]Linux 2.6.18\-3\-powerpc\fP
-.PP
-When all the commands to run in the session have been performed, the session
-may be ended:
-.PP
-\f[CR]%\ \f[CB]schroot \-e \-c sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d4ccc899f0f\fP\fP\[CR]
-.br
-\f[CR]%\ \f[CB]schroot \-e \-c $SESSION\fP\fP\[CR]
-.PP
-Finally, the session names can be long and unwieldy.  A name may be specified
-instead of using the automatically generated session ID:
-.PP
-\f[CR]%\ \f[CB]schroot \-b \-c sid\-snap \-n my\-session\-name\fP\fP\[CR]
-.br
-\f[CR]my\-session\-name\fP
-.SH TROUBLESHOOTING
-If something is not working, and it's not clear from the error messages what is
-wrong, try using the \fB\-\-debug=\fP\fIlevel\fP option to turn on debugging
-messages.  This gives a great deal more information.  Valid debug levels are
-\[oq]none\[cq], and \[oq]notice\[cq], \[oq]info\[cq], \[oq]warning\[cq] and
-\[oq]critical\[cq] in order of increasing severity.  The lower the severity
-level, the more output.
-.PP
-If you are still having trouble, the developers may be contacted on the mailing
-list:
-.br
-\f[CR]Debian\ buildd-tools\ Developers
-.br
-<buildd-tools-devel@lists.alioth.debian.org>\fP
-.SH BUGS
-On the \fBmips\fP and \fBmipsel\fP architectures, Linux kernels up to and
-including at least version 2.6.17 have broken
-.BR personality (2)
-support, which results in a failure to set the personality.  This will be seen
-as an \[lq]Operation not permitted\[rq] (EPERM) error.  To work around this
-problem, set \f[CI]personality\fP to \[oq]undefined\[cq], or upgrade to a more
-recent kernel.
-.SH ENVIRONMENT
-By default, the environment is not preserved, and the following environment
-variables are defined: HOME, LOGNAME, PATH, SHELL, TERM (preserved if already
-defined), and USER.  The environment variables SCHROOT_COMMAND, SCHROOT_USER,
-SCHROOT_GROUP, SCHROOT_UID and SCHROOT_GID are set inside the chroot specifying
-the command being run, the user name, group name, user ID and group ID,
-respectively.
-.PP
-The following, potentially dangerous, environment variables are removed for
-safety by default: BASH_ENV, CDPATH, ENV, HOSTALIASES, IFS, KRB5_CONFIG,
-KRBCONFDIR, KRBTKFILE, KRB_CONF, LD_.*, LOCALDOMAIN, NLSPATH, PATH_LOCALE,
-RES_OPTIONS, TERMINFO, TERMINFO_DIRS, and TERMPATH.  If desired, the
-\f[CI]environment\-filter\fP configuration key will allow the exclusion list to
-the modified; see
-.BR schroot.conf (5)
-for further details.
-.SH FILES
-.SS Configuration files
-.TP
-\f[BI]@SCHROOT_CONF@\fP
-The system-wide chroot definition file.  This file must be owned by the root
-user, and not be writable by other.
-.TP
-\f[BI]@SCHROOT_CONF_CHROOT_D@\fP
-Additional chroot definitions may be placed in files under this directory.
-They are treated in exactly that same manner as \fI@SCHROOT_CONF@\fP.  Each
-file may contain one or more chroot definitions.  Note that the files in this
-directory follow the same naming rules as
-.BR run\-parts (8)
-when run with the \fI\-\-lsbsysinit\fP option.
-.TP
-\f[BI]@SCHROOT_CONF_SETUP_D@\fP
-The system-wide chroot setup script directories.  See
-.BR schroot-setup (5).
-.TP
-\f[BI]/etc/pam.d/schroot\fP
-PAM configuration.
-.SS System directories
-.TP
-\f[BI]@SCHROOT_LIBEXEC_DIR@\fP
-Directory containing helper programs used by setup scripts.
-.SS Session directories
-Each directory contains a directory or file with the name of each session.  Not
-all chroot types make use of all the following directories.
-.TP
-\f[BI]@SCHROOT_SESSION_DIR@\fP
-Directory containing the session configuration for each active session.
-.TP
-\f[BI]@SCHROOT_MOUNT_DIR@\fP
-Directory used to mount the filesystems used by each active session.
-.TP
-\f[BI]@SCHROOT_UNDERLAY_DIR@\fP
-Directory used for filesystem union source (underlay).
-.TP
-\f[BI]@SCHROOT_OVERLAY_DIR@\fP
-Directory used for filesystem union writeable overlay.
-.TP
-\f[BI]@SCHROOT_FILE_UNPACK_DIR@\fP
-Directory used for unpacking file chroots.
-.SH AUTHORS
-Roger Leigh.
-.SH COPYRIGHT
-Copyright \(co 2005\-2010  Roger Leigh \f[CR]<rleigh@debian.org>\fP
-.PP
-\fBschroot\fP 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 3 of the License, or (at your option) any later
-version.
-.SH SEE ALSO
-.BR dchroot (1),
-.BR sbuild (1),
-.BR chroot (2),
-.BR run\-parts (8),
-.BR schroot\-setup (5),
-.BR schroot\-faq (7),
-.BR schroot.conf (5).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff -Nru schroot-1.4.23/man/schroot.1.man schroot-1.4.25/man/schroot.1.man
--- schroot-1.4.23/man/schroot.1.man	1970-01-01 00:00:00.000000000 +0000
+++ schroot-1.4.25/man/schroot.1.man	2012-01-23 09:53:35.000000000 +0000
@@ -0,0 +1,684 @@
+.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
+.\" Copyright © 2006       Andreas Bombe <aeb@debian.org>
+.\"
+.\" schroot 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 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" schroot 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, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
+.so config.man
+.TH SCHROOT 1 "\*[RELEASE_DATE]" "Version \*[VERSION]" "Debian sbuild"
+.SH NAME
+schroot \- securely enter a chroot environment
+.SH SYNOPSIS
+.B schroot
+.RB [ \-h \[or] \-\-help " \[or] " \-V \[or] \-\-version
+.RB " \[or] " \-l \[or] \-\-list " \[or] " \-i \[or] \-\-info
+.RB " \[or] " \-\-config " \[or] " \-\-location
+.RB " \[or] " \-\-automatic\-session
+.RB " \[or] " \-b \[or] \-\-begin\-session " \[or] " \-\-recover\-session
+.RB " \[or] " \-r \[or] \-\-run\-session " \[or] " \-e \[or] \-\-end\-session ]
+.RB [ \-f \[or] "\-\-force" ]
+.RB [ "\-n \fIsession-name\fP" \[or] "\-\-session\-name=\fIsession-name\fP" ]
+.RB [ "\-d \fIdirectory\fP" \[or] "\-\-directory=\fIdirectory\fP" ]
+.RB [ "\-u \fIuser\fP" \[or] "\-\-user=\fIuser\fP" ]
+.RB [ \-p \[or] \-\-preserve\-environment ]
+.RB [ \-q \[or] \-\-quiet " \[or] " \-v \[or] \-\-verbose ]
+.RB [ "\-c \fIchroot\fP" \[or] "\-\-chroot=\fIchroot\fP"
+.RB " \[or] " \-\-all " \[or] " \-\-all\-chroots " \[or] " \-\-all\-source\-chroots " \[or] " \-\-all\-sessions ]
+.RB [ \-\- ]
+.RB [ COMMAND " [ " ARG1 " [ " ARG2 " [ " ARGn ]]]]
+.SH DESCRIPTION
+\fBschroot\fP allows the user to run a command or a login shell in a chroot
+environment.  If no command is specified, a login shell will be started in the
+user's current working directory inside the chroot.
+.PP
+The command is a program, plus as many optional arguments as required.  Each
+argument may be separately quoted.
+.PP
+The directory the command or login shell is run in depends upon the context.
+See \fI\-\-directory\fP option below for a complete description.
+.PP
+All chroot usage will be logged in the system logs.  Under some circumstances,
+the user may be required to authenticate themselves; see the section
+\[lq]\fIAuthentication\fP\[rq], below.
+.PP
+If no chroot is specified, the chroot name or alias \[oq]default\[cq] will be
+used as a fallback.  This is equivalent to \[lq]\-\-chroot=default\[rq].
+.SH OVERVIEW
+There is often a need to run programs in a virtualised environment rather than
+on the host system directly.  Unlike other virtualisation systems such as
+\fBkvm\fP or \fPXen\fP, schroot does not virtualise the entire system; it only
+virtualises the filesystem, and some parts of the filesystem may still be
+shared with the host.  It is therefore fast, lightweight and flexible.
+However, it does not virtualise other aspects of the system, such as shared
+memory, networking, devices etc., and so may be less secure than other systems,
+depending upon its intended use.  Some examples of existing uses for schroot
+include:
+.IP \[bu]
+Running an untrusted program in a sandbox, so that it can't interfere with
+files on the host system; this may also be used to limit the damage a
+compromised service can inflict upon the host
+.IP \[bu]
+Using a \fIdefined\fP or \fIclean\fP environment, to guarantee the
+reproducibility and integrity of a given task
+.IP \[bu]
+Using different versions of an operating system, or even different operating
+systems altogether, e.g. different GNU/Linux distributions
+.IP \[bu]
+Running 32-bit programs using a 32-bit chroot on a 64-bit host system
+.IP \[bu]
+Automatic building of Debian packages using
+.BR sbuild (1),
+which builds each package in a pristine chroot snapshot when using LVM
+snapshots or unions
+.IP \[bu]
+Supporting multiple system images in a cluster setup, where modifying the base
+image is time-consuming and/or supporting all the required configurations
+needed by users is difficult: different chroots can support all the different
+configurations required, and cluster users may be given access to the chroots
+they need (which can include root access for trusted users to maintain their
+own images)
+.PP
+A chroot may be used directly as root by running
+.BR chroot (8),
+but normal users are not able to use this command.  \fBschroot\fP allows access
+to chroots for normal users using the same mechanism, but with permissions
+checking and allowing additional automated setup of the chroot environment,
+such as mounting additional filesystems and other configuration tasks.  This
+automated setup is done through the action of \fIsetup scripts\fP which may be
+customised and extended to perform any actions required.
+.SH OPTIONS
+\fBschroot\fP accepts the following options:
+.SS Actions
+.TP
+.BR \-h ", " \-\-help
+Show help summary.
+.TP
+.BR \-V ", " \-\-version
+Print version information.
+.TP
+.BR \-l ", " \-\-list
+List all available chroots.
+.TP
+.BR \-i ", " \-\-info
+Print detailed information about the specified chroots.
+.TP
+.BR \-\-config
+Print configuration of the specified chroots.  This is useful for testing that
+the configuration in use is the same as the configuration file.  Any comments
+in the original file will be missing.
+.TP
+.BR \-\-location
+Print location (path) of the specified chroots.  Note that chroot types which
+can only be used within a session will not have a location until they are
+active.
+.SS General options
+.TP
+.BR \-q ", " \-\-quiet
+Print only essential messages.
+.TP
+.BR \-v ", " \-\-verbose
+Print all messages.
+.SS Chroot selection
+.TP
+.BR \-c ", " \-\-chroot=\fIchroot\fP
+Specify a chroot or active session to use.  This option may be used multiple
+times to specify more than one chroot, in which case its effect is similar to
+\fI\-\-all\fP.  The chroot name may be prefixed with a \fInamespace\fP; see the
+section \[lq]\fIChroot Namespaces\fP\[rq], below.
+.TP
+.BR \-a ", " \-\-all
+Select all chroots, source chroots and active sessions.  When a command has
+been specified, the command will be run in all chroots, source chroots and
+active sessions.  If \fI\-\-info\fP has been used, display information about
+all chroots.  This option does not make sense to use with a login shell (when
+no command has been specified).  This option is equivalent to
+\[lq]\-\-all\-chroots \-\-all\-source\-chroots \-\-all\-sessions\[rq].
+.TP
+.BR \-\-all\-chroots
+Select all chroots.  Identical to \fI\-\-all\fP, except that source chroots and
+active sessions are not considered.
+.TP
+.BR \-\-all\-sessions
+Select all active sessions.  Identical to \fI\-\-all\fP, except that chroots
+and source chroots are not considered.
+.TP
+.BR \-\-all\-source\-chroots
+Select all source chroots.  Identical to \fI\-\-all\fP, except that chroots
+and sessions are not considered.
+.SS Chroot environment
+.TP
+.BR \-d ", " \-\-directory=\fIdirectory\fP
+Change to \fIdirectory\fP inside the chroot before running the command or login
+shell.  If \fIdirectory\fP is not available, schroot will exit with an error
+status.
+.IP
+The default behaviour is as follows (all directory paths are inside the
+chroot).  A login shell is run in the current working directory.  If this is
+not available, it will try $HOME (when \fI\-\-preserve\-environment\fP is
+used), then the user's home directory, and \fI/\fP inside the chroot in turn.
+A command is always run in the current working directory inside the chroot.  If
+none of the directories are available, schroot will exit with an error status.
+.TP
+.BR \-u ", " \-\-user=\fIuser\fP
+Run as a different user.  The default is to run as the current user.  If
+required, the user may be required to authenticate themselves with a password.
+For further information, see the section \[lq]\fIAuthentication\fP\[rq], below.
+.TP
+.BR \-p ", " \-\-preserve\-environment
+Preserve the user's environment inside the chroot environment.  The default is
+to use a clean environment; this option copies the entire user environment and
+sets it in the session.  The environment variables allowed are subject to
+certain restrictions; see the section \[lq]\fIEnvironment\fP\[rq], below.
+.SS Session actions
+.TP
+.BR \-\-automatic\-session
+Begin, run and end a session automatically.  This is the default action, so
+does not require specifying in normal operation.
+.TP
+.BR \-b ", " \-\-begin\-session
+Begin a session.  A unique session identifier (session ID) is returned on
+standard output.  The session ID is required to use the other session options.
+Note that the session identifier may be specified with the
+\fI\-\-session\-name\fP option.
+.TP
+.BR \-\-recover\-session
+Recover an existing session.  If an existing session has become unavailable,
+for example becoming unmounted due to a reboot, this option will make the
+session available for use again, for example by remounting it.  The session ID
+is specified with the \fI\-\-chroot\fP option.
+.TP
+.BR \-r ", " \-\-run\-session
+Run an existing session.  The session ID is specified with the \fI\-\-chroot\fP
+option.
+.TP
+.BR \-e ", " \-\-end\-session
+End an existing session.  The session ID is specified with the \fI\-\-chroot\fP
+option.
+.SS Session options
+.TP
+.BR \-n ", " \-\-session\-name=\fIsession-name\fP
+Name a session.  The specified \fIsession-name\fP replaces the default session
+name containing an automatically-generated session ID.  The session name must
+not contain a namespace qualifier, since sessions are always created within the
+\[oq]session:\[cq] namespace.  The session name is also subject to the chroot
+naming restrictions documented in
+.BR schroot.conf (5).
+.TP
+.BR \-f ", " \-\-force
+Force a session operation, even if it would otherwise fail.  This may be used
+to forcibly end a session, even if it has active users.  This does not
+guarantee that the session will be ended cleanly; filesystems may not be
+unmounted, for example.
+.SS Separator
+.TP
+.BR \-\-
+End of options.  Used to indicate the end of the schroot options; any following
+options will be passed to the command being run, rather than to schroot.
+.SH AUTHENTICATION
+If the user is not an allowed user, or a member of the allowed groups (or if
+changing to root, the allowed root users or allowed root groups) for the
+specified chroot(s), permission will be immediately denied.  If switching
+users, and the user running the command has access, the user will be required
+to authenticate themselves using the credentials of the user being switched to.
+.PP
+On systems supporting Pluggable Authentication Modules (PAM), schroot will use
+PAM for authentication and authorisation of users.  If and when required,
+schroot will prompt for a password.  If PAM is not available, all
+authentication will automatically fail (user switching is \fInot\fP supported
+without PAM).
+.PP
+Note that when PAM is in use, the root user is not granted any special
+privileges by default in the program.  However, the default PAM configuration
+permits root to log in without a password (\fIpam_rootok.so\fP), but this may
+be disabled to prevent root from accessing any chroots except if specifically
+permitted.  In such a situation, root must be added to the allowed users or
+groups as for any other user or group.  If PAM is not available, the root user
+will be permitted to access all chroots, even when not explicitly granted
+access.
+.SH CHROOT NAMESPACES
+.SS Namespace basics
+There are three different types of chroot: regular chroots, source chroots and
+session chroots.  These different types of chroot are separated into different
+\fInamespaces\fP.  A namespace is a prefix to a chroot name.  Currently there
+are three namespaces: \[oq]chroot:\[cq], \[oq]source:\[cq] and
+\[oq]session:\[cq].  Use \fI\-\-list \-\-all\fP to list all available chroots
+in all namespaces.  Because \[oq]:\[cq] is used as the separator between
+namespace and chroot names, it is not permitted to use this character in chroot
+names.
+.PP
+Depending upon the action you request schroot to take, it may look for the
+chroot in one of the three namespaces, or a particular namespace may be
+specified.  For example, a chroot named \[lq]sid\[rq] is actually named
+\[lq]chroot:sid\[rq] if the namespace is included, but the namespace may be
+omitted for most actions.
+.SS Source chroots
+Some chroot types, for example LVM snapshots and Btrfs snapshots, provide
+session-managed copy-on-write snapshots of the chroot.  These also provide a
+\fIsource chroot\fP to allow easy access to the filesystem used as a source for
+snapshotting.  These are regular chroots as well, just with the snapshotting
+disabled.  For a chroot named \[lq]sid\-snapshot\[rq] (i.e. with a fully
+qualified name of \[lq]chroot:sid\-snapshot\[rq]), there will also be a
+corresponding source chroot named \[lq]source:sid\-snapshot\[rq].  Earlier
+versions of schroot provided source chroots with a \[oq]\-source\[cq] suffix.
+These are also provided for compatibility.  In this example, this would be
+called \[lq]chroot:sid\-snapshot\-source\[rq].  These compatibility names will
+be dropped in a future version, so programs and scripts should switch to using
+the namespace-qualified names rather than the old suffix.
+.SS Session chroots
+All sessions created with \fI\-\-begin\-session\fP are placed within the
+\[oq]session:\[cq] namespace.  A session named with \fI\-\-session\-name\fP may
+have any name, even the same name as the chroot it was created from, providing
+that it is unique within this namespace.  This was not permitted in previous
+versions of schroot which did not have namespaces.
+.SS Actions and default namespaces
+All actions use \[oq]chroot:\[cq] as the default namespace, with some session
+actions being the exception.  \fI\-\-run\-session\fP,
+\fI\-\-recover\-session\fP and \fI\-\-end\-session\fP use \[oq]session:\[cq] as
+the default namespace instead, since these actions work on session chroots.
+The upshot is that the namespace is usually never required except when you need
+to work with a chroot in a namespace other than the default, such as when using
+a source chroot.  To make chroot selection unambiguous, it is always possible
+to use the full name including the namespace, even when not strictly required.
+.SH PERFORMANCE
+.PP
+Performance on some filesystems, for example Btrfs, is bad when running dpkg
+due to the amount of fsync operations performed.  This may be mitigated by
+installing the eatmydata package and then adding eatmydata to the
+\f[CI]command\-prefix\fP configuration key, which disables all fsync
+operations.  Note that this should only be done in snapshot chroots where data
+loss is not an issue.  This is useful when using a chroot for package building,
+for example.
+.SH EXAMPLES
+.SS List available chroots
+\f[CR]%\ \f[CB]schroot \-l\fP\fP\[CR]
+.br
+\f[CR]chroot:default\fP
+.br
+\f[CR]chroot:etch\fP
+.br
+\f[CR]chroot:sid\fP
+.br
+\f[CR]chroot:testing\fP
+.br
+\f[CR]chroot:unstable\fP
+.SS Get information about a chroot
+\f[CR]%\ \f[CB]schroot\ \-i\ \-c\ sid\fP\fP\[CR]
+.br
+\f[CR]\ \ \[em]\[em]\[em]\ Chroot\ \[em]\[em]\[em]\fP
+.br
+\f[CR]\ \ Name\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sid\fP
+.br
+\f[CR]\ \ Description\ \ \ \ \ \ \ \ \ \ \ \ Debian sid (unstable)\fP
+.br
+\f[CR]\ \ Type\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ plain\fP
+.br
+\f[CR]\ \ Priority\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 3\fP
+.br
+\f[CR]\ \ Users\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ rleigh\fP
+.br
+\f[CR]\ \ Groups\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sbuild\fP
+.br
+\f[CR]\ \ Root\ Users\fP
+.br
+\f[CR]\ \ Root\ Groups\ \ \ \ \ \ \ \ \ \ \ \ sbuild\fP
+.br
+\f[CR]\ \ Aliases\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ unstable\ unstable\-sbuild\ unstable\-p\fP
+.br
+\f[CR]owerpc\-sbuild\fP
+.br
+\f[CR]\ \ Environment\ Filter\ \ \ \ \ ^(BASH_ENV|CDPATH|ENV|HOSTALIASES|I\fP
+.br
+\f[CR]FS|KRB5_CONFIG|KRBCONFDIR|KRBTKFILE|KRB_CONF|LD_.*|LOCALDOMA\fP
+.br
+\f[CR]IN|NLSPATH|PATH_LOCALE|RES_OPTIONS|TERMINFO|TERMINFO_DIRS|TE\fP
+.br
+\f[CR]RMPATH)$\fP
+.br
+\f[CR]\ \ Run\ Setup\ Scripts\ \ \ \ \ \ true\fP
+.br
+\f[CR]\ \ Script\ Configuration\ \ \ script\-defaults\fP
+.br
+\f[CR]\ \ Session\ Managed\ \ \ \ \ \ \ \ true\fP
+.br
+\f[CR]\ \ Personality\ \ \ \ \ \ \ \ \ \ \ \ linux32\fP
+.br
+\f[CR]\ \ Location\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ /srv/chroot/sid\fP
+.LP
+Use \fI\-\-all\fP or \fI\-c\fP multiple times to use all or multiple chroots,
+respectively.
+.SS Running commands in a chroot
+\f[CR]%\ \f[CB]schroot \-c sid /bin/ls\fP\fP\[CR]
+.br
+\f[CR][sid chroot] Running command: \[lq]/bin/ls\[rq]\fP
+.br
+\f[CR]CVS          sbuild\-chroot.c   sbuild\-session.h  schroot.conf.5\fP
+.br
+\f[CR]Makefile     sbuild\-chroot.h   schroot.1         schroot.conf.5.in\fP
+.br
+\f[CR]Makefile.am  sbuild\-config.c   schroot.1.in\fP
+.br
+\f[CR]Makefile.in  sbuild\-config.h   schroot.c\fP
+.br
+\f[CR]pam          sbuild\-session.c  schroot.conf\fP
+.PP
+\f[CR]%\ \f[CB]schroot \-c sid \-\- ls \-1 | head \-n 5\fP\fP\[CR]
+.br
+\f[CR][sid chroot] Running command: \[lq]ls \-1\[rq]\fP
+.br
+\f[CR]ABOUT\-NLS\fP
+.br
+\f[CR]AUTHORS\fP
+.br
+\f[CR]COPYING\fP
+.br
+\f[CR]ChangeLog\fP
+.br
+\f[CR]INSTALL\fP
+.LP
+Use \fI\-\-\fP to allow options beginning with \[oq]\-\[cq] or \[oq]\-\-\[cq]
+in the command to run in the chroot.  This prevents them being interpreted as
+options for schroot itself.  Note that the top line was echoed to standard
+error, and the remaining lines to standard output.  This is intentional, so
+that program output from commands run in the chroot may be piped and redirected
+as required; the data will be the same as if the command was run directly on
+the host system.
+.SS Switching users
+\f[CR]%\ \f[CB]schroot \-c sid \-u root\fP\fP\[CR]
+.br
+\f[CR]Password:\fP
+.br
+\f[CR][sid chroot] (rleigh\[->]root) Running login shell: \[lq]/bin/bash\[rq]\fP
+.br
+\f[CR]# \fP
+.LP
+If the user \[oq]rleigh\[cq] was in \f[CI]root\-users\fP in
+\fI\*[SCHROOT_CONF]\fP, or one of the groups he belonged to was in
+\f[CI]root\-groups\fP, they would be granted root access without
+authentication, but the PAM authorisation step is still applied.
+.SS Sessions
+A chroot may be needed to run more than one command.  In particular, where the
+chroot is created on the fly from an LVM LV or a file on disc, there is a need
+to make the chroot persistent while a given task (or set of tasks) is
+performed.  Sessions exist for this purpose.  For simple chroot types such as
+\[oq]plain\[cq] and \[oq]directory\[cq], sessions may be created but are not
+strictly necessary.
+.PP
+Let's start by looking at a session-capable chroot:
+.PP
+\f[CR]%\ \f[CB]schroot\ \-i\ \-c\ sid\-snap\fP\fP\[CR]
+.br
+\f[CR]\ \ \[em]\[em]\[em]\ Chroot\ \[em]\[em]\[em]\fP
+.br
+\f[CR]\ \ Name\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sid\-snap\fP
+.br
+\f[CR]\ \ Description\ \ \ \ \ \ \ \ \ \ \ \ Debian sid snapshot\fP
+.br
+\f[CR]\ \ Type\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ lvm\-snapshot\fP
+.br
+\f[CR]\ \ Priority\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 3\fP
+.br
+\f[CR]\ \ Users\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ maks rleigh\fP
+.br
+\f[CR]\ \ Groups\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sbuild\fP
+.br
+\f[CR]\ \ Root\ Users\fP
+.br
+\f[CR]\ \ Root\ Groups\ \ \ \ \ \ \ \ \ \ \ \ root sbuild\fP
+.br
+\f[CR]\ \ Aliases\fP
+.br
+\f[CR]\ \ Environment\ Filter\ \ \ \ \ ^(BASH_ENV|CDPATH|ENV|HOSTALIASES|I\fP
+.br
+\f[CR]FS|KRB5_CONFIG|KRBCONFDIR|KRBTKFILE|KRB_CONF|LD_.*|LOCALDOMA\fP
+.br
+\f[CR]IN|NLSPATH|PATH_LOCALE|RES_OPTIONS|TERMINFO|TERMINFO_DIRS|TE\fP
+.br
+\f[CR]RMPATH)$\fP
+.br
+\f[CR]\ \ Run\ Setup\ Scripts\ \ \ \ \ \ true\fP
+.br
+\f[CR]\ \ Script\ Configuration\ \ \ script\-defaults\fP
+.br
+\f[CR]\ \ Session\ Managed\ \ \ \ \ \ \ \ true\fP
+.br
+\f[CR]\ \ Personality\ \ \ \ \ \ \ \ \ \ \ \ linux\fP
+.br
+\f[CR]\ \ Device\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ /dev/hda_vg/sid_chroot\fP
+.br
+\f[CR]\ \ Mount\ Options\ \ \ \ \ \ \ \ \ \ \-o atime,async,user_xattr\fP
+.br
+\f[CR]\ \ Source\ Users\fP
+.br
+\f[CR]\ \ Source\ Groups\ \ \ \ \ \ \ \ \ \ root rleigh\fP
+.br
+\f[CR]\ \ Source\ Root\ Users\fP
+.br
+\f[CR]\ \ Source\ Root\ Groups\ \ \ \ \ root rleigh\fP
+.br
+\f[CR]\ \ LVM\ Snapshot\ Options\ \ \ \-\-size 2G \-c 128\fP
+.PP
+Note that the \fISession Managed\fP option is set to \[oq]true\[cq].  This is a
+requirement in order to use session management, and is supported by most chroot
+types.  Next, we will create a new session:
+.PP
+\f[CR]%\ \f[CB]schroot \-b \-c sid\-snap\fP\fP\[CR]
+.br
+\f[CR]sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d4ccc899f0f\fP
+.PP
+The session ID of the newly-created session is returned on standard output.  It
+is common to store it like this:
+.PP
+\f[CR]%\ \f[CB]SESSION=$(schroot \-b \-c sid\-snap)\fP\fP\[CR]
+.br
+\f[CR]%\ \f[CB]echo $SESSION\fP\fP\[CR]
+.br
+\f[CR]sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d4ccc899f0f\fP
+.PP
+The session may be used just like any normal chroot.  This is what the session
+looks like:
+.PP
+\f[CR]%\ \f[CB]schroot\ \-i\ \-c\ sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d4ccc899f0f\fP\fP\[CR]
+.br
+\f[CR]\ \ \[em]\[em]\[em]\ Session\ \[em]\[em]\[em]\fP
+.br
+\f[CR]\ \ Name\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d\fP
+.br
+\f[CR]4ccc899f0f\fP
+.br
+\f[CR]\ \ Description\ \ \ \ \ \ \ \ \ \ \ \ Debian sid snapshot\fP
+.br
+\f[CR]\ \ Type\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ lvm\-snapshot\fP
+.br
+\f[CR]\ \ Priority\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 3\fP
+.br
+\f[CR]\ \ Users\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ maks rleigh\fP
+.br
+\f[CR]\ \ Groups\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sbuild\fP
+.br
+\f[CR]\ \ Root\ Users\fP
+.br
+\f[CR]\ \ Root\ Groups\ \ \ \ \ \ \ \ \ \ \ \ root sbuild\fP
+.br
+\f[CR]\ \ Aliases\fP
+.br
+\f[CR]\ \ Environment\ Filter\ \ \ \ \ ^(BASH_ENV|CDPATH|ENV|HOSTALIASES|I\fP
+.br
+\f[CR]FS|KRB5_CONFIG|KRBCONFDIR|KRBTKFILE|KRB_CONF|LD_.*|LOCALDOMA\fP
+.br
+\f[CR]IN|NLSPATH|PATH_LOCALE|RES_OPTIONS|TERMINFO|TERMINFO_DIRS|TE\fP
+.br
+\f[CR]RMPATH)$\fP
+.br
+\f[CR]\ \ Run\ Setup\ Scripts\ \ \ \ \ \ true\fP
+.br
+\f[CR]\ \ Script\ Configuration\ \ \ script\-defaults\fP
+.br
+\f[CR]\ \ Session\ Managed\ \ \ \ \ \ \ \ true\fP
+.br
+\f[CR]\ \ Personality\ \ \ \ \ \ \ \ \ \ \ \ linux\fP
+.br
+\f[CR]\ \ Mount\ Location\ \ \ \ \ \ \ \ \ /var/lib/schroot/mount/sid\-snap\-461\fP
+.br
+\f[CR]95b04\-0893\-49bf\-beb8\-0d4ccc899f0f\fP
+.br
+\f[CR]\ \ Path\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ /var/lib/schroot/mount/sid\-snap\-461\fP
+.br
+\f[CR]95b04\-0893\-49bf\-beb8\-0d4ccc899f0f\fP
+.br
+\f[CR]\ \ Mount\ Device\ \ \ \ \ \ \ \ \ \ \ /dev/hda_vg/sid\-snap\-46195b04\-0893\-\fP
+.br
+\f[CR]49bf\-beb8\-0d4ccc899f0f\fP
+.br
+\f[CR]\ \ Device\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ /dev/hda_vg/sid_chroot\fP
+.br
+\f[CR]\ \ Mount\ Options\ \ \ \ \ \ \ \ \ \ \-o\ atime,async,user_xattr\fP
+.br
+\f[CR]\ \ Source\ Users\fP
+.br
+\f[CR]\ \ Source\ Groups\ \ \ \ \ \ \ \ \ \ root\ rleigh\fP
+.br
+\f[CR]\ \ Source\ Root\ Users\fP
+.br
+\f[CR]\ \ Source\ Root\ Groups\ \ \ \ \ root\ rleigh\fP
+.br
+\f[CR]\ \ LVM\ Snapshot\ Device\ \ \ \ /dev/hda_vg/sid\-snap\-46195b04\-0893\-\fP
+.br
+\f[CR]49bf\-beb8\-0d4ccc899f0f\fP
+.br
+\f[CR]\ \ LVM\ Snapshot\ Options\ \ \ \-\-size\ 2G\ \-c\ 128\fP
+.PP
+Now the session has been created, commands may be run in it:
+.PP
+\f[CR]%\ \f[CB]schroot \-r \-c sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d4ccc899f0f \-\- uname \-sr\fP\fP\[CR]
+.br
+\f[CR]I: [sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d4ccc899f0f chroot] Running command: \[lq]uname \-sr\[rq]\fP
+.br
+\f[CR]Linux 2.6.18\-3\-powerpc\fP
+.br
+\f[CR]%\ \f[CB]schroot \-r \-c $SESSION \-\- uname \-sr\fP\fP\[CR]
+.br
+\f[CR]I: [sid\-snap\-fe170af9\-d9be\-4800\-b1bd\-de275858b938 chroot] Running command: \[lq]uname \-sr\[rq]\fP
+.br
+\f[CR]Linux 2.6.18\-3\-powerpc\fP
+.PP
+When all the commands to run in the session have been performed, the session
+may be ended:
+.PP
+\f[CR]%\ \f[CB]schroot \-e \-c sid\-snap\-46195b04\-0893\-49bf\-beb8\-0d4ccc899f0f\fP\fP\[CR]
+.br
+\f[CR]%\ \f[CB]schroot \-e \-c $SESSION\fP\fP\[CR]
+.PP
+Finally, the session names can be long and unwieldy.  A name may be specified
+instead of using the automatically generated session ID:
+.PP
+\f[CR]%\ \f[CB]schroot \-b \-c sid\-snap \-n my\-session\-name\fP\fP\[CR]
+.br
+\f[CR]my\-session\-name\fP
+.SH TROUBLESHOOTING
+If something is not working, and it's not clear from the error messages what is
+wrong, try using the \fB\-\-debug=\fP\fIlevel\fP option to turn on debugging
+messages.  This gives a great deal more information.  Valid debug levels are
+\[oq]none\[cq], and \[oq]notice\[cq], \[oq]info\[cq], \[oq]warning\[cq] and
+\[oq]critical\[cq] in order of increasing severity.  The lower the severity
+level, the more output.
+.PP
+If you are still having trouble, the developers may be contacted on the mailing
+list:
+.br
+\f[CR]Debian\ buildd-tools\ Developers
+.br
+<buildd-tools-devel@lists.alioth.debian.org>\fP
+.SH BUGS
+On the \fBmips\fP and \fBmipsel\fP architectures, Linux kernels up to and
+including at least version 2.6.17 have broken
+.BR personality (2)
+support, which results in a failure to set the personality.  This will be seen
+as an \[lq]Operation not permitted\[rq] (EPERM) error.  To work around this
+problem, set \f[CI]personality\fP to \[oq]undefined\[cq], or upgrade to a more
+recent kernel.
+.SH ENVIRONMENT
+By default, the environment is not preserved, and the following environment
+variables are defined: HOME, LOGNAME, PATH, SHELL, TERM (preserved if already
+defined), and USER.  The environment variables SCHROOT_COMMAND, SCHROOT_USER,
+SCHROOT_GROUP, SCHROOT_UID and SCHROOT_GID are set inside the chroot specifying
+the command being run, the user name, group name, user ID and group ID,
+respectively.
+.PP
+The following, potentially dangerous, environment variables are removed for
+safety by default: BASH_ENV, CDPATH, ENV, HOSTALIASES, IFS, KRB5_CONFIG,
+KRBCONFDIR, KRBTKFILE, KRB_CONF, LD_.*, LOCALDOMAIN, NLSPATH, PATH_LOCALE,
+RES_OPTIONS, TERMINFO, TERMINFO_DIRS, and TERMPATH.  If desired, the
+\f[CI]environment\-filter\fP configuration key will allow the exclusion list to
+the modified; see
+.BR schroot.conf (5)
+for further details.
+.SH FILES
+.SS Configuration files
+.TP
+\f[BI]\*[SCHROOT_CONF]\fP
+The system-wide chroot definition file.  This file must be owned by the root
+user, and not be writable by other.
+.TP
+\f[BI]\*[SCHROOT_CONF_CHROOT_D]\fP
+Additional chroot definitions may be placed in files under this directory.
+They are treated in exactly that same manner as \fI\*[SCHROOT_CONF]\fP.  Each
+file may contain one or more chroot definitions.  Note that the files in this
+directory follow the same naming rules as
+.BR run\-parts (8)
+when run with the \fI\-\-lsbsysinit\fP option.
+.TP
+\f[BI]\*[SCHROOT_CONF_SETUP_D]\fP
+The system-wide chroot setup script directories.  See
+.BR schroot-setup (5).
+.TP
+\f[BI]/etc/pam.d/schroot\fP
+PAM configuration.
+.SS System directories
+.TP
+\f[BI]\*[SCHROOT_LIBEXEC_DIR]\fP
+Directory containing helper programs used by setup scripts.
+.SS Session directories
+Each directory contains a directory or file with the name of each session.  Not
+all chroot types make use of all the following directories.
+.TP
+\f[BI]\*[SCHROOT_SESSION_DIR]\fP
+Directory containing the session configuration for each active session.
+.TP
+\f[BI]\*[SCHROOT_MOUNT_DIR]\fP
+Directory used to mount the filesystems used by each active session.
+.TP
+\f[BI]\*[SCHROOT_UNDERLAY_DIR]\fP
+Directory used for filesystem union source (underlay).
+.TP
+\f[BI]\*[SCHROOT_OVERLAY_DIR]\fP
+Directory used for filesystem union writeable overlay.
+.TP
+\f[BI]\*[SCHROOT_FILE_UNPACK_DIR]\fP
+Directory used for unpacking file chroots.
+.so authors.man
+.so copyright.man
+.SH SEE ALSO
+.BR dchroot (1),
+.BR sbuild (1),
+.BR chroot (2),
+.BR run\-parts (8),
+.BR schroot\-setup (5),
+.BR schroot\-faq (7),
+.BR schroot.conf (5).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff -Nru schroot-1.4.23/man/schroot.conf.5.in schroot-1.4.25/man/schroot.conf.5.in
--- schroot-1.4.23/man/schroot.conf.5.in	2011-06-24 22:22:06.000000000 +0000
+++ schroot-1.4.25/man/schroot.conf.5.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,628 +0,0 @@
-.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
-.\"
-.\" schroot 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 3 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" schroot 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, see
-.\" <http://www.gnu.org/licenses/>.
-.\"
-.TH SCHROOT.CONF 5 "@RELEASE_DATE_S@" "Version @VERSION@" "Debian sbuild"
-.SH NAME
-schroot.conf \- chroot definition file for schroot
-.SH DESCRIPTION
-\f[BI]schroot.conf\fP is a plain UTF-8 text file, describing the chroots
-available for use with schroot.
-.PP
-Comments are introduced following a \[oq]\f[CR]\[sh]\fP\[cq] (\[lq]hash\[rq])
-character at the beginning of a line, or following any other text.  All text
-right of the \[oq]\f[CR]\[sh]\fP\[cq] is treated as a comment.
-.PP
-The configuration format is an INI-style format, split into groups of key-value
-pairs separated by section names in square brackets.
-.SS General options
-A chroot is defined as a group of key-value pairs, which is started by a name
-in square brackets on a line by itself.  The file may contain multiple groups
-which therefore define multiple chroots.
-.PP
-A chroot definition is started by the name of the chroot in square brackets.
-For example,
-.IP
-\f[CR]\[lB]sid\[rB]
-.PP
-The name is subject to certain naming restrictions.  For further details, see
-the section \[lq]\fIChroot Names\fP\[rq] below.
-.PP
-This is then followed by several key-value pairs, one per line:
-.TP
-\f[CBI]type=\fP\f[CI]type\fP
-The type of the chroot.  Valid types are \[oq]plain\[cq], \[oq]directory\[cq],
-\[oq]file\[cq], \[oq]loopback\[cq], \[oq]block\-device\[cq],
-\[oq]btrfs\-snapshot\[cq] and \[oq]lvm\-snapshot\[cq].  If empty or omitted,
-the default type is \[oq]plain\[cq].  Note that \[oq]plain\[cq] chroots do not
-run setup scripts and mount filesystems; \[oq]directory\[cq] is recommended for
-normal use (see \[lq]\fIPlain and directory chroots\fP\[rq], below).
-.TP
-\f[CBI]description=\fP\f[CI]description\fP
-A short description of the chroot.  This may be localised for different
-languages; see the section \[lq]\fILocalisation\fP\[rq] below.
-.TP
-\f[CBI]priority=\fP\f[CI]number\fP
-Set the priority of a chroot.  \f[CI]number\fP is a positive integer indicating
-whether a distribution is older than another.  For example, \[lq]oldstable\[rq]
-and \[lq]oldstable-security\[rq] might be \[oq]0\[cq], while \[lq]stable\[rq]
-and \[lq]stable-security\[rq] are \[oq]1\[cq], \[lq]testing\[rq] is \[oq]2\[cq]
-and \[lq]unstable\[rq] is \[oq]3\[cq].  The values are not important, but the
-difference between them is.  This option is deprecated and no longer used by
-schroot, but is still permitted to be used; it will be obsoleted and removed in
-a future release.
-.TP
-\f[CBI]message-verbosity=\fP\f[CI]verbosity\fP
-Set the verbosity of messages printed by schroot when setting up, running
-commands and cleaning up the chroot.  Valid settings are \[oq]quiet\[cq]
-(suppress most messages), \[oq]normal\[cq] (the default) and \[oq]verbose\[cq]
-(show all messages).  This setting is overridden by the options \fI\-\-quiet\fP
-and \fI\-\-verbose\fP.
-.TP
-\f[CBI]users=\fP\f[CI]user1,user2,...\fP
-A comma-separated list of users which are allowed access to the chroot.  If
-empty or omitted, no users will be allowed access (unless a group they belong
-to is also specified in \f[CI]groups\fP).
-.TP
-\f[CBI]groups=\fP\f[CI]group1,group2,...\fP
-A comma-separated list of groups which are allowed access to the chroot.  If
-empty or omitted, no groups of users will be allowed access.
-.TP
-\f[CBI]root\-users=\fP\f[CI]user1,user2,...\fP
-A comma-separated list of users which are allowed \fBpassword-less\fP root
-access to the chroot.  If empty or omitted, no users will be allowed root
-access without a password (but if a user or a group they belong to is in
-\f[CI]users\fP or \f[CI]groups\fP, respectively, they may gain access with a
-password).  See the section \[lq]\fISecurity\fP\[rq] below.
-.TP
-\f[CBI]root\-groups=\fP\f[CI]group1,group2,...\fP
-A comma-separated list of groups which are allowed \fBpassword-less\fP root
-access to the chroot.  If empty or omitted, no users will be allowed root
-access without a password (but if a user or a group they belong to is in
-\f[CI]users\fP or \f[CI]groups\fP, respectively, they may gain access with a
-password).  See the section \[lq]\fISecurity\fP\[rq] below.
-.TP
-\f[CBI]aliases=\fP\f[CI]alias1,alias2,...\fP
-A comma-separated list of aliases (alternate names) for this chroot.  For
-example, a chroot named \[lq]sid\[rq] might have an \[oq]unstable\[cq] alias
-for convenience.  Aliases are subject to the same naming restrictions as the
-chroot name itself.
-.TP
-\f[CBI]run\-setup\-scripts=\fP\f[CI]true\fP|\f[CI]false\fP
-Set whether chroot setup scripts will be run.  The default is to run setup
-scripts for all chroot types except \[oq]plain\[cq].  Setup scripts are
-\fBrequired\fP to mount and configure the chroot environment.  This option is
-deprecated and no longer used by schroot, but is still permitted to be used; it
-will be obsoleted and removed in a future release.
-.TP
-\f[CBI]run\-exec\-scripts=\fP\f[CI]true\fP|\f[CI]false\fP
-Set whether chroot execution scripts will be run.  The default is the same as
-the default for the \f[CI]run\-setup\-scripts\fP key.  This option was called
-\f[CI]run\-session\-scripts\fP in versions prior to 0.2.5.  This option is
-deprecated and no longer used by schroot, but is still permitted to be used; it
-will be obsoleted and removed in a future release.
-.TP
-\f[CBI]script\-config=\fP\f[CI]filename\fP
-The behaviour of the chroot setup scripts may be customised on a per-chroot
-basis by providing a shell script which the scripts will source.  The filename
-is relative to \fI@SCHROOT_SYSCONF_DIR@\fP.  The default filename is
-\[oq]default/config\[cq].  Alternatives are \[oq]minimal/config\[cq] (minimal
-configuration), \[oq]desktop/config\[cq] (for running desktop applications in
-the chroot, making more functionality from the host system available in the
-chroot) and \[oq]sbuild/config\[cq] (for using the chroot for Debian package
-building).
-.IP
-Desktop users should note that the fstab file \fIdesktop/fstab\fP will need
-editing if you use gdm3.  The \f[CI]preserve\-environment\fP key should also be
-set to \[oq]true\[cq] so that the environment is preserved inside the chroot.
-.IP
-If none of the configuration profiles provided above meet your needs, then they
-may be edited to further customise them, and/or copied and used as a template
-for entirely new profiles.  Settings for specific chroots may also be set in a
-single script by using conditionals checking the chroot name and/or type.  Note
-that the script will be sourced once for each and every script invocation, and
-must be idempotent.  The file format is documented in
-.BR schroot-script-config (5).
-.IP
-Note that the different profiles have different security implications; see the
-section \[lq]\fISecurity\fP\[rq] below for further details.
-.TP
-\f[CBI]command\-prefix=\fP\f[CI]command,option1,option2,...\fP
-A comma-separated list of a command and the options for the command.  This
-command and its options will be prefixed to all commands run inside the chroot.
-This is useful for adding commands such as nice, ionice or eatmydata for all
-commands run inside the chroot.  nice and ionice will affect CPU and I/O
-scheduling.  eatmydata ingores filesystem fsync operations, and is useful for
-throwaway snapshot chroots where you don't care about dataloss, but do care
-about high speed.
-.TP
-\f[CBI]personality=\fP\f[CI]persona\fP
-Set the personality (process execution domain) to use.  This option is useful
-when using a 32-bit chroot on 64-bit system, for example.  Valid options on
-Linux are \[oq]bsd\[cq], \[oq]hpux\[cq], \[oq]irix32\[cq], \[oq]irix64\[cq],
-\[oq]irixn32\[cq], \[oq]iscr4\[cq], \[oq]linux\[cq], \[oq]linux32\[cq],
-\[oq]linux_32bit\[cq], \[oq]osf4\[cq], \[oq]osr5\[cq], \[oq]riscos\[cq],
-\[oq]scorvr3\[cq], \[oq]solaris\[cq], \[oq]sunos\[cq], \[oq]svr4\[cq],
-\[oq]uw7\[cq], \[oq]wysev386\[cq], and \[oq]xenix\[cq].  The default value is
-\[oq]linux\[cq].  There is also the special option \[oq]undefined\[cq]
-(personality not set).  For a 32-bit chroot on a 64-bit system,
-\[oq]linux32\[cq] is the option required.  The only valid option for non-Linux
-systems is \[oq]undefined\[cq].  The default value for non-Linux systems is
-\[oq]undefined\[cq].
-.TP
-\f[CBI]preserve\-environment=\fP\f[CI]true\fP|\f[CI]false\fP
-By default, the environment will not be preserved inside the chroot, instead a
-minimal environment will be used.  Set to \f[CI]true\fP to always preserve the
-environment.  This is useful for example when running X applications inside the
-chroot, which need the environment to function correctly.  The environment may
-also be preserved using the \fI\-\-preserve\-environment\fP option.
-.TP
-\f[CBI]environment\-filter=\fP\f[CI]regex\fP
-The environment to be set in the chroot will be filtered in order to remove
-environment variables which may pose a security risk.  Any environment variable
-matching the specified POSIX extended regular expression will be removed prior
-to executing any command in the chroot.
-.IP
-Potentially dangerous environment variables are removed for safety by default
-using the following regular expression:
-.na
-\[lq]\f[CR]^(BASH_ENV\:|CDPATH\:|ENV\:|HOSTALIASES\:|IFS\:|KRB5_CONFIG\:|KRBCONFDIR\:|KRBTKFILE\:|KRB_CONF\:|LD_.*\:|LOCALDOMAIN\:|NLSPATH\:|PATH_LOCALE\:|RES_OPTIONS\:|TERMINFO\:|TERMINFO_DIRS\:|TERMPATH)$\fP\[rq].
-.ad
-.SS Plain and directory chroots
-Chroots of type \[oq]plain\[cq] or \[oq]directory\[cq] are directories
-accessible in the filesystem.  The two types are equivalent except for the fact
-that directory chroots run setup scripts, whereas plain chroots do not.  In
-consequence, filesystems such as \fI/proc\fP are not mounted in plain chroots;
-it is the responsibility of the system administrator to configure such chroots
-by hand, whereas directory chroots are automatically configured.  Additionally,
-directory chroots implement the \fBfilesystem union chroot\fP options (see
-\[lq]\fIFilesystem Union chroot options\fP\[rq], below).
-.PP
-These chroot types have an additional (mandatory) configuration option:
-.TP
-\f[CBI]directory=\fP\f[CI]directory\fP
-The directory containing the chroot environment.  This is where the root will
-be changed to when executing a login shell or a command.  The directory must
-exist and have read and execute permissions to allow users access to it.  Note
-that on Linux systems it will be bind-mounted elsewhere for use as a chroot;
-the directory for \[oq]plain\[cq] chroots is mounted with the \fI\-\-rbind\fP
-option to
-.BR mount (8),
-while for \[oq]directory\[cq] chroots \fI\-\-bind\fP is used instead so that
-sub-mounts are not preserved (they should be set in the \fIfstab\fP file just
-like in \fI/etc/fstab\fP on the host).
-.IP
-This option was previously named \f[CI]location\fP, but was renamed to avoid
-ambiguity with the option by the same name for \fBmountable chroot\fP options
-(see \[lq]\fIMountable chroot options\fP\[rq], below).  The name
-\f[CI]location\fP is deprecated, but still valid; it will be obsoleted and
-removed in a future release.  It is recommended to use \f[CI]directory\fP
-rather than \f[CI]location\fP.  Note that it is an error to use both
-\f[CI]directory\fP and \f[CI]location\fP at the same time.
-.SS File chroots
-Chroots of type \[oq]file\[cq] are files on the current filesystem containing
-an archive of the chroot files.  They implement the \fBsource chroot\fP options
-(see \[lq]\fISource chroot options\fP\[rq], below).  Note that a corresponding
-source chroot (of type \[oq]file\[cq]) will be created for each chroot of this
-type; this is for convenient access to the source archive, e.g. for the purpose
-of updating. These additional options are also implemented:
-.TP
-\f[CBI]file=\fP\f[CI]filename\fP
-The file containing the archived chroot environment (mandatory).  This must be
-a tar (tape archive), optionally compressed with gzip or bzip2, or a zip
-archive.  The file extensions used to determine the type are are \fI.tar\fP,
-\fI.tar.gz\fP, \fI.tar.bz2\fP, \fI.tgz\fP, \fI.tbz\fP and \fI.zip\fP.  This
-file must be owned by the root user, and not be writable by other.
-.TP
-\f[CBI]location=\fP\f[CI]path\fP
-This is the path to the chroot \fIinside\fP the archive.  For example, if the
-archive contains a chroot in \fI/squeeze\fP, you would specify
-\[lq]/squeeze\[rq] here.  If the chroot is the only thing in the archive,
-i.e. \fI/\fP is the root filesystem for the chroot, this option should be left
-blank, or omitted entirely.
-.SS Loopback chroots
-Chroots of type \[oq]loopback\[cq] are a filesystem available as a file on
-disk, accessed via a loopback mount.  The file will be loopback mounted and
-unmounted on demand.  Loopback chroots implement the \fBmountable chroot\fP and
-\fBfilesystem union chroot\fP options (see \[lq]\fIMountable chroot
-options\fP\[rq] and \[lq]\fIFilesystem Union chroot options\fP\[rq], below),
-plus an additional option:
-.TP
-\f[CBI]file=\fP\f[CI]filename\fP
-This is the filename of the file containing the filesystem, including the
-absolute path.  For example \[lq]/srv/chroot/sid\[rq].
-.SS Block device chroots
-Chroots of type \[oq]block\-device\[cq] are a filesystem available on an
-unmounted block device.  The device will be mounted and unmounted on demand.
-Block device chroots implement the \fBmountable chroot\fP and \fBfilesystem
-union chroot\fP options (see \[lq]\fIMountable chroot options\fP\[rq] and
-\[lq]\fIFilesystem Union chroot options\fP\[rq], below), plus an additional
-option:
-.TP
-\f[CBI]device=\fP\f[CI]device\fP
-This is the device name of the block device, including the absolute path.  For
-example, \[lq]/dev/sda5\[rq].
-.SS Btrfs snapshot chroots
-Chroots of type \[oq]btrfs\-snapshot\[cq] are a Btrfs snapshot created from an
-existing Btrfs subvolume on a mounted Btrfs filesystem.  A snapshot will be
-created from this source subvolume on demand at the start of a session, and
-then the snapshot will be mounted.  At the end of the session, the snapshot
-will be unmounted and deleted.  This chroot type implements the \fBsource
-chroot\fP options (see \[lq]\fISource chroot options\fP\[rq], below).  Note
-that a corresponding source chroot (of type \[oq]directory\[cq]) will be
-created for each chroot of this type; this is for convenient access to the
-source volume. These additional options are also implemented:
-.TP
-\f[CBI]btrfs\-source\-subvolume=\fP\f[CI]directory\fP
-The directory containing the source subvolume.
-.TP
-\f[CBI]btrfs\-snapshot\-directory=\fP\f[CI]directory\fP
-The directory in which to store the snapshots of the above source subvolume.
-.SS LVM snapshot chroots
-Chroots of type \[oq]lvm\-snapshot\[cq] are a filesystem available on an LVM
-logical volume (LV).  A snapshot LV will be created from this LV on demand, and
-then the snapshot will be mounted.  At the end of the session, the snapshot LV
-will be unmounted and removed.
-.PP
-LVM snapshot chroots implement the \fBsource chroot\fP options (see
-\[lq]\fISource chroot options\fP\[rq], below), and all the options for
-\[oq]block\-device\[cq].  Note that a corresponding source chroot (of type
-\[oq]block-device\[cq]) will be created for each chroot of this type; this is
-for convenient access to the source device. This additional option is also
-implemented:
-.TP
-\f[CBI]lvm-snapshot-options=\fP\f[CI]snapshot_options\fP
-Snapshot options.  These are additional options to pass to lvcreate(8).  For
-example, \[lq]\-L 2g\[rq] to create a snapshot 2 GiB in size.
-.B Note:
-the LV name (\fI\-n\fP), the snapshot option (\fI\-s\fP) and the original LV
-path may not be specfied here; they are set automatically by schroot.
-.SS Source chroot options
-The \[oq]btrfs\-snapshot\[cq], \[oq]file\[cq] and \[oq]lvm-snapshot\[cq] chroot
-types implement source chroots.  Additionally, chroot types with union support
-enabled implement source chroots (see \[lq]\fIFilesystem Union chroot
-options\fP\[rq], below).  These are chroots which automatically create a copy
-of themselves before use, and are usually session managed.  These chroots
-additionally provide an extra chroot in the \fIsource:\fP namespace, to allow
-convenient access to the original (non-snapshotted) data, and to aid in chroot
-maintenance.  I.e. for a chroot named \fIwheezy\fP (\fIchroot:wheezy\fP), a
-corresponding \fIsource:wheezy\fP chroot will be created.  For compatibility
-with older versions of schroot which did not support namespaces, a chroot with
-a \fI\-source\fP suffix appended to the chroot name will be created in addition
-(i.e. \fIwheezy\-source\fP using the above example).  Note that these
-compatibility names will be removed in schroot 1.5.0, so the use of the
-\fIsource:\fP namespace is preferred over the use of the \fI-source\fP suffix
-form.  See
-.BR schroot (1)
-for further details.
-.PP
-These chroots provide the following additional options:
-.TP
-\f[CBI]source\-clone=\fP\f[CI]true\fP|\f[CI]false\fP
-Set whether the source chroot should be automatically cloned (created) for this
-chroot.  The default is \f[CI]true\fP to automatically clone, but if desired
-may be disabled by setting to \f[CI]false\fP.  If disabled, the source chroot
-will be inaccessible.
-.TP
-\f[CBI]source\-users=\fP\f[CI]user1,user2,...\fP
-A comma-separated list of users which are allowed access to the source chroot.
-If empty or omitted, no users will be allowed access.  This will become the
-\f[CI]users\fP option in the source chroot.
-.TP
-\f[CBI]source\-groups=\fP\f[CI]group1,group2,...\fP
-A comma-separated list of groups which are allowed access to the source chroot.
-If empty or omitted, no users will be allowed access.  This will become the
-\f[CI]groups\fP option in the source chroot.
-.TP
-\f[CBI]source\-root\-users=\fP\f[CI]user1,user2,...\fP
-A comma-separated list of users which are allowed \fBpassword-less\fP root
-access to the source chroot.  If empty or omitted, no users will be allowed
-root access without a password (but if a user is in \f[CI]users\fP, they may
-gain access with a password).  This will become the \f[CI]root\-users\fP option
-in the source chroot.  See the section \[lq]\fISecurity\fP\[rq] below.
-.TP
-\f[CBI]source\-root\-groups=\fP\f[CI]group1,group2,...\fP
-A comma-separated list of groups which are allowed \fBpassword-less\fP root
-access to the source chroot.  If empty or omitted, no users will be allowed
-root access without a password (but if a user's group is in \f[CI]groups\fP,
-they may gain access with a password).  This will become the
-\f[CI]root\-groups\fP option in the source chroot.  See the section
-\[lq]\fISecurity\fP\[rq] below.
-.SS Mountable chroot options
-The \[oq]block\-device\[cq], \[oq]loopback\[cq] and \[oq]lvm-snapshot\[cq]
-chroot types implement device mounting.  These are chroots which require the
-mounting of a device in order to access the chroot.  These chroots provide the
-following additional options:
-.TP
-\f[CBI]mount\-options=\fP\f[CI]options\fP
-Mount options for the block device.  These are additional options to pass to
-.BR mount (8).
-For example, \[lq]\-o atime,sync,user_xattr\[rq].
-.TP
-\f[CBI]location=\fP\f[CI]path\fP
-This is the path to the chroot \fIinside\fP the filesystem on the device.  For
-example, if the filesystem contains a chroot in \fI/chroot/sid\fP, you would
-specify \[lq]/chroot/sid\[rq] here.  If the chroot is the only thing on the
-filesystem, i.e. \fI/\fP is the root filesystem for the chroot, this option
-should be left blank, or omitted entirely.
-.SS Filesystem Union chroot options
-The \[oq]block\-device\[cq], \[oq]directory\[cq] and \[oq]loopback\[cq] chroot
-types allow for the creation of a session using filesystem unions to overlay
-the original filesystem with a separate writable directory.  The original
-filesystem is read-only, with any modifications made to the filesystem made in
-the overlying writable directory, leaving the original filesystem unchanged.  A
-union permits multiple sessions to access and make changes to a single chroot
-simultaneously, while keeping the changes private to each session.  To enable
-this feature, set \f[CI]union\-type\fP to any supported value.  If enabled, the
-chroot will also be a \fBsource chroot\fP, which will provide additional
-options (see \[lq]\fISource chroot options\fP\[rq], above).  All entries are
-optional.
-.TP
-\f[CBI]union\-type=\fP\f[CI]type\fP
-Set the union filesystem type.  Currently supported filesystems are
-\[oq]aufs\[cq] and \[oq]unionfs\[cq].  The default is \[oq]none\[cq], which
-disables this feature.
-.TP
-\f[CBI]union\-mount\-options=\fP\f[CI]options\fP
-Union filesystem mount options (branch configuration), used for mounting the
-union filesystem specified with \fIunion\-type\fP.  This replaces the complete
-\[lq]\-o\[rq] string for mount and allows for the creation of complex
-filesystem unions.  Note that \[oq]aufs\[cq] and \[oq]unionfs\[cq] have
-different supported mount options.
-.B Note:
-One can use the variables \[lq]${CHROOT_UNION_OVERLAY_DIRECTORY}\[rq] and
-\[lq]${CHROOT_UNION_UNDERLAY_DIRECTORY}\[rq] to refer to the writable overlay
-session directory and read-only underlying directory which are to form the
-union.  See
-.BR schroot\-setup (5)
-for a complete variable list.
-.TP
-\f[CBI]union\-overlay\-directory\fP\f[CI]=directory\fP
-Specify the directory where the writeable overlay session directories will be
-created.  The default is \[oq]@SCHROOT_OVERLAY_DIR@\[cq].
-.TP
-\f[CBI]union\-underlay\-directory\fP\f[CI]=directory\fP
-Specify the directory where the read-only underlying directories will be
-created.  The default is \[oq]@SCHROOT_UNDERLAY_DIR@\[cq].
-.SS Localisation
-.PP
-Some keys may be localised in multiple languages.  This is achieved by adding
-the locale name in square brackets after the key name.  For example:
-.br
-.RS
-\f[CR]description[en_GB]=\f[CI]British English translation\fP\fP
-.br
-.RE
-.PP
-This will localise the \f[CI]description\fP key for the en_GB locale.
-.RS
-\f[CR]description[fr]=\f[CI]French translation\fP\fP
-.br
-.RE
-.PP
-This will localise the \f[CI]description\fP key for all French locales.
-.br
-.SH CHROOT NAMES
-A number of characters or words are not permitted in a chroot name, session
-name or configuration filename.  The name may not contain a leading period
-(\[oq].\[cq]).  The characters \[oq]:\[cq] (colon), \[oq],\[cq] (comma) and
-\[oq]/\[cq] (forward slash) are not permitted anywhere in the name.  The name
-may also not contain a trailing tilde (\[oq]~\[cq]).  The rationale for these
-restrictions is given below.
-.TP
-.RB \[oq] . \[cq]
-A leading period could be used to create a name with a relative path in it, in
-combination with \[oq]/\[cq], and this could allow overwriting of files on the
-host filesystem.  Not allowing this character also means hidden files cannot be
-created.  It also means some editor backups are automatically ignored.  Periods
-are allowed anywhere else in the name.
-.TP
-.RB \[oq] : \[cq]
-A colon is used as a namespace delimiter, and so is not permitted as part of a
-chroot or session name.  LVM snapshot names may also not contain this character
-due to a naming restriction by
-.BR lvcreate (8).
-.TP
-.RB \[oq] / \[cq]
-Names containing this character are not valid filenames.  A forward slash would
-potentially allow creation of files in subdirectories.
-.TP
-.RB \[oq] , \[cq]
-Commas are used to separate items in lists.  Aliases are separated by commas
-and hence can't contain commas in their name.
-.TP
-.RB \[oq] ~ \[cq]
-Filenames containing trailing tildes are used for editor backup files, which
-are ignored.  Tildes are allowed anywhere else in the name.
-.TP
-.RB \[oq] dpkg-old \[cq]
-.TQ
-.RB \[oq] dpkg-dist \[cq]
-.TQ
-.RB \[oq] dpkg-new \[cq]
-.TQ
-.RB \[oq] dpkg-tmp \[cq]
-These names may not appear at the end of a name.  These are saved copies of
-conffiles used by the dpkg package manager, and will be ignored.
-.SH SECURITY
-.SS Untrusted users
-Note that giving untrusted users root access to chroots is a \fBserious
-security risk\fP!  Although the untrusted user will only have root access to
-files inside the chroot, in practice there are many obvious ways of breaking
-out of the chroot and of disrupting services on the host system.  As always,
-this boils down to \fItrust\fP.
-.PP
-.B Do not give chroot root access to users you would not trust
-.B with root access to the host system.
-.SS Profiles
-Depending upon which profile you have configured with the
-\f[CI]script\-config\fP option, different filesystems will be mounted inside
-the chroot, and different files will be copied into the chroot from the host.
-Some profiles will mount the host's \fI/dev\fP, while others will not.  Some
-profiles also bind mount additional parts of the host filesystem in order to
-allow use of certain features, including user's home directories and specific
-parts of \fI/var\fP.  Check the profile's \fIfstab\fP file to be certain of
-what will be mounted, and the other profile files to see which files and system
-databases will be copied into the chroot.  Choose a different profile or edit
-the files to further restrict what is made available inside the chroot.
-.PP
-There is a tradeoff between security (keeping the chroot as minimal as
-possible) and usability (which sometimes requires access to parts of the host
-filesystem).  The different profiles make different tradeoffs, and it is
-important that you assess which meets the security/usability tradeoff you
-require.
-.SH EXAMPLE
-\f[CR]# Sample configuration\fP
-.br
-\f[CR]\fP
-.br
-\f[CR][sid]\fP
-.br
-\f[CR]type=plain\fP
-.br
-\f[CR]description=Debian unstable\fP
-.br
-\f[CR]description[fr_FR]=Debian instable\fP
-.br
-\f[CR]directory=/srv/chroot/sid\fP
-.br
-\f[CR]priority=3\fP
-.br
-\f[CR]users=jim\fP
-.br
-\f[CR]groups=sbuild\fP
-.br
-\f[CR]root\-users=rleigh\fP
-.br
-\f[CR]aliases=unstable,default\fP
-.br
-\f[CR]\fP
-.br
-\f[CR][etch]\fP
-.br
-\f[CR]type=block\-device\fP
-.br
-\f[CR]description=Debian testing (32\-bit)\fP
-.br
-\f[CR]priority=2\fP
-.br
-\f[CR]groups=users\fP
-.br
-\f[CR]#groups=sbuild\-security\fP
-.br
-\f[CR]aliases=testing\fP
-.br
-\f[CR]device=/dev/hda_vg/etch_chroot\fP
-.br
-\f[CR]mount\-options=\-o atime\fP
-.br
-\f[CR]personality=linux32\fP
-.br
-\f[CR]\fP
-.br
-\f[CR][sid\-file]\fP
-.br
-\f[CR]type=file\fP
-.br
-\f[CR]description=Debian sid file\-based chroot\fP
-.br
-\f[CR]priority=3\fP
-.br
-\f[CR]groups=sbuild\fP
-.br
-\f[CR]file=/srv/chroots/sid.tar.gz\fP
-.br
-\f[CR]\fP
-.br
-\f[CR][sid\-snapshot]\fP
-.br
-\f[CR]type=lvm\-snapshot\fP
-.br
-\f[CR]description=Debian unstable LVM snapshot\fP
-.br
-\f[CR]priority=3\fP
-.br
-\f[CR]groups=sbuild\fP
-.br
-\f[CR]users=rleigh\fP
-.br
-\f[CR]source\-root\-users=rleigh\fP
-.br
-\f[CR]source\-root\-groups=admin\fP
-.br
-\f[CR]device=/dev/hda_vg/sid_chroot\fP
-.br
-\f[CR]mount\-options=\-o atime,sync,user_xattr\fP
-.br
-\f[CR]lvm\-snapshot\-options=\-\-size 2G\fP
-.SH FILES
-.SS Chroot definitions
-.TP
-\f[BI]@SCHROOT_CONF@\fP
-The system-wide chroot definition file.  This file must be owned by the root
-user, and not be writable by other.
-.TP
-\f[BI]@SCHROOT_CONF_CHROOT_D@\fP
-Additional chroot definitions may be placed in files under this directory.
-They are treated in exactly that same manner as \fI@SCHROOT_CONF@\fP.  Each
-file may contain one or more chroot definitions.
-.SS Setup script configuration
-The directory \f[BI]@SCHROOT_SYSCONF_DIR@/default\fP contains the default
-settings used by setup scripts.
-.TP
-\f[BI]config\fP
-Main configuration file read by setup scripts.  The format of this file is
-described in
-.BR schroot\-script\-config (5).
-This is the default value for the \f[CI]script\-config\fP key.  Note that this
-was formerly named \fI@SCHROOT_SYSCONF_DIR@/script\-defaults\fP.  The following
-files are referenced by default:
-.TP
-\f[BI]copyfiles\fP
-A list of files to copy into the chroot from the host system.  Note that this
-was formerly named \fI@SCHROOT_SYSCONF_DIR@/copyfiles\-defaults\fP.
-.TP
-\f[BI]fstab\fP
-A file in the format decribed in
-.BR fstab (5),
-used to mount filesystems inside the chroot.  The mount location is relative to
-the root of the chroot.  Note that this was formerly named
-\fI@SCHROOT_SYSCONF_DIR@/mount\-defaults\fP.
-.TP
-\f[BI]nssdatabases\fP
-System databases (as described in \fI/etc/nsswitch.conf\fP on GNU/Linux
-systems) to copy into the chroot from the host.  Note that this was formerly
-named \fI@SCHROOT_SYSCONF_DIR@/nssdatabases\-defaults\fP.
-.SH AUTHORS
-Roger Leigh.
-.SH COPYRIGHT
-Copyright \(co 2005\-2010  Roger Leigh \f[CR]<rleigh@debian.org>\fP
-.PP
-\fBschroot\fP 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 3 of the License, or (at your option) any later
-version.
-.SH SEE ALSO
-.BR sbuild (1),
-.BR schroot (1),
-.BR schroot\-script\-config (5),
-.BR schroot\-faq (7),
-.BR mount (8).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff -Nru schroot-1.4.23/man/schroot.conf.5.man schroot-1.4.25/man/schroot.conf.5.man
--- schroot-1.4.23/man/schroot.conf.5.man	1970-01-01 00:00:00.000000000 +0000
+++ schroot-1.4.25/man/schroot.conf.5.man	2012-01-23 09:55:07.000000000 +0000
@@ -0,0 +1,624 @@
+.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
+.\"
+.\" schroot 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 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" schroot 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, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
+.so config.man
+.TH SCHROOT.CONF 5 "@RELEASE_DATE@" "Version @VERSION@" "Debian sbuild"
+.SH NAME
+schroot.conf \- chroot definition file for schroot
+.SH DESCRIPTION
+\f[BI]schroot.conf\fP is a plain UTF-8 text file, describing the chroots
+available for use with schroot.
+.PP
+Comments are introduced following a \[oq]\f[CR]\[sh]\fP\[cq] (\[lq]hash\[rq])
+character at the beginning of a line, or following any other text.  All text
+right of the \[oq]\f[CR]\[sh]\fP\[cq] is treated as a comment.
+.PP
+The configuration format is an INI-style format, split into groups of key-value
+pairs separated by section names in square brackets.
+.SS General options
+A chroot is defined as a group of key-value pairs, which is started by a name
+in square brackets on a line by itself.  The file may contain multiple groups
+which therefore define multiple chroots.
+.PP
+A chroot definition is started by the name of the chroot in square brackets.
+For example,
+.IP
+\f[CR]\[lB]sid\[rB]
+.PP
+The name is subject to certain naming restrictions.  For further details, see
+the section \[lq]\fIChroot Names\fP\[rq] below.
+.PP
+This is then followed by several key-value pairs, one per line:
+.TP
+\f[CBI]type=\fP\f[CI]type\fP
+The type of the chroot.  Valid types are \[oq]plain\[cq], \[oq]directory\[cq],
+\[oq]file\[cq], \[oq]loopback\[cq], \[oq]block\-device\[cq],
+\[oq]btrfs\-snapshot\[cq] and \[oq]lvm\-snapshot\[cq].  If empty or omitted,
+the default type is \[oq]plain\[cq].  Note that \[oq]plain\[cq] chroots do not
+run setup scripts and mount filesystems; \[oq]directory\[cq] is recommended for
+normal use (see \[lq]\fIPlain and directory chroots\fP\[rq], below).
+.TP
+\f[CBI]description=\fP\f[CI]description\fP
+A short description of the chroot.  This may be localised for different
+languages; see the section \[lq]\fILocalisation\fP\[rq] below.
+.TP
+\f[CBI]priority=\fP\f[CI]number\fP
+Set the priority of a chroot.  \f[CI]number\fP is a positive integer indicating
+whether a distribution is older than another.  For example, \[lq]oldstable\[rq]
+and \[lq]oldstable-security\[rq] might be \[oq]0\[cq], while \[lq]stable\[rq]
+and \[lq]stable-security\[rq] are \[oq]1\[cq], \[lq]testing\[rq] is \[oq]2\[cq]
+and \[lq]unstable\[rq] is \[oq]3\[cq].  The values are not important, but the
+difference between them is.  This option is deprecated and no longer used by
+schroot, but is still permitted to be used; it will be obsoleted and removed in
+a future release.
+.TP
+\f[CBI]message-verbosity=\fP\f[CI]verbosity\fP
+Set the verbosity of messages printed by schroot when setting up, running
+commands and cleaning up the chroot.  Valid settings are \[oq]quiet\[cq]
+(suppress most messages), \[oq]normal\[cq] (the default) and \[oq]verbose\[cq]
+(show all messages).  This setting is overridden by the options \fI\-\-quiet\fP
+and \fI\-\-verbose\fP.
+.TP
+\f[CBI]users=\fP\f[CI]user1,user2,...\fP
+A comma-separated list of users which are allowed access to the chroot.  If
+empty or omitted, no users will be allowed access (unless a group they belong
+to is also specified in \f[CI]groups\fP).
+.TP
+\f[CBI]groups=\fP\f[CI]group1,group2,...\fP
+A comma-separated list of groups which are allowed access to the chroot.  If
+empty or omitted, no groups of users will be allowed access.
+.TP
+\f[CBI]root\-users=\fP\f[CI]user1,user2,...\fP
+A comma-separated list of users which are allowed \fBpassword-less\fP root
+access to the chroot.  If empty or omitted, no users will be allowed root
+access without a password (but if a user or a group they belong to is in
+\f[CI]users\fP or \f[CI]groups\fP, respectively, they may gain access with a
+password).  See the section \[lq]\fISecurity\fP\[rq] below.
+.TP
+\f[CBI]root\-groups=\fP\f[CI]group1,group2,...\fP
+A comma-separated list of groups which are allowed \fBpassword-less\fP root
+access to the chroot.  If empty or omitted, no users will be allowed root
+access without a password (but if a user or a group they belong to is in
+\f[CI]users\fP or \f[CI]groups\fP, respectively, they may gain access with a
+password).  See the section \[lq]\fISecurity\fP\[rq] below.
+.TP
+\f[CBI]aliases=\fP\f[CI]alias1,alias2,...\fP
+A comma-separated list of aliases (alternate names) for this chroot.  For
+example, a chroot named \[lq]sid\[rq] might have an \[oq]unstable\[cq] alias
+for convenience.  Aliases are subject to the same naming restrictions as the
+chroot name itself.
+.TP
+\f[CBI]run\-setup\-scripts=\fP\f[CI]true\fP|\f[CI]false\fP
+Set whether chroot setup scripts will be run.  The default is to run setup
+scripts for all chroot types except \[oq]plain\[cq].  Setup scripts are
+\fBrequired\fP to mount and configure the chroot environment.  This option is
+deprecated and no longer used by schroot, but is still permitted to be used; it
+will be obsoleted and removed in a future release.
+.TP
+\f[CBI]run\-exec\-scripts=\fP\f[CI]true\fP|\f[CI]false\fP
+Set whether chroot execution scripts will be run.  The default is the same as
+the default for the \f[CI]run\-setup\-scripts\fP key.  This option was called
+\f[CI]run\-session\-scripts\fP in versions prior to 0.2.5.  This option is
+deprecated and no longer used by schroot, but is still permitted to be used; it
+will be obsoleted and removed in a future release.
+.TP
+\f[CBI]script\-config=\fP\f[CI]filename\fP
+The behaviour of the chroot setup scripts may be customised on a per-chroot
+basis by providing a shell script which the scripts will source.  The filename
+is relative to \fI@SCHROOT_SYSCONF_DIR@\fP.  The default filename is
+\[oq]default/config\[cq].  Alternatives are \[oq]minimal/config\[cq] (minimal
+configuration), \[oq]desktop/config\[cq] (for running desktop applications in
+the chroot, making more functionality from the host system available in the
+chroot) and \[oq]sbuild/config\[cq] (for using the chroot for Debian package
+building).
+.IP
+Desktop users should note that the fstab file \fIdesktop/fstab\fP will need
+editing if you use gdm3.  The \f[CI]preserve\-environment\fP key should also be
+set to \[oq]true\[cq] so that the environment is preserved inside the chroot.
+.IP
+If none of the configuration profiles provided above meet your needs, then they
+may be edited to further customise them, and/or copied and used as a template
+for entirely new profiles.  Settings for specific chroots may also be set in a
+single script by using conditionals checking the chroot name and/or type.  Note
+that the script will be sourced once for each and every script invocation, and
+must be idempotent.  The file format is documented in
+.BR schroot-script-config (5).
+.IP
+Note that the different profiles have different security implications; see the
+section \[lq]\fISecurity\fP\[rq] below for further details.
+.TP
+\f[CBI]command\-prefix=\fP\f[CI]command,option1,option2,...\fP
+A comma-separated list of a command and the options for the command.  This
+command and its options will be prefixed to all commands run inside the chroot.
+This is useful for adding commands such as nice, ionice or eatmydata for all
+commands run inside the chroot.  nice and ionice will affect CPU and I/O
+scheduling.  eatmydata ingores filesystem fsync operations, and is useful for
+throwaway snapshot chroots where you don't care about dataloss, but do care
+about high speed.
+.TP
+\f[CBI]personality=\fP\f[CI]persona\fP
+Set the personality (process execution domain) to use.  This option is useful
+when using a 32-bit chroot on 64-bit system, for example.  Valid options on
+Linux are \[oq]bsd\[cq], \[oq]hpux\[cq], \[oq]irix32\[cq], \[oq]irix64\[cq],
+\[oq]irixn32\[cq], \[oq]iscr4\[cq], \[oq]linux\[cq], \[oq]linux32\[cq],
+\[oq]linux_32bit\[cq], \[oq]osf4\[cq], \[oq]osr5\[cq], \[oq]riscos\[cq],
+\[oq]scorvr3\[cq], \[oq]solaris\[cq], \[oq]sunos\[cq], \[oq]svr4\[cq],
+\[oq]uw7\[cq], \[oq]wysev386\[cq], and \[oq]xenix\[cq].  The default value is
+\[oq]linux\[cq].  There is also the special option \[oq]undefined\[cq]
+(personality not set).  For a 32-bit chroot on a 64-bit system,
+\[oq]linux32\[cq] is the option required.  The only valid option for non-Linux
+systems is \[oq]undefined\[cq].  The default value for non-Linux systems is
+\[oq]undefined\[cq].
+.TP
+\f[CBI]preserve\-environment=\fP\f[CI]true\fP|\f[CI]false\fP
+By default, the environment will not be preserved inside the chroot, instead a
+minimal environment will be used.  Set to \f[CI]true\fP to always preserve the
+environment.  This is useful for example when running X applications inside the
+chroot, which need the environment to function correctly.  The environment may
+also be preserved using the \fI\-\-preserve\-environment\fP option.
+.TP
+\f[CBI]environment\-filter=\fP\f[CI]regex\fP
+The environment to be set in the chroot will be filtered in order to remove
+environment variables which may pose a security risk.  Any environment variable
+matching the specified POSIX extended regular expression will be removed prior
+to executing any command in the chroot.
+.IP
+Potentially dangerous environment variables are removed for safety by default
+using the following regular expression:
+.na
+\[lq]\f[CR]^(BASH_ENV\:|CDPATH\:|ENV\:|HOSTALIASES\:|IFS\:|KRB5_CONFIG\:|KRBCONFDIR\:|KRBTKFILE\:|KRB_CONF\:|LD_.*\:|LOCALDOMAIN\:|NLSPATH\:|PATH_LOCALE\:|RES_OPTIONS\:|TERMINFO\:|TERMINFO_DIRS\:|TERMPATH)$\fP\[rq].
+.ad
+.SS Plain and directory chroots
+Chroots of type \[oq]plain\[cq] or \[oq]directory\[cq] are directories
+accessible in the filesystem.  The two types are equivalent except for the fact
+that directory chroots run setup scripts, whereas plain chroots do not.  In
+consequence, filesystems such as \fI/proc\fP are not mounted in plain chroots;
+it is the responsibility of the system administrator to configure such chroots
+by hand, whereas directory chroots are automatically configured.  Additionally,
+directory chroots implement the \fBfilesystem union chroot\fP options (see
+\[lq]\fIFilesystem Union chroot options\fP\[rq], below).
+.PP
+These chroot types have an additional (mandatory) configuration option:
+.TP
+\f[CBI]directory=\fP\f[CI]directory\fP
+The directory containing the chroot environment.  This is where the root will
+be changed to when executing a login shell or a command.  The directory must
+exist and have read and execute permissions to allow users access to it.  Note
+that on Linux systems it will be bind-mounted elsewhere for use as a chroot;
+the directory for \[oq]plain\[cq] chroots is mounted with the \fI\-\-rbind\fP
+option to
+.BR mount (8),
+while for \[oq]directory\[cq] chroots \fI\-\-bind\fP is used instead so that
+sub-mounts are not preserved (they should be set in the \fIfstab\fP file just
+like in \fI/etc/fstab\fP on the host).
+.IP
+This option was previously named \f[CI]location\fP, but was renamed to avoid
+ambiguity with the option by the same name for \fBmountable chroot\fP options
+(see \[lq]\fIMountable chroot options\fP\[rq], below).  The name
+\f[CI]location\fP is deprecated, but still valid; it will be obsoleted and
+removed in a future release.  It is recommended to use \f[CI]directory\fP
+rather than \f[CI]location\fP.  Note that it is an error to use both
+\f[CI]directory\fP and \f[CI]location\fP at the same time.
+.SS File chroots
+Chroots of type \[oq]file\[cq] are files on the current filesystem containing
+an archive of the chroot files.  They implement the \fBsource chroot\fP options
+(see \[lq]\fISource chroot options\fP\[rq], below).  Note that a corresponding
+source chroot (of type \[oq]file\[cq]) will be created for each chroot of this
+type; this is for convenient access to the source archive, e.g. for the purpose
+of updating. These additional options are also implemented:
+.TP
+\f[CBI]file=\fP\f[CI]filename\fP
+The file containing the archived chroot environment (mandatory).  This must be
+a tar (tape archive), optionally compressed with gzip or bzip2.  The file
+extensions used to determine the type are are \fI.tar\fP, \fI.tar.gz\fP,
+\fI.tar.bz2\fP, \fI.tgz\fP, and \fI.tbz\fP.  This file must be owned by the
+root user, and not be writable by other.  Note that zip archives are no longer
+supported; zip was not able to archive named pipes and device nodes, so was not
+suitable for archiving chroots.
+.TP
+\f[CBI]location=\fP\f[CI]path\fP
+This is the path to the chroot \fIinside\fP the archive.  For example, if the
+archive contains a chroot in \fI/squeeze\fP, you would specify
+\[lq]/squeeze\[rq] here.  If the chroot is the only thing in the archive,
+i.e. \fI/\fP is the root filesystem for the chroot, this option should be left
+blank, or omitted entirely.
+.SS Loopback chroots
+Chroots of type \[oq]loopback\[cq] are a filesystem available as a file on
+disk, accessed via a loopback mount.  The file will be loopback mounted and
+unmounted on demand.  Loopback chroots implement the \fBmountable chroot\fP and
+\fBfilesystem union chroot\fP options (see \[lq]\fIMountable chroot
+options\fP\[rq] and \[lq]\fIFilesystem Union chroot options\fP\[rq], below),
+plus an additional option:
+.TP
+\f[CBI]file=\fP\f[CI]filename\fP
+This is the filename of the file containing the filesystem, including the
+absolute path.  For example \[lq]/srv/chroot/sid\[rq].
+.SS Block device chroots
+Chroots of type \[oq]block\-device\[cq] are a filesystem available on an
+unmounted block device.  The device will be mounted and unmounted on demand.
+Block device chroots implement the \fBmountable chroot\fP and \fBfilesystem
+union chroot\fP options (see \[lq]\fIMountable chroot options\fP\[rq] and
+\[lq]\fIFilesystem Union chroot options\fP\[rq], below), plus an additional
+option:
+.TP
+\f[CBI]device=\fP\f[CI]device\fP
+This is the device name of the block device, including the absolute path.  For
+example, \[lq]/dev/sda5\[rq].
+.SS Btrfs snapshot chroots
+Chroots of type \[oq]btrfs\-snapshot\[cq] are a Btrfs snapshot created from an
+existing Btrfs subvolume on a mounted Btrfs filesystem.  A snapshot will be
+created from this source subvolume on demand at the start of a session, and
+then the snapshot will be mounted.  At the end of the session, the snapshot
+will be unmounted and deleted.  This chroot type implements the \fBsource
+chroot\fP options (see \[lq]\fISource chroot options\fP\[rq], below).  Note
+that a corresponding source chroot (of type \[oq]directory\[cq]) will be
+created for each chroot of this type; this is for convenient access to the
+source volume. These additional options are also implemented:
+.TP
+\f[CBI]btrfs\-source\-subvolume=\fP\f[CI]directory\fP
+The directory containing the source subvolume.
+.TP
+\f[CBI]btrfs\-snapshot\-directory=\fP\f[CI]directory\fP
+The directory in which to store the snapshots of the above source subvolume.
+.SS LVM snapshot chroots
+Chroots of type \[oq]lvm\-snapshot\[cq] are a filesystem available on an LVM
+logical volume (LV).  A snapshot LV will be created from this LV on demand, and
+then the snapshot will be mounted.  At the end of the session, the snapshot LV
+will be unmounted and removed.
+.PP
+LVM snapshot chroots implement the \fBsource chroot\fP options (see
+\[lq]\fISource chroot options\fP\[rq], below), and all the options for
+\[oq]block\-device\[cq].  Note that a corresponding source chroot (of type
+\[oq]block-device\[cq]) will be created for each chroot of this type; this is
+for convenient access to the source device. This additional option is also
+implemented:
+.TP
+\f[CBI]lvm-snapshot-options=\fP\f[CI]snapshot_options\fP
+Snapshot options.  These are additional options to pass to lvcreate(8).  For
+example, \[lq]\-L 2g\[rq] to create a snapshot 2 GiB in size.
+.B Note:
+the LV name (\fI\-n\fP), the snapshot option (\fI\-s\fP) and the original LV
+path may not be specfied here; they are set automatically by schroot.
+.SS Source chroot options
+The \[oq]btrfs\-snapshot\[cq], \[oq]file\[cq] and \[oq]lvm-snapshot\[cq] chroot
+types implement source chroots.  Additionally, chroot types with union support
+enabled implement source chroots (see \[lq]\fIFilesystem Union chroot
+options\fP\[rq], below).  These are chroots which automatically create a copy
+of themselves before use, and are usually session managed.  These chroots
+additionally provide an extra chroot in the \fIsource:\fP namespace, to allow
+convenient access to the original (non-snapshotted) data, and to aid in chroot
+maintenance.  I.e. for a chroot named \fIwheezy\fP (\fIchroot:wheezy\fP), a
+corresponding \fIsource:wheezy\fP chroot will be created.  For compatibility
+with older versions of schroot which did not support namespaces, a chroot with
+a \fI\-source\fP suffix appended to the chroot name will be created in addition
+(i.e. \fIwheezy\-source\fP using the above example).  Note that these
+compatibility names will be removed in schroot 1.5.0, so the use of the
+\fIsource:\fP namespace is preferred over the use of the \fI-source\fP suffix
+form.  See
+.BR schroot (1)
+for further details.
+.PP
+These chroots provide the following additional options:
+.TP
+\f[CBI]source\-clone=\fP\f[CI]true\fP|\f[CI]false\fP
+Set whether the source chroot should be automatically cloned (created) for this
+chroot.  The default is \f[CI]true\fP to automatically clone, but if desired
+may be disabled by setting to \f[CI]false\fP.  If disabled, the source chroot
+will be inaccessible.
+.TP
+\f[CBI]source\-users=\fP\f[CI]user1,user2,...\fP
+A comma-separated list of users which are allowed access to the source chroot.
+If empty or omitted, no users will be allowed access.  This will become the
+\f[CI]users\fP option in the source chroot.
+.TP
+\f[CBI]source\-groups=\fP\f[CI]group1,group2,...\fP
+A comma-separated list of groups which are allowed access to the source chroot.
+If empty or omitted, no users will be allowed access.  This will become the
+\f[CI]groups\fP option in the source chroot.
+.TP
+\f[CBI]source\-root\-users=\fP\f[CI]user1,user2,...\fP
+A comma-separated list of users which are allowed \fBpassword-less\fP root
+access to the source chroot.  If empty or omitted, no users will be allowed
+root access without a password (but if a user is in \f[CI]users\fP, they may
+gain access with a password).  This will become the \f[CI]root\-users\fP option
+in the source chroot.  See the section \[lq]\fISecurity\fP\[rq] below.
+.TP
+\f[CBI]source\-root\-groups=\fP\f[CI]group1,group2,...\fP
+A comma-separated list of groups which are allowed \fBpassword-less\fP root
+access to the source chroot.  If empty or omitted, no users will be allowed
+root access without a password (but if a user's group is in \f[CI]groups\fP,
+they may gain access with a password).  This will become the
+\f[CI]root\-groups\fP option in the source chroot.  See the section
+\[lq]\fISecurity\fP\[rq] below.
+.SS Mountable chroot options
+The \[oq]block\-device\[cq], \[oq]loopback\[cq] and \[oq]lvm-snapshot\[cq]
+chroot types implement device mounting.  These are chroots which require the
+mounting of a device in order to access the chroot.  These chroots provide the
+following additional options:
+.TP
+\f[CBI]mount\-options=\fP\f[CI]options\fP
+Mount options for the block device.  These are additional options to pass to
+.BR mount (8).
+For example, \[lq]\-o atime,sync,user_xattr\[rq].
+.TP
+\f[CBI]location=\fP\f[CI]path\fP
+This is the path to the chroot \fIinside\fP the filesystem on the device.  For
+example, if the filesystem contains a chroot in \fI/chroot/sid\fP, you would
+specify \[lq]/chroot/sid\[rq] here.  If the chroot is the only thing on the
+filesystem, i.e. \fI/\fP is the root filesystem for the chroot, this option
+should be left blank, or omitted entirely.
+.SS Filesystem Union chroot options
+The \[oq]block\-device\[cq], \[oq]directory\[cq] and \[oq]loopback\[cq] chroot
+types allow for the creation of a session using filesystem unions to overlay
+the original filesystem with a separate writable directory.  The original
+filesystem is read-only, with any modifications made to the filesystem made in
+the overlying writable directory, leaving the original filesystem unchanged.  A
+union permits multiple sessions to access and make changes to a single chroot
+simultaneously, while keeping the changes private to each session.  To enable
+this feature, set \f[CI]union\-type\fP to any supported value.  If enabled, the
+chroot will also be a \fBsource chroot\fP, which will provide additional
+options (see \[lq]\fISource chroot options\fP\[rq], above).  All entries are
+optional.
+.TP
+\f[CBI]union\-type=\fP\f[CI]type\fP
+Set the union filesystem type.  Currently supported filesystems are
+\[oq]aufs\[cq], \[oq]overlayfs\[cq] and \[oq]unionfs\[cq].  The default is
+\[oq]none\[cq], which disables this feature.
+.TP
+\f[CBI]union\-mount\-options=\fP\f[CI]options\fP
+Union filesystem mount options (branch configuration), used for mounting the
+union filesystem specified with \fIunion\-type\fP.  This replaces the complete
+\[lq]\-o\[rq] string for mount and allows for the creation of complex
+filesystem unions.  Note that \[oq]aufs\[cq], \[oq]overlayfs\[cq] and
+\[oq]unionfs\[cq] each have different supported mount options.
+.B Note:
+One can use the variables \[lq]${CHROOT_UNION_OVERLAY_DIRECTORY}\[rq] and
+\[lq]${CHROOT_UNION_UNDERLAY_DIRECTORY}\[rq] to refer to the writable overlay
+session directory and read-only underlying directory which are to form the
+union.  See
+.BR schroot\-setup (5)
+for a complete variable list.
+.TP
+\f[CBI]union\-overlay\-directory\fP\f[CI]=directory\fP
+Specify the directory where the writeable overlay session directories will be
+created.  The default is \[oq]@SCHROOT_OVERLAY_DIR@\[cq].
+.TP
+\f[CBI]union\-underlay\-directory\fP\f[CI]=directory\fP
+Specify the directory where the read-only underlying directories will be
+created.  The default is \[oq]@SCHROOT_UNDERLAY_DIR@\[cq].
+.SS Localisation
+.PP
+Some keys may be localised in multiple languages.  This is achieved by adding
+the locale name in square brackets after the key name.  For example:
+.br
+.RS
+\f[CR]description[en_GB]=\f[CI]British English translation\fP\fP
+.br
+.RE
+.PP
+This will localise the \f[CI]description\fP key for the en_GB locale.
+.RS
+\f[CR]description[fr]=\f[CI]French translation\fP\fP
+.br
+.RE
+.PP
+This will localise the \f[CI]description\fP key for all French locales.
+.br
+.SH CHROOT NAMES
+A number of characters or words are not permitted in a chroot name, session
+name or configuration filename.  The name may not contain a leading period
+(\[oq].\[cq]).  The characters \[oq]:\[cq] (colon), \[oq],\[cq] (comma) and
+\[oq]/\[cq] (forward slash) are not permitted anywhere in the name.  The name
+may also not contain a trailing tilde (\[oq]~\[cq]).  The rationale for these
+restrictions is given below.
+.TP
+.RB \[oq] . \[cq]
+A leading period could be used to create a name with a relative path in it, in
+combination with \[oq]/\[cq], and this could allow overwriting of files on the
+host filesystem.  Not allowing this character also means hidden files cannot be
+created.  It also means some editor backups are automatically ignored.  Periods
+are allowed anywhere else in the name.
+.TP
+.RB \[oq] : \[cq]
+A colon is used as a namespace delimiter, and so is not permitted as part of a
+chroot or session name.  LVM snapshot names may also not contain this character
+due to a naming restriction by
+.BR lvcreate (8).
+.TP
+.RB \[oq] / \[cq]
+Names containing this character are not valid filenames.  A forward slash would
+potentially allow creation of files in subdirectories.
+.TP
+.RB \[oq] , \[cq]
+Commas are used to separate items in lists.  Aliases are separated by commas
+and hence can't contain commas in their name.
+.TP
+.RB \[oq] ~ \[cq]
+Filenames containing trailing tildes are used for editor backup files, which
+are ignored.  Tildes are allowed anywhere else in the name.
+.TP
+.RB \[oq] dpkg-old \[cq]
+.TQ
+.RB \[oq] dpkg-dist \[cq]
+.TQ
+.RB \[oq] dpkg-new \[cq]
+.TQ
+.RB \[oq] dpkg-tmp \[cq]
+These names may not appear at the end of a name.  These are saved copies of
+conffiles used by the dpkg package manager, and will be ignored.
+.SH SECURITY
+.SS Untrusted users
+Note that giving untrusted users root access to chroots is a \fBserious
+security risk\fP!  Although the untrusted user will only have root access to
+files inside the chroot, in practice there are many obvious ways of breaking
+out of the chroot and of disrupting services on the host system.  As always,
+this boils down to \fItrust\fP.
+.PP
+.B Do not give chroot root access to users you would not trust
+.B with root access to the host system.
+.SS Profiles
+Depending upon which profile you have configured with the
+\f[CI]script\-config\fP option, different filesystems will be mounted inside
+the chroot, and different files will be copied into the chroot from the host.
+Some profiles will mount the host's \fI/dev\fP, while others will not.  Some
+profiles also bind mount additional parts of the host filesystem in order to
+allow use of certain features, including user's home directories and specific
+parts of \fI/var\fP.  Check the profile's \fIfstab\fP file to be certain of
+what will be mounted, and the other profile files to see which files and system
+databases will be copied into the chroot.  Choose a different profile or edit
+the files to further restrict what is made available inside the chroot.
+.PP
+There is a tradeoff between security (keeping the chroot as minimal as
+possible) and usability (which sometimes requires access to parts of the host
+filesystem).  The different profiles make different tradeoffs, and it is
+important that you assess which meets the security/usability tradeoff you
+require.
+.SH EXAMPLE
+\f[CR]# Sample configuration\fP
+.br
+\f[CR]\fP
+.br
+\f[CR][sid]\fP
+.br
+\f[CR]type=plain\fP
+.br
+\f[CR]description=Debian unstable\fP
+.br
+\f[CR]description[fr_FR]=Debian instable\fP
+.br
+\f[CR]directory=/srv/chroot/sid\fP
+.br
+\f[CR]priority=3\fP
+.br
+\f[CR]users=jim\fP
+.br
+\f[CR]groups=sbuild\fP
+.br
+\f[CR]root\-users=rleigh\fP
+.br
+\f[CR]aliases=unstable,default\fP
+.br
+\f[CR]\fP
+.br
+\f[CR][etch]\fP
+.br
+\f[CR]type=block\-device\fP
+.br
+\f[CR]description=Debian testing (32\-bit)\fP
+.br
+\f[CR]priority=2\fP
+.br
+\f[CR]groups=users\fP
+.br
+\f[CR]#groups=sbuild\-security\fP
+.br
+\f[CR]aliases=testing\fP
+.br
+\f[CR]device=/dev/hda_vg/etch_chroot\fP
+.br
+\f[CR]mount\-options=\-o atime\fP
+.br
+\f[CR]personality=linux32\fP
+.br
+\f[CR]\fP
+.br
+\f[CR][sid\-file]\fP
+.br
+\f[CR]type=file\fP
+.br
+\f[CR]description=Debian sid file\-based chroot\fP
+.br
+\f[CR]priority=3\fP
+.br
+\f[CR]groups=sbuild\fP
+.br
+\f[CR]file=/srv/chroots/sid.tar.gz\fP
+.br
+\f[CR]\fP
+.br
+\f[CR][sid\-snapshot]\fP
+.br
+\f[CR]type=lvm\-snapshot\fP
+.br
+\f[CR]description=Debian unstable LVM snapshot\fP
+.br
+\f[CR]priority=3\fP
+.br
+\f[CR]groups=sbuild\fP
+.br
+\f[CR]users=rleigh\fP
+.br
+\f[CR]source\-root\-users=rleigh\fP
+.br
+\f[CR]source\-root\-groups=admin\fP
+.br
+\f[CR]device=/dev/hda_vg/sid_chroot\fP
+.br
+\f[CR]mount\-options=\-o atime,sync,user_xattr\fP
+.br
+\f[CR]lvm\-snapshot\-options=\-\-size 2G\fP
+.SH FILES
+.SS Chroot definitions
+.TP
+\f[BI]@SCHROOT_CONF@\fP
+The system-wide chroot definition file.  This file must be owned by the root
+user, and not be writable by other.
+.TP
+\f[BI]@SCHROOT_CONF_CHROOT_D@\fP
+Additional chroot definitions may be placed in files under this directory.
+They are treated in exactly that same manner as \fI@SCHROOT_CONF@\fP.  Each
+file may contain one or more chroot definitions.
+.SS Setup script configuration
+The directory \f[BI]@SCHROOT_SYSCONF_DIR@/default\fP contains the default
+settings used by setup scripts.
+.TP
+\f[BI]config\fP
+Main configuration file read by setup scripts.  The format of this file is
+described in
+.BR schroot\-script\-config (5).
+This is the default value for the \f[CI]script\-config\fP key.  Note that this
+was formerly named \fI@SCHROOT_SYSCONF_DIR@/script\-defaults\fP.  The following
+files are referenced by default:
+.TP
+\f[BI]copyfiles\fP
+A list of files to copy into the chroot from the host system.  Note that this
+was formerly named \fI@SCHROOT_SYSCONF_DIR@/copyfiles\-defaults\fP.
+.TP
+\f[BI]fstab\fP
+A file in the format decribed in
+.BR fstab (5),
+used to mount filesystems inside the chroot.  The mount location is relative to
+the root of the chroot.  Note that this was formerly named
+\fI@SCHROOT_SYSCONF_DIR@/mount\-defaults\fP.
+.TP
+\f[BI]nssdatabases\fP
+System databases (as described in \fI/etc/nsswitch.conf\fP on GNU/Linux
+systems) to copy into the chroot from the host.  Note that this was formerly
+named \fI@SCHROOT_SYSCONF_DIR@/nssdatabases\-defaults\fP.
+.so authors.man
+.so copyright.man
+.SH SEE ALSO
+.BR sbuild (1),
+.BR schroot (1),
+.BR schroot\-script\-config (5),
+.BR schroot\-faq (7),
+.BR mount (8).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff -Nru schroot-1.4.23/man/schroot-faq.7.in schroot-1.4.25/man/schroot-faq.7.in
--- schroot-1.4.23/man/schroot-faq.7.in	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/man/schroot-faq.7.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,261 +0,0 @@
-.\" Copyright © 2010  Roger Leigh <rleigh@debian.org>
-.\"
-.\" schroot 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 3 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" schroot 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, see
-.\" <http://www.gnu.org/licenses/>.
-.\"
-.TH SCHROOT-FAQ 7 "@RELEASE_DATE_S@" "Version @VERSION@" "Debian sbuild"
-.SH NAME
-schroot \- frequently asked questions
-.SH DESCRIPTION
-This manual page covers various frequently asked questions about configuration
-and usage of schroot.
-.SH CONFIGURATION
-.SS Why is schroot overwriting configuration files in the chroot?
-By default, schroot copies over the system NSS databases (\[oq]passwd\[cq],
-\[oq]shadow\[cq], \[oq]group\[cq], \[oq]gshadow\[cq], \[oq]services\[cq],
-\[oq]protocols\[cq], \[oq]networks\[cq], and \[oq]hosts\[cq], etc.) into the
-chroot.  The reason for this is that the chroot environment is not a completely
-separate system, and it copying them over keeps them synchronised.  However,
-this is not always desirable, particularly if installing a package in the
-chroot creates system users and groups which are not present on the host, since
-these will disappear next time the databases are copied over.
-.PP
-The suggested workaround here is to disable the copying by removing or
-commenting out the databases in the NSSDATABASES file in the script-config file
-for the chroot.  These are \fI@SCHROOT_SYSCONF_DIR@/default/nssdatabases\fP and
-\fI@SCHROOT_SYSCONF_DIR@/default/config\fP by default.
-.PP
-In the future, we will be working on a better scheme for keeping the host and
-chroot databases in sync which can merge entries rather than overwriting the
-entire database, which would preserve chroot-specific changes.
-.SS Should I use the plain or directory chroot type?
-These two chroot types are basically equivalent, since they are both just
-directories in the filesystem.  plain is very simple and does not perform any
-setup tasks; the only reason you would
-want to use it is if you're upgrading from a program such as
-.BR dchroot(1)
-or
-.BR chroot(8)
-which don't do anything other than running a command or shell in a directory.
-On the other hand, directory chroots do run setup scripts, which can mount
-additional filesystems and do other setup tasks.
-.SH ADVANCED CONFIGURATION
-.SS What are snapshots and unions?
-Some chroot types support \fIcloning\fP.  This means when you start a session,
-you get a \fIcopy\fP of the chroot which lasts just for the lifetime of the
-session.  This is useful when you want a temporary clean copy of a system for a
-single task, which is then automatically deleted when you're done with it.  For
-example, the Debian package build d\[ae]mons run
-.BR sbuild (1)
-to build Debian packages, and this program uses schroot to create a clean build
-environment for each package.  Without snapshotting, the chroot would need to
-be reset to its initial state at the end of each build to make it ready for the
-next one, and any debris left over from package removals or earlier builds
-could interfere with the next build.
-.PP
-The most commonly-used snapshotting method is to use LVM snapshots (chroot type
-\[oq]lvm\-snapshot\[cq]).  In this case the chroot must exist on an LVM logical
-volume (LV); snapshots of an LV may then be made with
-.BR lvcreate (8)
-during chroot session setup.  However, these use up a lot of disk space.  A
-newer method is to use Btrfs snapshots which use up much less disk space
-(chroot type \[oq]btrfs\-snapshot\[cq]), and may be more reliable than LVM
-snapshots.  Btrfs is however still experimental, but it is hoped that it will
-become the recommended method as it matures.
-.PP
-Unions are an alternative to snapshots.  In this situation, instead of creating
-a copy of the chroot filesystem, we overlay a read-write temporary filesystem
-on top of the chroot filesystem so that any modifications are stored in the
-overlay, leaving the original chroot filesystem untouched.  The Linux kernel
-has yet to integrate support for union filesystems such as aufs and unionfs, so
-LVM snapshots are still the recommended method at present.
-.SH USAGE
-.SS Can I run a d\[ae]mons in a chroot?
-A common problem is trying to run a d\[ae]mon in a chroot, and finding that
-this doesn't work.  Typically, the d\[ae]mon is killed shortly after it starts
-up.
-.PP
-When schroot runs, it begins a session, runs the specified command or shell,
-waits for the command or shell to exit, and then it ends the session.  For a
-normal command or shell, this works just fine.  However, d\[ae]mons normally
-start up by running in the background and detaching from the controlling
-terminal.  They do this by forking twice and letting the parent processes
-exit.  Unfortunately, this means schroot detects that the program exited (the
-d\[ae]mon is a orphaned grandchild of this process) and it then ends the
-session.  Part of ending the session is killing all processes running inside
-the chroot, which means the d\[ae]mon is killed as the session ends.
-.PP
-In consequence, it's not possible to run a d\[ae]mon \fIdirectly\fP with
-schroot.  You can however do it if you create a session with
-\fI\-\-begin\-session\fP and then run the d\[ae]mon with
-\fI\-\-run\-session\fP.  It's your responsibility to end the session with
-\fI\-\-end\-session\fP when the daemon has terminated or you no longer need it.
-.SS How do I manually cleaning up a broken session?
-Occasionally, it may be necessary to manually clean up sessions.  If something
-changes on your system which causes the setup scripts to fail when ending a
-session, for example removal of a needed file or directory, it may not be
-possible for schroot to clean everything up automatically.  For each of the
-session directories listed in the \[lq]\fISession directories\fP\[rq] section
-in
-.BR schroot (1),
-any files with the name of the session ID need deleting, and any directories
-with the name of the session ID need umounting (if there are any filesystems
-mounted under it), and then also removing.
-.PP
-For example, to remove a session named
-\fImy-session\fP by hand:
-.IP \[bu]
-Remove the session configuration file
-.br
-\f[CR]%\ \f[CB]rm\ @SCHROOT_SESSION_DIR@/my\-session\fP\fP\[CR]
-.IP \[bu]
-Check for mounted filesystems
-.br
-\f[CR]%\ \f[CB]@SCHROOT_LIBEXEC_DIR@/schroot\-listmounts\ \-m\ @SCHROOT_MOUNT_DIR@/my\-session\fP\fP\[CR]
-.IP \[bu]
-Unmount any mounted filesystems
-.IP \[bu]
-Remove \fI@SCHROOT_MOUNT_DIR@/my\-session\fP
-.IP \[bu]
-Repeat for the other directories such as \fI@SCHROOT_UNDERLAY_DIR@\fP,
-\fI@SCHROOT_OVERLAY_DIR@\fP and \fI@SCHROOT_FILE_UNPACK_DIR@\fP
-.PP
-\fBNOTE:\fP Do not remove any directories without checking if there are any
-filesystems mounted below them, since filesystems such as \fI/home\fP could
-still be bind mounted.  Doing so could cause irretrievable data loss!
-.SH ADVANCED USAGE
-.SS How do I use sessions?
-In normal use, running a command might look like this:
-.br
-\f[CR]%\ \f[CB]schroot\ \-c squeeze \-\- command\fP\fP\[CR]
-.PP
-which would run the command \fIcommand\fP in the \fIsqueeze\fP chroot.  While
-it's not apparent that a session is being used here, schroot is actually doing
-the following steps:
-.IP \[bu]
-Creating a session using the \fIsqueeze\fP chroot.  This will be automatically
-given a unique name, such as
-\fIsqueeze\-57a69547\-e014\-4f5d\-a98b\-f4f35a005307\fP, though you don't
-usually need to know about this
-.IP \[bu]
-Setup scripts are run to create the session chroot and configure it for you
-.IP \[bu]
-The command \fIcommand\fP is run inside the session chroot
-.IP \[bu]
-Setup scripts are run to clean up the session chroot
-.IP \[bu]
-The session is deleted
-.PP
-Now, if you wanted to run more than one command, you could run a shell and run
-them interactively, or you could put them into shell script and run that
-instead.  But you might want to do something in between, such as running
-arbitrary commands from a program or script where you don't know which commands
-to run in advance.  You might also want to preseve the chroot state in between
-commands, where the normal automatic session creation would reset the state in
-between each command.  This is what sessions are for: once created, the session
-is persistent and won't be automatically removed.  With a session, you can run
-as many commands as you like, but you need to create and delete the session by
-hand since schroot can't know by itself when you're done with it unlike in the
-single command case above.  This is quite easy:
-.br
-\f[CR]% \f[CB]schroot \-\-begin\-session \-c squeeze\fP\fP\[CR]
-.br
-\f[CR]squeeze\-57a69547\-e014\-4f5d\-a98b\-f4f35a005307\fP
-.PP
-This created a new session based upon the \fIsqueeze\fP chroot.  The unique
-name for the session, the session ID, was printed to standard output, so we
-could also save it as a shell variable at the same time like so:
-.br
-\f[CR]% \f[CB]SESSION=$(schroot \-\-begin\-session \-c squeeze)\fP\fP\[CR]
-.br
-\f[CR]% \f[CB]echo $SESSION\fP\fP\[CR]
-.br
-\f[CR]squeeze\-57a69547\-e014\-4f5d\-a98b\-f4f35a005307\fP
-.PP
-Now we have created the session and got the session ID, we can run commands in
-it using the session ID:
-.br
-\f[CR]% \f[CB]schroot \-\-run\-session \-c squeeze\-57a69547\-e014\-4f5d\-a98b\-f4f35a005307 \-\- command1\fP\fP\[CR]
-.PP
-or
-.br
-\f[CR]% \f[CB]schroot \-\-run\-session \-c "$SESSION" \-\- command1\fP\fP\[CR]
-.PP
-and then as many more commands as we like
-.br
-\f[CR]% \f[CB]schroot \-\-run\-session \-c "$SESSION" \-\- command2\fP\fP\[CR]
-.br
-\f[CR]% \f[CB]schroot \-\-run\-session \-c "$SESSION" \-\- command3\fP\fP\[CR]
-.br
-\f[CR]% \f[CB]schroot \-\-run\-session \-c "$SESSION" \-\- command4\fP\fP\[CR]
-.PP
-etc.
-.PP
-When we are done with the session, we can remove it with \fI\-\-end\-session\fP:
-.br
-\f[CR]% \f[CB]schroot \-\-end\-session \-c squeeze\-57a69547\-e014\-4f5d\-a98b\-f4f35a005307\fP\fP\[CR]
-.PP
-or
-.br
-\f[CR]% \f[CB]schroot \-\-end\-session \-c $SESSION\fP\fP\[CR]
-.PP
-Since the automatically generated session names can be long and unwieldy, the
-\fI\-\-session\-name\fP option allows you to provide you own name:
-.PP
-\f[CR]% \f[CB]schroot \-\-begin\-session \-c squeeze \-\-session\-name my\-name\fP\fP\[CR]
-.br
-\f[CR]my\-name\fP
-.SH CONTRIBUTING
-.SS Getting help and getting involved
-The mailing list \f[CR]<buildd-tools-devel@lists.alioth.debian.org>\fP is used
-for both user support and development discussion.  The list may be subscribed
-to from the project website at
-\f[CR]https://alioth.debian.org/projects/buildd-tools/\fP or the Mailman list
-interface at
-\f[CR]http://lists.alioth.debian.org/mailman/listinfo/buildd-tools-devel\fP.
-.SS Reporting bugs
-On Debian systems, bugs may be reported using the
-.BR reportbug (1)
-tool, or alternatively by mailing \f[CR]<submit@bugs.debian.org>\fP (see
-\f[CR]http://bugs.debian.org\fP for details on how to do that).
-.SS Getting the latest sources
-schroot is maintained in the git version control system.  You can get the
-latest sources from \f[CR]git://git.debian.org/git/buildd-tools/schroot\fP.
-.br
-\f[CR]% \f[CB]git clone git://git.debian.org/git/buildd-tools/schroot\fP\fP\[CR]
-.LP
-The master branch containes the current development release.  Stable releases
-are found on branches, for example the 1.4 series of releases are on
-the schroot-1.4 branch.
-.SH AUTHORS
-Roger Leigh.
-.SH COPYRIGHT
-Copyright \(co 2005\-2010  Roger Leigh \f[CR]<rleigh@debian.org>\fP
-.PP
-\fBschroot\fP 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 3 of the License, or (at your option) any later
-version.
-.SH SEE ALSO
-.BR dchroot (1),
-.BR schroot (1),
-.BR sbuild (1),
-.BR schroot\-setup (5),
-.BR schroot.conf (5).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff -Nru schroot-1.4.23/man/schroot-faq.7.man schroot-1.4.25/man/schroot-faq.7.man
--- schroot-1.4.23/man/schroot-faq.7.man	1970-01-01 00:00:00.000000000 +0000
+++ schroot-1.4.25/man/schroot-faq.7.man	2012-01-23 09:53:35.000000000 +0000
@@ -0,0 +1,255 @@
+.\" Copyright © 2010  Roger Leigh <rleigh@debian.org>
+.\"
+.\" schroot 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 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" schroot 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, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
+.so config.man
+.TH SCHROOT-FAQ 7 "\*[RELEASE_DATE]" "Version \*[VERSION]" "Debian sbuild"
+.SH NAME
+schroot \- frequently asked questions
+.SH DESCRIPTION
+This manual page covers various frequently asked questions about configuration
+and usage of schroot.
+.SH CONFIGURATION
+.SS Why is schroot overwriting configuration files in the chroot?
+By default, schroot copies over the system NSS databases (\[oq]passwd\[cq],
+\[oq]shadow\[cq], \[oq]group\[cq], \[oq]gshadow\[cq], \[oq]services\[cq],
+\[oq]protocols\[cq], \[oq]networks\[cq], and \[oq]hosts\[cq], etc.) into the
+chroot.  The reason for this is that the chroot environment is not a completely
+separate system, and it copying them over keeps them synchronised.  However,
+this is not always desirable, particularly if installing a package in the
+chroot creates system users and groups which are not present on the host, since
+these will disappear next time the databases are copied over.
+.PP
+The suggested workaround here is to disable the copying by removing or
+commenting out the databases in the NSSDATABASES file in the script-config file
+for the chroot.  These are \fI\*[SCHROOT_SYSCONF_DIR]/default/nssdatabases\fP and
+\fI\*[SCHROOT_SYSCONF_DIR]/default/config\fP by default.
+.PP
+In the future, we will be working on a better scheme for keeping the host and
+chroot databases in sync which can merge entries rather than overwriting the
+entire database, which would preserve chroot-specific changes.
+.SS Should I use the plain or directory chroot type?
+These two chroot types are basically equivalent, since they are both just
+directories in the filesystem.  plain is very simple and does not perform any
+setup tasks; the only reason you would
+want to use it is if you're upgrading from a program such as
+.BR dchroot(1)
+or
+.BR chroot(8)
+which don't do anything other than running a command or shell in a directory.
+On the other hand, directory chroots do run setup scripts, which can mount
+additional filesystems and do other setup tasks.
+.SH ADVANCED CONFIGURATION
+.SS What are snapshots and unions?
+Some chroot types support \fIcloning\fP.  This means when you start a session,
+you get a \fIcopy\fP of the chroot which lasts just for the lifetime of the
+session.  This is useful when you want a temporary clean copy of a system for a
+single task, which is then automatically deleted when you're done with it.  For
+example, the Debian package build d\[ae]mons run
+.BR sbuild (1)
+to build Debian packages, and this program uses schroot to create a clean build
+environment for each package.  Without snapshotting, the chroot would need to
+be reset to its initial state at the end of each build to make it ready for the
+next one, and any debris left over from package removals or earlier builds
+could interfere with the next build.
+.PP
+The most commonly-used snapshotting method is to use LVM snapshots (chroot type
+\[oq]lvm\-snapshot\[cq]).  In this case the chroot must exist on an LVM logical
+volume (LV); snapshots of an LV may then be made with
+.BR lvcreate (8)
+during chroot session setup.  However, these use up a lot of disk space.  A
+newer method is to use Btrfs snapshots which use up much less disk space
+(chroot type \[oq]btrfs\-snapshot\[cq]), and may be more reliable than LVM
+snapshots.  Btrfs is however still experimental, but it is hoped that it will
+become the recommended method as it matures.
+.PP
+Unions are an alternative to snapshots.  In this situation, instead of creating
+a copy of the chroot filesystem, we overlay a read-write temporary filesystem
+on top of the chroot filesystem so that any modifications are stored in the
+overlay, leaving the original chroot filesystem untouched.  The Linux kernel
+has yet to integrate support for union filesystems such as aufs and unionfs, so
+LVM snapshots are still the recommended method at present.
+.SH USAGE
+.SS Can I run a d\[ae]mons in a chroot?
+A common problem is trying to run a d\[ae]mon in a chroot, and finding that
+this doesn't work.  Typically, the d\[ae]mon is killed shortly after it starts
+up.
+.PP
+When schroot runs, it begins a session, runs the specified command or shell,
+waits for the command or shell to exit, and then it ends the session.  For a
+normal command or shell, this works just fine.  However, d\[ae]mons normally
+start up by running in the background and detaching from the controlling
+terminal.  They do this by forking twice and letting the parent processes
+exit.  Unfortunately, this means schroot detects that the program exited (the
+d\[ae]mon is a orphaned grandchild of this process) and it then ends the
+session.  Part of ending the session is killing all processes running inside
+the chroot, which means the d\[ae]mon is killed as the session ends.
+.PP
+In consequence, it's not possible to run a d\[ae]mon \fIdirectly\fP with
+schroot.  You can however do it if you create a session with
+\fI\-\-begin\-session\fP and then run the d\[ae]mon with
+\fI\-\-run\-session\fP.  It's your responsibility to end the session with
+\fI\-\-end\-session\fP when the daemon has terminated or you no longer need it.
+.SS How do I manually cleaning up a broken session?
+Occasionally, it may be necessary to manually clean up sessions.  If something
+changes on your system which causes the setup scripts to fail when ending a
+session, for example removal of a needed file or directory, it may not be
+possible for schroot to clean everything up automatically.  For each of the
+session directories listed in the \[lq]\fISession directories\fP\[rq] section
+in
+.BR schroot (1),
+any files with the name of the session ID need deleting, and any directories
+with the name of the session ID need umounting (if there are any filesystems
+mounted under it), and then also removing.
+.PP
+For example, to remove a session named
+\fImy-session\fP by hand:
+.IP \[bu]
+Remove the session configuration file
+.br
+\f[CR]%\ \f[CB]rm\ \*[SCHROOT_SESSION_DIR]/my\-session\fP\fP\[CR]
+.IP \[bu]
+Check for mounted filesystems
+.br
+\f[CR]%\ \f[CB]\*[SCHROOT_LIBEXEC_DIR]/schroot\-listmounts\ \-m\ \*[SCHROOT_MOUNT_DIR]/my\-session\fP\fP\[CR]
+.IP \[bu]
+Unmount any mounted filesystems
+.IP \[bu]
+Remove \fI\*[SCHROOT_MOUNT_DIR]/my\-session\fP
+.IP \[bu]
+Repeat for the other directories such as \fI\*[SCHROOT_UNDERLAY_DIR]\fP,
+\fI\*[SCHROOT_OVERLAY_DIR]\fP and \fI\*[SCHROOT_FILE_UNPACK_DIR]\fP
+.PP
+\fBNOTE:\fP Do not remove any directories without checking if there are any
+filesystems mounted below them, since filesystems such as \fI/home\fP could
+still be bind mounted.  Doing so could cause irretrievable data loss!
+.SH ADVANCED USAGE
+.SS How do I use sessions?
+In normal use, running a command might look like this:
+.br
+\f[CR]%\ \f[CB]schroot\ \-c squeeze \-\- command\fP\fP\[CR]
+.PP
+which would run the command \fIcommand\fP in the \fIsqueeze\fP chroot.  While
+it's not apparent that a session is being used here, schroot is actually doing
+the following steps:
+.IP \[bu]
+Creating a session using the \fIsqueeze\fP chroot.  This will be automatically
+given a unique name, such as
+\fIsqueeze\-57a69547\-e014\-4f5d\-a98b\-f4f35a005307\fP, though you don't
+usually need to know about this
+.IP \[bu]
+Setup scripts are run to create the session chroot and configure it for you
+.IP \[bu]
+The command \fIcommand\fP is run inside the session chroot
+.IP \[bu]
+Setup scripts are run to clean up the session chroot
+.IP \[bu]
+The session is deleted
+.PP
+Now, if you wanted to run more than one command, you could run a shell and run
+them interactively, or you could put them into shell script and run that
+instead.  But you might want to do something in between, such as running
+arbitrary commands from a program or script where you don't know which commands
+to run in advance.  You might also want to preseve the chroot state in between
+commands, where the normal automatic session creation would reset the state in
+between each command.  This is what sessions are for: once created, the session
+is persistent and won't be automatically removed.  With a session, you can run
+as many commands as you like, but you need to create and delete the session by
+hand since schroot can't know by itself when you're done with it unlike in the
+single command case above.  This is quite easy:
+.br
+\f[CR]% \f[CB]schroot \-\-begin\-session \-c squeeze\fP\fP\[CR]
+.br
+\f[CR]squeeze\-57a69547\-e014\-4f5d\-a98b\-f4f35a005307\fP
+.PP
+This created a new session based upon the \fIsqueeze\fP chroot.  The unique
+name for the session, the session ID, was printed to standard output, so we
+could also save it as a shell variable at the same time like so:
+.br
+\f[CR]% \f[CB]SESSION=$(schroot \-\-begin\-session \-c squeeze)\fP\fP\[CR]
+.br
+\f[CR]% \f[CB]echo $SESSION\fP\fP\[CR]
+.br
+\f[CR]squeeze\-57a69547\-e014\-4f5d\-a98b\-f4f35a005307\fP
+.PP
+Now we have created the session and got the session ID, we can run commands in
+it using the session ID:
+.br
+\f[CR]% \f[CB]schroot \-\-run\-session \-c squeeze\-57a69547\-e014\-4f5d\-a98b\-f4f35a005307 \-\- command1\fP\fP\[CR]
+.PP
+or
+.br
+\f[CR]% \f[CB]schroot \-\-run\-session \-c "$SESSION" \-\- command1\fP\fP\[CR]
+.PP
+and then as many more commands as we like
+.br
+\f[CR]% \f[CB]schroot \-\-run\-session \-c "$SESSION" \-\- command2\fP\fP\[CR]
+.br
+\f[CR]% \f[CB]schroot \-\-run\-session \-c "$SESSION" \-\- command3\fP\fP\[CR]
+.br
+\f[CR]% \f[CB]schroot \-\-run\-session \-c "$SESSION" \-\- command4\fP\fP\[CR]
+.PP
+etc.
+.PP
+When we are done with the session, we can remove it with \fI\-\-end\-session\fP:
+.br
+\f[CR]% \f[CB]schroot \-\-end\-session \-c squeeze\-57a69547\-e014\-4f5d\-a98b\-f4f35a005307\fP\fP\[CR]
+.PP
+or
+.br
+\f[CR]% \f[CB]schroot \-\-end\-session \-c $SESSION\fP\fP\[CR]
+.PP
+Since the automatically generated session names can be long and unwieldy, the
+\fI\-\-session\-name\fP option allows you to provide you own name:
+.PP
+\f[CR]% \f[CB]schroot \-\-begin\-session \-c squeeze \-\-session\-name my\-name\fP\fP\[CR]
+.br
+\f[CR]my\-name\fP
+.SH CONTRIBUTING
+.SS Getting help and getting involved
+The mailing list \f[CR]<buildd-tools-devel@lists.alioth.debian.org>\fP is used
+for both user support and development discussion.  The list may be subscribed
+to from the project website at
+\f[CR]https://alioth.debian.org/projects/buildd-tools/\fP or the Mailman list
+interface at
+\f[CR]http://lists.alioth.debian.org/mailman/listinfo/buildd-tools-devel\fP.
+.SS Reporting bugs
+On Debian systems, bugs may be reported using the
+.BR reportbug (1)
+tool, or alternatively by mailing \f[CR]<submit@bugs.debian.org>\fP (see
+\f[CR]http://bugs.debian.org\fP for details on how to do that).
+.SS Getting the latest sources
+schroot is maintained in the git version control system.  You can get the
+latest sources from \f[CR]git://git.debian.org/git/buildd-tools/schroot\fP.
+.br
+\f[CR]% \f[CB]git clone git://git.debian.org/git/buildd-tools/schroot\fP\fP\[CR]
+.LP
+The master branch containes the current development release.  Stable releases
+are found on branches, for example the 1.4 series of releases are on
+the schroot-1.4 branch.
+.so authors.man
+.so copyright.man
+.SH SEE ALSO
+.BR dchroot (1),
+.BR schroot (1),
+.BR sbuild (1),
+.BR schroot\-setup (5),
+.BR schroot.conf (5).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff -Nru schroot-1.4.23/man/schroot-script-config.5.in schroot-1.4.25/man/schroot-script-config.5.in
--- schroot-1.4.23/man/schroot-script-config.5.in	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/man/schroot-script-config.5.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
-.\"
-.\" schroot 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 3 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" schroot 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, see
-.\" <http://www.gnu.org/licenses/>.
-.\"
-.TH SCHROOT-SCRIPT-CONFIG 5 "@RELEASE_DATE_S@" "Version @VERSION@" "Debian sbuild"
-.SH NAME
-schroot-script-config \- schroot chroot setup script configuration
-.SH DESCRIPTION
-\fBschroot\fP uses scripts to set up and then clean up the chroot
-environment.  These scripts may be customised using the \f[CI]script\-config\fP
-key in \fI@SCHROOT_CONF@\fP.  This key specifies a file which the setup scripts
-will source when they are run.  The file is a Bourne shell script, and in
-consequence may contain any valid shell code, in addition to simple variable
-assignments.  This will, for example, allow behaviour to be customised
-according to the specific chroot type or name.
-.SH ENVIRONMENT
-The environment is the same as for all setup scripts, described in
-.BR schroot-setup (5).
-.SH VARIABLES
-The following variables may be set to configure setup script behaviour.  Note
-that new variables may be added in future releases.  Third-party extensions to
-schroot which add their own setup scripts may add additional variables which
-are not documented here; consult the extension documentation for further
-details.
-.TP
-COPYFILES
-A file containing a list of files to copy into the chroot (one file per line).
-The file will have the same absolute location inside the chroot.
-.TP
-FSTAB
-The filesystem table file to be used to mount filesystems within the chroot.
-The format of this file is the same as for \fI/etc/fstab\fP, documented in
-.BR fstab (5).
-The only difference is that the mountpoint path \fIfs_dir\fP is relative to the
-chroot, rather than the root.
-.TP
-NSSDATABASES
-A file listing the system databases to copy into the chroot.  The default
-databases are \[oq]passwd\[cq], \[oq]shadow\[cq], \[oq]group\[cq],
-\[oq]services\[cq], \[oq]protocols\[cq], \[oq]networks\[cq], and
-\[oq]hosts\[cq].  \[oq]gshadow\[cq] is not yet copied by default, due to not
-being supported by all but the most recent version of the GNU C library.  The
-databases are copied using
-.BR getent (1)
-so all database sources listed in \fI/etc/nsswitch.conf\fP will be used for
-each database.
-.SH AUTHORS
-Roger Leigh.
-.SH COPYRIGHT
-Copyright \(co 2005\-2010  Roger Leigh \f[CR]<rleigh@debian.org>\fP
-.PP
-\fBschroot\fP 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 3 of the License, or (at your option) any later
-version.
-.SH SEE ALSO
-.BR sbuild (1),
-.BR schroot (1),
-.BR sh (1),
-.BR schroot.conf (5),
-.BR schroot\-setup (5).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff -Nru schroot-1.4.23/man/schroot-script-config.5.man schroot-1.4.25/man/schroot-script-config.5.man
--- schroot-1.4.23/man/schroot-script-config.5.man	1970-01-01 00:00:00.000000000 +0000
+++ schroot-1.4.25/man/schroot-script-config.5.man	2012-01-17 23:41:00.000000000 +0000
@@ -0,0 +1,73 @@
+.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
+.\"
+.\" schroot 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 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" schroot 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, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
+.so config.man
+.TH SCHROOT-SCRIPT-CONFIG 5 "\*[RELEASE_DATE]" "Version \*[VERSION]" "Debian sbuild"
+.SH NAME
+schroot-script-config \- schroot chroot setup script configuration
+.SH DESCRIPTION
+\fBschroot\fP uses scripts to set up and then clean up the chroot
+environment.  These scripts may be customised using the \f[CI]script\-config\fP
+key in \fI\*[SCHROOT_CONF]\fP.  This key specifies a file which the setup scripts
+will source when they are run.  The file is a Bourne shell script, and in
+consequence may contain any valid shell code, in addition to simple variable
+assignments.  This will, for example, allow behaviour to be customised
+according to the specific chroot type or name.
+.SH ENVIRONMENT
+The environment is the same as for all setup scripts, described in
+.BR schroot-setup (5).
+.SH VARIABLES
+The following variables may be set to configure setup script behaviour.  Note
+that new variables may be added in future releases.  Third-party extensions to
+schroot which add their own setup scripts may add additional variables which
+are not documented here; consult the extension documentation for further
+details.
+.TP
+COPYFILES
+A file containing a list of files to copy into the chroot (one file per line).
+The file will have the same absolute location inside the chroot.
+.TP
+FSTAB
+The filesystem table file to be used to mount filesystems within the chroot.
+The format of this file is the same as for \fI/etc/fstab\fP, documented in
+.BR fstab (5).
+The only difference is that the mountpoint path \fIfs_dir\fP is relative to the
+chroot, rather than the root.
+.TP
+NSSDATABASES
+A file listing the system databases to copy into the chroot.  The default
+databases are \[oq]passwd\[cq], \[oq]shadow\[cq], \[oq]group\[cq],
+\[oq]services\[cq], \[oq]protocols\[cq], \[oq]networks\[cq], and
+\[oq]hosts\[cq].  \[oq]gshadow\[cq] is not yet copied by default, due to not
+being supported by all but the most recent version of the GNU C library.  The
+databases are copied using
+.BR getent (1)
+so all database sources listed in \fI/etc/nsswitch.conf\fP will be used for
+each database.
+.so authors.man
+.so copyright.man
+.SH SEE ALSO
+.BR sbuild (1),
+.BR schroot (1),
+.BR sh (1),
+.BR schroot.conf (5),
+.BR schroot\-setup (5).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff -Nru schroot-1.4.23/man/schroot-setup.5.in schroot-1.4.25/man/schroot-setup.5.in
--- schroot-1.4.23/man/schroot-setup.5.in	2011-06-24 22:22:06.000000000 +0000
+++ schroot-1.4.25/man/schroot-setup.5.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,267 +0,0 @@
-.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
-.\"
-.\" schroot 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 3 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" schroot 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, see
-.\" <http://www.gnu.org/licenses/>.
-.\"
-.TH SCHROOT\-SETUP 5 "@RELEASE_DATE_S@" "Version @VERSION@" "Debian sbuild"
-.SH NAME
-schroot\-setup \- schroot chroot setup scripts
-.SH DESCRIPTION
-\fBschroot\fP uses scripts to set up and then clean up the chroot environment.
-The directory \f[BI]@SCHROOT_CONF_SETUP_D@\fP contains scripts run when a
-chroot is created and destroyed.  Several environment variables are set while
-the scripts are being run, which allows their behaviour to be customised,
-depending upon, for example, the type of chroot in use.
-.PP
-The scripts are run in name order, like those run by
-.BR init (8),
-by using the same style of execution as
-.BR run-parts (8).
-.PP
-The setup scripts are all invoked with two options:
-.IP 1
-The action to perform.
-.IP
-When a session is first started, the chroot is set up by running the scripts in
-@SCHROOT_CONF_SETUP_D@ with the \[oq]setup\-start\[cq] option.  When the
-session is ended, the scripts in \fI@SCHROOT_CONF_SETUP_D@\fP are run in
-reverse order with the \[oq]setup\-stop\[cq] option.
-.IP 2
-The chroot status.
-.IP
-This is either \[oq]ok\[cq] if there are no problems, or \[oq]fail\[cq] if
-something went wrong.  For example, particular actions may be skipped on
-failure.
-.PP
-Note that the scripts should be \fIidempotent\fP.  They \fBmust\fP be
-idempotent during the \[oq]setup\-stop\[cq] phase, because they may be run more
-than once, for example on failure.
-.SH ENVIRONMENT
-.SS General variables
-.TP
-AUTH_USER
-The username of the user the command in the chroot will run as.
-.TP
-CHROOT_NAME
-The chroot name.  Note that this is the name of the orignal chroot before
-session creation; you probably want SESSION_ID.
-.TP
-HOST
-.TP
-HOST_OS
-.TP
-HOST_VENDOR
-.TP
-HOST_CPU
-The host system architecture schroot is running upon.  This may be used to
-introduce architecture-specific behaviour into the setup scripts where
-required.  HOST is the GNU triplet for the architecture, while HOST_OS,
-HOST_VENDOR and HOST_CPU are the component parts of the triplet.
-.TP
-LIBEXEC_DIR
-The directory under which helper programs are located.
-.TP
-MOUNT_DIR
-The directory under which non-filesystem chroots are mounted (e.g. block
-devices and LVM snapshots).
-.TP
-PID
-The process ID of the schroot process.
-.TP
-PLATFORM
-The operating system platform schroot is running upon.  This may be used to
-introduce platform-specific behaviour into the setup scripts where required.
-Note that the HOST variables are probably what are required.  In the context of
-schroot, the platform is the supported configuration and behaviour for a given
-architecture, and may be identical between different architectures.
-.TP
-SESSION_ID
-The session identifier.
-.TP
-VERBOSE
-Set to \[oq]quiet\[cq] if only error messages should be printed,
-\[oq]normal\[cq] if other messages may be printed as well, and
-\[oq]verbose\[cq] if all messages may be printed.  Previously called
-AUTH_VERBOSITY.
-.TP
-CHROOT_SESSION_CREATE
-Set to \[oq]true\[cq] if a session will be created, otherwise \[oq]false\[cq].
-.TP
-CHROOT_SESSION_CLONE
-Set to \[oq]true\[cq] if a session will be cloned, otherwise \[oq]false\[cq].
-.TP
-CHROOT_SESSION_PURGE
-Set to \[oq]true\[cq] if a session will be purged, otherwise \[oq]false\[cq].
-.TP
-CHROOT_TYPE
-The type of the chroot.  This is useful for restricting a setup task to
-particular types of chroot (e.g. only block devices or LVM snapshots).
-.TP
-CHROOT_NAME
-The name of the chroot.  This is useful for restricting a setup task to a
-particular chroot, or set of chroots.
-.TP
-CHROOT_DESCRIPTION
-The description of the chroot.
-.TP
-CHROOT_MOUNT_LOCATION
-The location to mount the chroot.  It is used for mount point creation and
-mounting.
-.TP
-CHROOT_LOCATION
-The location of the chroot inside the mount point.  This is to allow multiple
-chroots on a single filesystem.  Set for all mountable chroot types.
-.TP
-CHROOT_PATH
-The absolute path to the chroot.  This is typically CHROOT_MOUNT_LOCATION and
-CHROOT_LOCATION concatenated together.  This is the path which should be used
-to access the chroots.
-.SS Plain and directory chroot variables
-These chroot types use only general variables.
-.SS File variables
-.TP
-CHROOT_FILE
-The file containing the chroot files.
-.TP
-CHROOT_FILE_REPACK
-Set to \[oq]true\[cq] to repack the chroot into an archive file on ending a
-session, otherwise \[oq]false\[cq].
-.SS Mountable chroot variables
-.PP
-These variables are only set for directly mountable chroot types.
-.TP
-CHROOT_MOUNT_DEVICE
-The device to mount containing the chroot.
-mounting.
-.TP
-CHROOT_MOUNT_OPTIONS
-Options to pass to
-.BR mount (8).
-.TP
-CHROOT_LOCATION
-The location of the chroot inside the mount point.  This allows the existence
-of multiple chroots on a single filesystem.
-.SS Filesystem union variables
-.TP
-CHROOT_UNION_TYPE
-Union filesystem type.
-.TP
-CHROOT_UNION_MOUNT_OPTIONS
-Union filesystem mount options.
-.TP
-CHROOT_UNION_OVERLAY_DIRECTORY
-Union filesystem overlay directory (writable).
-.TP
-CHROOT_UNION_UNDERLAY_DIRECTORY
-Union filesystem underlay directory (read-only).
-.SS Block device variables
-.TP
-CHROOT_DEVICE
-The device containing the chroot root filesystem.  This is usually, but not
-necessarily, the device which will be mounted.  For example, an LVM snapshot
-this will be the original logical volume.
-.SS LVM snapshot variables
-.TP
-CHROOT_LVM_SNAPSHOT_NAME
-Snapshot name to pass to
-.BR lvcreate (8).
-.TP
-CHROOT_LVM_SNAPSHOT_DEVICE
-The name of the LVM snapshot device.
-.TP
-CHROOT_LVM_SNAPSHOT_OPTIONS
-Options to pass to
-.BR lvcreate (8).
-.SH FILES
-.SS Setup script configuration
-The directory \f[BI]@SCHROOT_SYSCONF_DIR@/default\fP contains the default
-settings used by setup scripts.
-.TP
-\f[BI]config\fP
-Main configuration file read by setup scripts.  The format of this file is
-described in
-.BR schroot\-script\-config (5).
-This is the default value for the \f[CI]script\-config\fP key.  Note that this
-was formerly named \fI@SCHROOT_SYSCONF_DIR@/script\-defaults\fP.  The following
-files are referenced by default:
-.TP
-\f[BI]copyfiles\fP
-A list of files to copy into the chroot from the host system.  Note that this
-was formerly named \fI@SCHROOT_SYSCONF_DIR@/copyfiles\-defaults\fP.
-.TP
-\f[BI]fstab\fP
-A file in the format decribed in
-.BR fstab (5),
-used to mount filesystems inside the chroot.  The mount location is relative to
-the root of the chroot.  Note that this was formerly named
-\fI@SCHROOT_SYSCONF_DIR@/mount\-defaults\fP.
-.TP
-\f[BI]nssdatabases\fP
-System databases (as described in \fI/etc/nsswitch.conf\fP on GNU/Linux
-systems) to copy into the chroot from the host.  Note that this was formerly
-named \fI@SCHROOT_SYSCONF_DIR@/nssdatabases\-defaults\fP.
-.SS Setup scripts
-The directory \f[BI]@SCHROOT_CONF_SETUP_D@\fP contains the chroot setup scripts.
-.TP
-\f[BI]00check\fP
-Print debugging diagnostics and perform basic sanity checking.
-.TP
-\f[BI]05file\fP
-Unpack, clean up, and repack file-based chroots.
-.TP
-\f[BI]05fsunion\fP
-Create and remove union filesystems.
-.TP
-\f[BI]05lvm\fP
-Create and remove LVM snapshots.
-.TP
-\f[BI]10mount\fP
-Mount and unmount filesystems.
-.TP
-\f[BI]15killprocs\fP
-Kill processes still running inside the chroot when ending a session, which
-would prevent unmounting of filesystems and cleanup of any other resources.
-.TP
-\f[BI]20copyfiles\fP
-Copy files from the host system into the chroot.  Configure networking by
-copying \fIhosts\fP and \fIresolv.conf\fP, for example.
-.TP
-\f[BI]20nssdatabases\fP
-Configure system databases by copying passwd, shadow, group etc. into the
-chroot.
-.TP
-\f[BI]50chrootname\fP
-Set the chroot name (\fI/etc/debian_chroot\fP) in the chroot.  This may be used
-by the shell prompt to display the current chroot.
-.SH AUTHORS
-Roger Leigh.
-.SH COPYRIGHT
-Copyright \(co 2005\-2010  Roger Leigh \f[CR]<rleigh@debian.org>\fP
-.PP
-\fBschroot\fP 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 3 of the License, or (at your option) any later
-version.
-.SH SEE ALSO
-.BR schroot (1),
-.BR fstab (5),
-.BR schroot.conf (5),
-.BR schroot\-script\-config (5),
-.BR run\-parts (8).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff -Nru schroot-1.4.23/man/schroot-setup.5.man schroot-1.4.25/man/schroot-setup.5.man
--- schroot-1.4.23/man/schroot-setup.5.man	1970-01-01 00:00:00.000000000 +0000
+++ schroot-1.4.25/man/schroot-setup.5.man	2012-01-23 09:53:35.000000000 +0000
@@ -0,0 +1,261 @@
+.\" Copyright © 2005-2010  Roger Leigh <rleigh@debian.org>
+.\"
+.\" schroot 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 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" schroot 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, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
+.so config.man
+.TH SCHROOT\-SETUP 5 "\*[RELEASE_DATE]" "Version \*[VERSION]" "Debian sbuild"
+.SH NAME
+schroot\-setup \- schroot chroot setup scripts
+.SH DESCRIPTION
+\fBschroot\fP uses scripts to set up and then clean up the chroot environment.
+The directory \f[BI]\*[SCHROOT_CONF_SETUP_D]\fP contains scripts run when a
+chroot is created and destroyed.  Several environment variables are set while
+the scripts are being run, which allows their behaviour to be customised,
+depending upon, for example, the type of chroot in use.
+.PP
+The scripts are run in name order, like those run by
+.BR init (8),
+by using the same style of execution as
+.BR run-parts (8).
+.PP
+The setup scripts are all invoked with two options:
+.IP 1
+The action to perform.
+.IP
+When a session is first started, the chroot is set up by running the scripts in
+\*[SCHROOT_CONF_SETUP_D] with the \[oq]setup\-start\[cq] option.  When the
+session is ended, the scripts in \fI\*[SCHROOT_CONF_SETUP_D]\fP are run in
+reverse order with the \[oq]setup\-stop\[cq] option.
+.IP 2
+The chroot status.
+.IP
+This is either \[oq]ok\[cq] if there are no problems, or \[oq]fail\[cq] if
+something went wrong.  For example, particular actions may be skipped on
+failure.
+.PP
+Note that the scripts should be \fIidempotent\fP.  They \fBmust\fP be
+idempotent during the \[oq]setup\-stop\[cq] phase, because they may be run more
+than once, for example on failure.
+.SH ENVIRONMENT
+.SS General variables
+.TP
+AUTH_USER
+The username of the user the command in the chroot will run as.
+.TP
+CHROOT_NAME
+The chroot name.  Note that this is the name of the orignal chroot before
+session creation; you probably want SESSION_ID.
+.TP
+HOST
+.TP
+HOST_OS
+.TP
+HOST_VENDOR
+.TP
+HOST_CPU
+The host system architecture schroot is running upon.  This may be used to
+introduce architecture-specific behaviour into the setup scripts where
+required.  HOST is the GNU triplet for the architecture, while HOST_OS,
+HOST_VENDOR and HOST_CPU are the component parts of the triplet.
+.TP
+LIBEXEC_DIR
+The directory under which helper programs are located.
+.TP
+MOUNT_DIR
+The directory under which non-filesystem chroots are mounted (e.g. block
+devices and LVM snapshots).
+.TP
+PID
+The process ID of the schroot process.
+.TP
+PLATFORM
+The operating system platform schroot is running upon.  This may be used to
+introduce platform-specific behaviour into the setup scripts where required.
+Note that the HOST variables are probably what are required.  In the context of
+schroot, the platform is the supported configuration and behaviour for a given
+architecture, and may be identical between different architectures.
+.TP
+SESSION_ID
+The session identifier.
+.TP
+VERBOSE
+Set to \[oq]quiet\[cq] if only error messages should be printed,
+\[oq]normal\[cq] if other messages may be printed as well, and
+\[oq]verbose\[cq] if all messages may be printed.  Previously called
+AUTH_VERBOSITY.
+.TP
+CHROOT_SESSION_CREATE
+Set to \[oq]true\[cq] if a session will be created, otherwise \[oq]false\[cq].
+.TP
+CHROOT_SESSION_CLONE
+Set to \[oq]true\[cq] if a session will be cloned, otherwise \[oq]false\[cq].
+.TP
+CHROOT_SESSION_PURGE
+Set to \[oq]true\[cq] if a session will be purged, otherwise \[oq]false\[cq].
+.TP
+CHROOT_TYPE
+The type of the chroot.  This is useful for restricting a setup task to
+particular types of chroot (e.g. only block devices or LVM snapshots).
+.TP
+CHROOT_NAME
+The name of the chroot.  This is useful for restricting a setup task to a
+particular chroot, or set of chroots.
+.TP
+CHROOT_DESCRIPTION
+The description of the chroot.
+.TP
+CHROOT_MOUNT_LOCATION
+The location to mount the chroot.  It is used for mount point creation and
+mounting.
+.TP
+CHROOT_LOCATION
+The location of the chroot inside the mount point.  This is to allow multiple
+chroots on a single filesystem.  Set for all mountable chroot types.
+.TP
+CHROOT_PATH
+The absolute path to the chroot.  This is typically CHROOT_MOUNT_LOCATION and
+CHROOT_LOCATION concatenated together.  This is the path which should be used
+to access the chroots.
+.SS Plain and directory chroot variables
+These chroot types use only general variables.
+.SS File variables
+.TP
+CHROOT_FILE
+The file containing the chroot files.
+.TP
+CHROOT_FILE_REPACK
+Set to \[oq]true\[cq] to repack the chroot into an archive file on ending a
+session, otherwise \[oq]false\[cq].
+.SS Mountable chroot variables
+.PP
+These variables are only set for directly mountable chroot types.
+.TP
+CHROOT_MOUNT_DEVICE
+The device to mount containing the chroot.
+mounting.
+.TP
+CHROOT_MOUNT_OPTIONS
+Options to pass to
+.BR mount (8).
+.TP
+CHROOT_LOCATION
+The location of the chroot inside the mount point.  This allows the existence
+of multiple chroots on a single filesystem.
+.SS Filesystem union variables
+.TP
+CHROOT_UNION_TYPE
+Union filesystem type.
+.TP
+CHROOT_UNION_MOUNT_OPTIONS
+Union filesystem mount options.
+.TP
+CHROOT_UNION_OVERLAY_DIRECTORY
+Union filesystem overlay directory (writable).
+.TP
+CHROOT_UNION_UNDERLAY_DIRECTORY
+Union filesystem underlay directory (read-only).
+.SS Block device variables
+.TP
+CHROOT_DEVICE
+The device containing the chroot root filesystem.  This is usually, but not
+necessarily, the device which will be mounted.  For example, an LVM snapshot
+this will be the original logical volume.
+.SS LVM snapshot variables
+.TP
+CHROOT_LVM_SNAPSHOT_NAME
+Snapshot name to pass to
+.BR lvcreate (8).
+.TP
+CHROOT_LVM_SNAPSHOT_DEVICE
+The name of the LVM snapshot device.
+.TP
+CHROOT_LVM_SNAPSHOT_OPTIONS
+Options to pass to
+.BR lvcreate (8).
+.SH FILES
+.SS Setup script configuration
+The directory \f[BI]\*[SCHROOT_SYSCONF_DIR]/default\fP contains the default
+settings used by setup scripts.
+.TP
+\f[BI]config\fP
+Main configuration file read by setup scripts.  The format of this file is
+described in
+.BR schroot\-script\-config (5).
+This is the default value for the \f[CI]script\-config\fP key.  Note that this
+was formerly named \fI\*[SCHROOT_SYSCONF_DIR]/script\-defaults\fP.  The following
+files are referenced by default:
+.TP
+\f[BI]copyfiles\fP
+A list of files to copy into the chroot from the host system.  Note that this
+was formerly named \fI\*[SCHROOT_SYSCONF_DIR]/copyfiles\-defaults\fP.
+.TP
+\f[BI]fstab\fP
+A file in the format decribed in
+.BR fstab (5),
+used to mount filesystems inside the chroot.  The mount location is relative to
+the root of the chroot.  Note that this was formerly named
+\fI\*[SCHROOT_SYSCONF_DIR]/mount\-defaults\fP.
+.TP
+\f[BI]nssdatabases\fP
+System databases (as described in \fI/etc/nsswitch.conf\fP on GNU/Linux
+systems) to copy into the chroot from the host.  Note that this was formerly
+named \fI\*[SCHROOT_SYSCONF_DIR]/nssdatabases\-defaults\fP.
+.SS Setup scripts
+The directory \f[BI]\*[SCHROOT_CONF_SETUP_D]\fP contains the chroot setup scripts.
+.TP
+\f[BI]00check\fP
+Print debugging diagnostics and perform basic sanity checking.
+.TP
+\f[BI]05file\fP
+Unpack, clean up, and repack file-based chroots.
+.TP
+\f[BI]05fsunion\fP
+Create and remove union filesystems.
+.TP
+\f[BI]05lvm\fP
+Create and remove LVM snapshots.
+.TP
+\f[BI]10mount\fP
+Mount and unmount filesystems.
+.TP
+\f[BI]15killprocs\fP
+Kill processes still running inside the chroot when ending a session, which
+would prevent unmounting of filesystems and cleanup of any other resources.
+.TP
+\f[BI]20copyfiles\fP
+Copy files from the host system into the chroot.  Configure networking by
+copying \fIhosts\fP and \fIresolv.conf\fP, for example.
+.TP
+\f[BI]20nssdatabases\fP
+Configure system databases by copying passwd, shadow, group etc. into the
+chroot.
+.TP
+\f[BI]50chrootname\fP
+Set the chroot name (\fI/etc/debian_chroot\fP) in the chroot.  This may be used
+by the shell prompt to display the current chroot.
+.so authors.man
+.so copyright.man
+.SH SEE ALSO
+.BR schroot (1),
+.BR fstab (5),
+.BR schroot.conf (5),
+.BR schroot\-script\-config (5),
+.BR run\-parts (8).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff -Nru schroot-1.4.23/NEWS schroot-1.4.25/NEWS
--- schroot-1.4.23/NEWS	2011-06-24 22:25:46.000000000 +0000
+++ schroot-1.4.25/NEWS	2012-01-23 09:56:21.000000000 +0000
@@ -1,12 +1,26 @@
 NEWS                                                            -*- outline -*-
 ----
 
-Welcome to schroot 1.4.23.  Please read these release notes carefully.
+Welcome to schroot 1.4.25.  Please read these release notes carefully.
 
 Full installation instructions are provided in the INSTALL file.  The
 README file also contains more specific notes regarding building and
 configuration.
 
+* Major changes in 1.4.25:
+
+  1) Support for overlayfs has been added in addition to the existing
+     aufs and unionfs support.
+
+* Major changes in 1.4.24:
+
+  1) Support for zip file archives has been removed.  zip was not able
+     to archive named pipes and device nodes, and so was not usable
+     for chroot archival.
+
+  2) The autoconf and automake build logic from schroot 1.5.1 has been
+     backported to add multi-arch support to schroot 1.4.
+
 * Major changes in 1.4.23:
 
   None.
Binary files /tmp/fC9AlcXeS4/schroot-1.4.23/po/cs.gmo and /tmp/JHnpX8WUAV/schroot-1.4.25/po/cs.gmo differ
diff -Nru schroot-1.4.23/po/cs.po schroot-1.4.25/po/cs.po
--- schroot-1.4.23/po/cs.po	2011-06-25 11:10:19.000000000 +0000
+++ schroot-1.4.25/po/cs.po	2012-01-23 09:53:35.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: schroot\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2011-06-25 12:10+0100\n"
+"POT-Creation-Date: 2012-01-17 20:50+0000\n"
 "PO-Revision-Date: 2010-07-11 18:39+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
Binary files /tmp/fC9AlcXeS4/schroot-1.4.23/po/da.gmo and /tmp/JHnpX8WUAV/schroot-1.4.25/po/da.gmo differ
diff -Nru schroot-1.4.23/po/da.po schroot-1.4.25/po/da.po
--- schroot-1.4.23/po/da.po	2011-06-25 11:10:19.000000000 +0000
+++ schroot-1.4.25/po/da.po	2012-01-23 09:53:35.000000000 +0000
@@ -18,7 +18,7 @@
 msgstr ""
 "Project-Id-Version: schroot\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2011-06-25 12:10+0100\n"
+"POT-Creation-Date: 2012-01-17 20:50+0000\n"
 "PO-Revision-Date: 2010-12-08 17:34+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
Binary files /tmp/fC9AlcXeS4/schroot-1.4.23/po/de.gmo and /tmp/JHnpX8WUAV/schroot-1.4.25/po/de.gmo differ
diff -Nru schroot-1.4.23/po/de.po schroot-1.4.25/po/de.po
--- schroot-1.4.23/po/de.po	2011-06-25 11:10:19.000000000 +0000
+++ schroot-1.4.25/po/de.po	2012-01-23 09:53:35.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: schroot 1.4.12-1\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2011-06-25 12:10+0100\n"
+"POT-Creation-Date: 2012-01-17 20:50+0000\n"
 "PO-Revision-Date: 2010-12-07 20:15+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
Binary files /tmp/fC9AlcXeS4/schroot-1.4.23/po/en.gmo and /tmp/JHnpX8WUAV/schroot-1.4.25/po/en.gmo differ
diff -Nru schroot-1.4.23/po/en.po schroot-1.4.25/po/en.po
--- schroot-1.4.23/po/en.po	2011-06-25 11:10:19.000000000 +0000
+++ schroot-1.4.25/po/en.po	2012-01-23 09:53:35.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: schroot 0.1.2\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2011-06-25 12:10+0100\n"
+"POT-Creation-Date: 2012-01-17 20:50+0000\n"
 "PO-Revision-Date: 2010-09-06 20:02+0100\n"
 "Last-Translator: Roger Leigh <rleigh@debian.org>\n"
 "Language-Team: English <rleigh@debian.org>\n"
Binary files /tmp/fC9AlcXeS4/schroot-1.4.23/po/eu.gmo and /tmp/JHnpX8WUAV/schroot-1.4.25/po/eu.gmo differ
diff -Nru schroot-1.4.23/po/eu.po schroot-1.4.25/po/eu.po
--- schroot-1.4.23/po/eu.po	2011-06-25 11:10:19.000000000 +0000
+++ schroot-1.4.25/po/eu.po	2012-01-23 09:53:35.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2011-06-25 12:10+0100\n"
+"POT-Creation-Date: 2012-01-17 20:50+0000\n"
 "PO-Revision-Date: 2010-01-16 15:43+0000\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <Librezale@librezale.org>\n"
Binary files /tmp/fC9AlcXeS4/schroot-1.4.23/po/fr.gmo and /tmp/JHnpX8WUAV/schroot-1.4.25/po/fr.gmo differ
diff -Nru schroot-1.4.23/po/fr.po schroot-1.4.25/po/fr.po
--- schroot-1.4.23/po/fr.po	2011-06-25 11:10:19.000000000 +0000
+++ schroot-1.4.25/po/fr.po	2012-01-23 09:53:35.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: schroot\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2011-06-25 12:10+0100\n"
+"POT-Creation-Date: 2012-01-17 20:50+0000\n"
 "PO-Revision-Date: 2010-12-07 21:14+0100\n"
 "Last-Translator: Thomas Blein <tblein@tblein.eu>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
Binary files /tmp/fC9AlcXeS4/schroot-1.4.23/po/it.gmo and /tmp/JHnpX8WUAV/schroot-1.4.25/po/it.gmo differ
diff -Nru schroot-1.4.23/po/it.po schroot-1.4.25/po/it.po
--- schroot-1.4.23/po/it.po	2011-06-25 11:10:19.000000000 +0000
+++ schroot-1.4.25/po/it.po	2012-01-23 09:53:35.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: schroot 1.4.16-1\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2011-06-25 12:10+0100\n"
+"POT-Creation-Date: 2012-01-17 20:50+0000\n"
 "PO-Revision-Date: 2010-12-07 20:01+0100\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
Binary files /tmp/fC9AlcXeS4/schroot-1.4.23/po/pt.gmo and /tmp/JHnpX8WUAV/schroot-1.4.25/po/pt.gmo differ
diff -Nru schroot-1.4.23/po/pt.po schroot-1.4.25/po/pt.po
--- schroot-1.4.23/po/pt.po	2011-06-25 11:10:19.000000000 +0000
+++ schroot-1.4.25/po/pt.po	2012-01-23 09:53:35.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: schroot 1.4.8-1\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2011-06-25 12:10+0100\n"
+"POT-Creation-Date: 2012-01-17 20:50+0000\n"
 "PO-Revision-Date: 2010-09-08 23:50+0100\n"
 "Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
diff -Nru schroot-1.4.23/po/schroot.pot schroot-1.4.25/po/schroot.pot
--- schroot-1.4.23/po/schroot.pot	2011-06-25 11:10:19.000000000 +0000
+++ schroot-1.4.25/po/schroot.pot	2012-01-23 09:53:35.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2011-06-25 12:10+0100\n"
+"POT-Creation-Date: 2012-01-17 20:50+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
Binary files /tmp/fC9AlcXeS4/schroot-1.4.23/po/sv.gmo and /tmp/JHnpX8WUAV/schroot-1.4.25/po/sv.gmo differ
diff -Nru schroot-1.4.23/po/sv.po schroot-1.4.25/po/sv.po
--- schroot-1.4.23/po/sv.po	2011-06-25 11:10:19.000000000 +0000
+++ schroot-1.4.25/po/sv.po	2012-01-23 09:53:35.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: schroot\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2011-06-25 12:10+0100\n"
+"POT-Creation-Date: 2012-01-17 20:50+0000\n"
 "PO-Revision-Date: 2010-01-16 15:44+0000\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
Binary files /tmp/fC9AlcXeS4/schroot-1.4.23/po/vi.gmo and /tmp/JHnpX8WUAV/schroot-1.4.25/po/vi.gmo differ
diff -Nru schroot-1.4.23/po/vi.po schroot-1.4.25/po/vi.po
--- schroot-1.4.23/po/vi.po	2011-06-25 11:10:19.000000000 +0000
+++ schroot-1.4.25/po/vi.po	2012-01-23 09:53:35.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: schroot 1.4.12-1\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2011-06-25 12:10+0100\n"
+"POT-Creation-Date: 2012-01-17 20:50+0000\n"
 "PO-Revision-Date: 2010-09-28 22:16+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
Binary files /tmp/fC9AlcXeS4/schroot-1.4.23/po/zh_CN.gmo and /tmp/JHnpX8WUAV/schroot-1.4.25/po/zh_CN.gmo differ
diff -Nru schroot-1.4.23/po/zh_CN.po schroot-1.4.25/po/zh_CN.po
--- schroot-1.4.23/po/zh_CN.po	2011-06-25 11:10:20.000000000 +0000
+++ schroot-1.4.25/po/zh_CN.po	2012-01-23 09:53:35.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: schroot VERSION\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2011-06-25 12:10+0100\n"
+"POT-Creation-Date: 2012-01-17 20:50+0000\n"
 "PO-Revision-Date: 2010-12-09 15:47+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
diff -Nru schroot-1.4.23/sbuild/Makefile.in schroot-1.4.25/sbuild/Makefile.in
--- schroot-1.4.23/sbuild/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/sbuild/Makefile.in	2012-02-03 11:09:05.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -117,6 +117,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(pkgconfigdatadir)" "$(DESTDIR)$(pkgincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -303,14 +309,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -385,21 +406,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -463,6 +473,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -674,10 +696,8 @@
 $(am__aclocal_m4_deps):
 
 sbuild-config.h: stamp-h2
-	@if test ! -f $@; then \
-	  rm -f stamp-h2; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h2; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h2; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h2; else :; fi
 
 stamp-h2: $(srcdir)/sbuild-config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h2
@@ -774,26 +794,23 @@
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -817,9 +834,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgconfigdata_DATA)'; test -n "$(pkgconfigdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgconfigdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgconfigdatadir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgconfigdatadir)'; $(am__uninstall_files_from_dir)
 install-pkgincludeHEADERS: $(pkginclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
@@ -837,9 +852,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -940,10 +953,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/sbuild/sbuild-chroot-facet-union.cc schroot-1.4.25/sbuild/sbuild-chroot-facet-union.cc
--- schroot-1.4.23/sbuild/sbuild-chroot-facet-union.cc	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/sbuild/sbuild-chroot-facet-union.cc	2012-01-23 09:55:07.000000000 +0000
@@ -150,6 +150,7 @@
 chroot_facet_union::set_union_type (std::string const& type)
 {
   if (type == "aufs" ||
+      type == "overlayfs" ||
       type == "unionfs" ||
       type == "none")
     this->union_type = type;
diff -Nru schroot-1.4.23/sbuild/sbuild-chroot-file.h schroot-1.4.25/sbuild/sbuild-chroot-file.h
--- schroot-1.4.23/sbuild/sbuild-chroot-file.h	2011-06-24 22:22:06.000000000 +0000
+++ schroot-1.4.25/sbuild/sbuild-chroot-file.h	2012-01-23 09:53:35.000000000 +0000
@@ -25,7 +25,7 @@
 {
 
   /**
-   * A chroot stored in a file archive (tar or zip).
+   * A chroot stored in a file archive (tar with optional compression).
    *
    * The archive will be unpacked and repacked on demand.
    */
diff -Nru schroot-1.4.23/sbuild/sbuild-custom-error.h schroot-1.4.25/sbuild/sbuild-custom-error.h
--- schroot-1.4.23/sbuild/sbuild-custom-error.h	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/sbuild/sbuild-custom-error.h	2012-01-23 09:15:46.000000000 +0000
@@ -41,8 +41,8 @@
      * @param error the error code.
      */
     custom_error (error_type error):
-      sbuild::error<T>(format_error(null(), null(), null(), error, null(), null(), null()),
-		       format_reason(null(), null(), null(), error, null(), null(), null()))
+      sbuild::error<T>(this->format_error(null(), null(), null(), error, null(), null(), null()),
+		       this->format_reason(null(), null(), null(), error, null(), null(), null()))
     {
     }
 
@@ -55,8 +55,8 @@
     template<typename C>
     custom_error (C const&   context,
 		  error_type error):
-      sbuild::error<T>(format_error(context, null(), null(), error, null(), null(), null()),
-		       format_reason(context, null(), null(), error, null(), null(), null()))
+      sbuild::error<T>(this->format_error(context, null(), null(), error, null(), null(), null()),
+		       this->format_reason(context, null(), null(), error, null(), null(), null()))
     {
     }
 
@@ -69,8 +69,8 @@
     template<typename D>
     custom_error (error_type error,
 		  D const&   detail):
-      sbuild::error<T>(format_error(null(), null(), null(), error, detail, null(), null()),
-		       format_reason(null(), null(), null(), error, detail, null(), null()))
+      sbuild::error<T>(this->format_error(null(), null(), null(), error, detail, null(), null()),
+		       this->format_reason(null(), null(), null(), error, detail, null(), null()))
     {
     }
 
@@ -85,8 +85,8 @@
     custom_error (error_type error,
 		  D const&   detail,
 		  E const&   detail2):
-      sbuild::error<T>(format_error(null(), null(), null(), error, detail, detail2, null()),
-		       format_reason(null(), null(), null(), error, detail, detail2, null()))
+      sbuild::error<T>(this->format_error(null(), null(), null(), error, detail, detail2, null()),
+		       this->format_reason(null(), null(), null(), error, detail, detail2, null()))
     {
     }
 
@@ -103,8 +103,8 @@
 		  D const&   detail,
 		  E const&   detail2,
 		  F const&   detail3):
-      sbuild::error<T>(format_error(null(), null(), null(), error, detail, detail2, detail3),
-		       format_reason(null(), null(), null(), error, detail, detail2, detail3))
+      sbuild::error<T>(this->format_error(null(), null(), null(), error, detail, detail2, detail3),
+		       this->format_reason(null(), null(), null(), error, detail, detail2, detail3))
     {
     }
 
@@ -119,8 +119,8 @@
     custom_error (C const&   context,
 		  error_type error,
 		  D const&   detail):
-      sbuild::error<T>(format_error(context, null(), null(), error, detail, null(), null()),
-		       format_reason(context, null(), null(), error, detail, null(), null()))
+      sbuild::error<T>(this->format_error(context, null(), null(), error, detail, null(), null()),
+		       this->format_reason(context, null(), null(), error, detail, null(), null()))
     {
     }
 
@@ -155,8 +155,8 @@
 		  D const&   context2,
 		  error_type error,
 		  E const&   detail):
-      sbuild::error<T>(format_error(context1, context2, null(), error, detail, null(), null()),
-		       format_reason(context1, context2, null(), error, detail, null(), null()))
+      sbuild::error<T>(this->format_error(context1, context2, null(), error, detail, null(), null()),
+		       this->format_reason(context1, context2, null(), error, detail, null(), null()))
     {
     }
 
diff -Nru schroot-1.4.23/sbuild/sbuild-nostream.h schroot-1.4.25/sbuild/sbuild-nostream.h
--- schroot-1.4.23/sbuild/sbuild-nostream.h	2011-05-27 16:01:47.000000000 +0000
+++ schroot-1.4.25/sbuild/sbuild-nostream.h	2012-01-23 09:15:46.000000000 +0000
@@ -58,7 +58,7 @@
       std::basic_ios<cT, traits>(&nbuf),
       std::basic_ostream<cT, traits>(&nbuf)
     {
-      init(&nbuf);
+      this->init(&nbuf);
     }
 
   private:
diff -Nru schroot-1.4.23/sbuild/sbuild-parse-error.h schroot-1.4.25/sbuild/sbuild-parse-error.h
--- schroot-1.4.23/sbuild/sbuild-parse-error.h	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/sbuild/sbuild-parse-error.h	2012-01-23 09:15:46.000000000 +0000
@@ -46,8 +46,8 @@
     template<typename C>
     parse_error (C const&   context,
 		 error_type error):
-      sbuild::error<T>(format_error(context, null(), null(), error, null(), null(), null()),
-		       format_reason(context, null(), null(), error, null(), null(), null()))
+      sbuild::error<T>(this->format_error(context, null(), null(), error, null(), null(), null()),
+		       this->format_reason(context, null(), null(), error, null(), null(), null()))
     {
     }
 
@@ -60,8 +60,8 @@
     template<typename D>
     parse_error (error_type error,
 		 D const&   detail):
-      sbuild::error<T>(format_error(null(), null(), null(), error, detail, null(), null()),
-		       format_reason(null(), null(), null(), error, detail, null(), null()))
+      sbuild::error<T>(this->format_error(null(), null(), null(), error, detail, null(), null()),
+		       this->format_reason(null(), null(), null(), error, detail, null(), null()))
     {
     }
 
@@ -76,8 +76,8 @@
     parse_error (size_t     line,
 		 error_type error,
 		 D const&   detail):
-      sbuild::error<T>(format_error(line, null(), null(), error, detail, null(), null()),
-		       format_reason(line, null(), null(), error, detail, null(), null()))
+      sbuild::error<T>(this->format_error(line, null(), null(), error, detail, null(), null()),
+		       this->format_reason(line, null(), null(), error, detail, null(), null()))
     {
     }
 
@@ -94,8 +94,8 @@
 		 std::string const& group,
 		 error_type         error,
 		 D const&           detail):
-      sbuild::error<T>(format_error(line, group, null(), error, detail, null(), null()),
-		       format_reason(line, group, null(), error, detail, null(), null()))
+      sbuild::error<T>(this->format_error(line, group, null(), error, detail, null(), null()),
+		       this->format_reason(line, group, null(), error, detail, null(), null()))
     {
     }
 
@@ -114,8 +114,8 @@
 		 std::string const& key,
 		 error_type         error,
 		 D const&           detail):
-      sbuild::error<T>(format_error(line, group, key, error, detail, null(), null()),
-		       format_reason(line, group, key, error, detail, null(), null()))
+      sbuild::error<T>(this->format_error(line, group, key, error, detail, null(), null()),
+		       this->format_reason(line, group, key, error, detail, null(), null()))
     {
     }
 
@@ -130,8 +130,8 @@
     parse_error (std::string const& group,
 		 error_type         error,
 		 D const&           detail):
-      sbuild::error<T>(format_error(group, null(), null(), error, detail, null(), null()),
-		       format_reason(group, null(), null(), error, detail, null(), null()))
+      sbuild::error<T>(this->format_error(group, null(), null(), error, detail, null(), null()),
+		       this->format_reason(group, null(), null(), error, detail, null(), null()))
     {
     }
 
@@ -148,8 +148,8 @@
 		 std::string const& key,
 		 error_type         error,
 		 D const&           detail):
-      sbuild::error<T>(format_error(group, key, null(), error, detail, null(), null()),
-		       format_reason(group, key, null(), error, detail, null(), null()))
+      sbuild::error<T>(this->format_error(group, key, null(), error, detail, null(), null()),
+		       this->format_reason(group, key, null(), error, detail, null(), null()))
     {
     }
 
diff -Nru schroot-1.4.23/scripts/depcomp schroot-1.4.25/scripts/depcomp
--- schroot-1.4.23/scripts/depcomp	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/scripts/depcomp	2012-02-03 11:09:05.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-12-04.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 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
@@ -44,7 +44,7 @@
   object      Object file output by `PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -90,10 +90,18 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -158,10 +166,12 @@
 ' < "$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.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## 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"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -405,6 +415,52 @@
    rm -f "$tmpdepfile"
    ;;
 
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/	\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/	/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # 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
+  ;;
+
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
@@ -503,7 +559,9 @@
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
   sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
diff -Nru schroot-1.4.23/scripts/global.mk schroot-1.4.25/scripts/global.mk
--- schroot-1.4.23/scripts/global.mk	2011-06-11 15:54:38.000000000 +0000
+++ schroot-1.4.25/scripts/global.mk	2012-01-17 23:41:00.000000000 +0000
@@ -19,9 +19,38 @@
 #
 #####################################################################
 
+schroot_mountdir=$(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir=$(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir=$(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir=$(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir=$(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir=$(sysconfdir)/schroot
+schroot_sysconf_chrootdir=$(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir=$(schroot_sysconfdir)/setup.d
+schroot_setupdatadir=$(pkgdatadir)/setup
+
+SCHROOT_CONF=$(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF="$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF=$(sysconfdir)/csbuild.conf
+
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
 
 AM_LDFLAGS = $(LOCAL_LDFLAGS) $(PTHREAD_LIBS)
 
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
diff -Nru schroot-1.4.23/scripts/install-sh schroot-1.4.25/scripts/install-sh
--- schroot-1.4.23/scripts/install-sh	2011-06-25 11:09:36.000000000 +0000
+++ schroot-1.4.25/scripts/install-sh	2012-02-03 11:09:04.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff -Nru schroot-1.4.23/scripts/ltmain.sh schroot-1.4.25/scripts/ltmain.sh
--- schroot-1.4.23/scripts/ltmain.sh	2011-06-25 11:09:32.000000000 +0000
+++ schroot-1.4.25/scripts/ltmain.sh	2012-02-03 11:08:59.000000000 +0000
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4 Debian-2.4-2
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4 Debian-2.4-2"
+VERSION="2.4.2 Debian-2.4.2-1"
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6150,7 +6163,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6834,7 +6848,7 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7319,6 +7333,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7438,7 +7453,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8026,6 +8041,11 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8056,7 +8076,7 @@
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8064,11 +8084,7 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9158,6 +9174,8 @@
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9267,7 +9285,8 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff -Nru schroot-1.4.23/test/Makefile.in schroot-1.4.25/test/Makefile.in
--- schroot-1.4.23/test/Makefile.in	2011-06-25 11:09:37.000000000 +0000
+++ schroot-1.4.25/test/Makefile.in	2012-02-03 11:09:05.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -324,14 +324,29 @@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CSBUILD_CONF = @CSBUILD_CONF@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DCHROOT_CONF = @DCHROOT_CONF@
-DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Note, if new definitions are added, also update the manual page
+DEFS = $(LOCAL_DEFS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+-DSCHROOT_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
+-DSCHROOT_MOUNT_DIR=\"$(schroot_mountdir)\" \
+-DSCHROOT_SESSION_DIR=\"$(schroot_sessiondir)\" \
+-DSCHROOT_FILE_UNPACK_DIR=\"$(schroot_file_unpackdir)\" \
+-DSCHROOT_OVERLAY_DIR=\"$(schroot_overlaydir)\" \
+-DSCHROOT_UNDERLAY_DIR=\"$(schroot_underlaydir)\" \
+-DSCHROOT_SYSCONF_DIR=\"$(schroot_sysconfdir)\" \
+-DSCHROOT_CONF=\"$(SCHROOT_CONF)\" \
+-DSCHROOT_CONF_CHROOT_D=\"$(schroot_sysconf_chrootdir)\" \
+-DSCHROOT_CONF_SETUP_D=\"$(schroot_sysconf_setupdir)\" \
+-DSCHROOT_SETUP_DATA_DIR=\"$(schroot_setupdatadir)\" \
+-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-DSCHROOT_DATA_DIR=\"$(schroot_datadir)\" \
+-DSCHROOT_MODULE_DIR=\"$(schroot_moduledir)\"
+
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
@@ -406,21 +421,10 @@
 SBUILD_CURRENT_INTERFACE = @SBUILD_CURRENT_INTERFACE@
 SBUILD_INTERFACE_AGE = @SBUILD_INTERFACE_AGE@
 SCHROOT_CFLAGS = @SCHROOT_CFLAGS@
-SCHROOT_CONF = @SCHROOT_CONF@
-SCHROOT_CONF_CHROOT_D = @SCHROOT_CONF_CHROOT_D@
-SCHROOT_CONF_SETUP_D = @SCHROOT_CONF_SETUP_D@
-SCHROOT_DATA_DIR = @SCHROOT_DATA_DIR@
-SCHROOT_FILE_UNPACK_DIR = @SCHROOT_FILE_UNPACK_DIR@
-SCHROOT_LIBEXEC_DIR = @SCHROOT_LIBEXEC_DIR@
-SCHROOT_MOUNT_DIR = @SCHROOT_MOUNT_DIR@
-SCHROOT_OVERLAY_DIR = @SCHROOT_OVERLAY_DIR@
-SCHROOT_SESSION_DIR = @SCHROOT_SESSION_DIR@
-SCHROOT_SETUP_DATA_DIR = @SCHROOT_SETUP_DATA_DIR@
-SCHROOT_SYSCONF_DIR = @SCHROOT_SYSCONF_DIR@
-SCHROOT_UNDERLAY_DIR = @SCHROOT_UNDERLAY_DIR@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SOELIM = @SOELIM@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
@@ -484,6 +488,18 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+schroot_mountdir = $(localstatedir)/lib/$(PACKAGE)/mount
+schroot_sessiondir = $(localstatedir)/lib/$(PACKAGE)/session
+schroot_file_unpackdir = $(localstatedir)/lib/$(PACKAGE)/unpack
+schroot_overlaydir = $(localstatedir)/lib/$(PACKAGE)/union/overlay
+schroot_underlaydir = $(localstatedir)/lib/$(PACKAGE)/union/underlay
+schroot_sysconfdir = $(sysconfdir)/schroot
+schroot_sysconf_chrootdir = $(schroot_sysconfdir)/chroot.d
+schroot_sysconf_setupdir = $(schroot_sysconfdir)/setup.d
+schroot_setupdatadir = $(pkgdatadir)/setup
+SCHROOT_CONF = $(schroot_sysconfdir)/schroot.conf
+DCHROOT_CONF = "$(sysconfdir)/dchroot.conf"
+CSBUILD_CONF = $(sysconfdir)/csbuild.conf
 
 # Global options for use in all Makefiles.
 AM_CXXFLAGS = -I$(top_srcdir) $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
@@ -737,26 +753,23 @@
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -897,14 +910,15 @@
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
+	    col="$$grn"; \
 	  else \
-	    echo "$$red$$dashes"; \
+	    col="$$red"; \
 	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
+	  echo "$${col}$$dashes$${std}"; \
+	  echo "$${col}$$banner$${std}"; \
+	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+	  test -z "$$report" || echo "$${col}$$report$${std}"; \
+	  echo "$${col}$$dashes$${std}"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -953,10 +967,15 @@
 
 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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru schroot-1.4.23/VERSION schroot-1.4.25/VERSION
--- schroot-1.4.23/VERSION	2011-06-25 11:09:27.000000000 +0000
+++ schroot-1.4.25/VERSION	2012-02-03 11:08:55.000000000 +0000
@@ -1,5 +1,5 @@
 Package: schroot
-Version: 1.4.23
-Release-Date: 25 Jun 2011
+Version: 1.4.25
+Release-Date: 03 Feb 2012
 Released-By: Roger Leigh <rleigh@debian.org>
-Git-Tag: release/schroot-1.4.23
+Git-Tag: release/schroot-1.4.25