* Updated copyright notices to include 2006 changes.

* schroot/Makefile.am: Generate a sbuild.gch precompiled header,
  and include sbuild.h in all sources which previously included an
  sbuild header.  This should improve compilation speed.
* Rename schroot.h to sbuild.h, and include all sbuild-*.h
  headers.
* schroot/sbuild-auth.cc (run): Fix casting to "const void **".

51 files changed, 132 insertions, 178 deletions

diff --git a/ChangeLog b/ChangeLog
index d2b5c942..8f790ef9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-2005-12-31  Roger Leigh  <rleigh@debian.org>
+2006-01-01  Roger Leigh  <rleigh@debian.org>
+
+	* Updated copyright notices to include 2006 changes.
+
+	* schroot/Makefile.am: Generate a sbuild.gch precompiled header,
+	and include sbuild.h in all sources which previously included an
+	sbuild header.  This should improve compilation speed.
+
+	* Rename schroot.h to sbuild.h, and include all sbuild-*.h
+	headers.
 
 	* schroot/sbuild-auth.cc (run): Fix casting to "const void **".
 
diff --git a/Makefile.am b/Makefile.am
index 022ae1ca..a474ce85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # schroot Makefile template
 #
 #
-# Copyright © 2004-2005  Roger Leigh <rleigh@debian.org>
+# Copyright © 2004-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
diff --git a/configure.ac b/configure.ac
index 3adb6626..5ff712c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 #                                               -*- Autoconf -*-
-# Copyright © 2004-2005  Roger Leigh <rleigh@debian.org>
+# Copyright © 2004-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
diff --git a/doc/Makefile.am b/doc/Makefile.am
index dd14a455..46230963 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 # schroot Makefile template
 #
 #
-# Copyright © 2004-2005  Roger Leigh <rleigh@debian.org>
+# Copyright © 2004-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
diff --git a/schroot/Makefile.am b/schroot/Makefile.am
index 4b6497c7..2e8afdc1 100644
--- a/schroot/Makefile.am
+++ b/schroot/Makefile.am
@@ -1,7 +1,7 @@
 # schroot Makefile template
 #
 #
-# Copyright © 2004-2005  Roger Leigh <rleigh@debian.org>
+# Copyright © 2004-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
@@ -35,7 +35,13 @@ lib_LTLIBRARIES = libsbuild.la
 bin_PROGRAMS = schroot
 pkglibexec_PROGRAMS = schroot-releaselock
 
+BUILT_SOURCES = sbuild.gch
+
+sbuild.gch: $(sbuild_public_h_sources)
+	$(CXXCOMPILE) -o $@ sbuild.h
+
 sbuild_public_h_sources =		\
+	sbuild.h			\
 	sbuild-auth.h			\
 	sbuild-auth-conv.h		\
 	sbuild-auth-conv-tty.h		\
@@ -81,7 +87,6 @@ libsbuild_la_LIBADD = $(UUID_LIBS) $(PAM_LIBS) $(LOCKDEV_LIBS) $(BOOST_LIBS) $(L
 schroot_SOURCES =			\
 	schroot-options.h		\
 	schroot-options.cc		\
-	schroot.h			\
 	schroot.cc
 
 schroot_LDADD = libsbuild.la
@@ -98,6 +103,8 @@ pkgsysconf_DATA = schroot.conf
 
 man_MANS = schroot.1 schroot-setup.5 schroot.conf.5
 
+CLEANFILES = sbuild.gch
+
 EXTRA_DIST =				\
 	$(pkgsysconf_DATA)
 
diff --git a/schroot/pam/Makefile.am b/schroot/pam/Makefile.am
index 8038600d..28450122 100644
--- a/schroot/pam/Makefile.am
+++ b/schroot/pam/Makefile.am
@@ -1,7 +1,7 @@
 # schroot Makefile template
 #
 #
-# Copyright © 2004-2005  Roger Leigh <rleigh@debian.org>
+# Copyright © 2004-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
diff --git a/schroot/run/Makefile.am b/schroot/run/Makefile.am
index 6987d0b1..4384bc8a 100644
--- a/schroot/run/Makefile.am
+++ b/schroot/run/Makefile.am
@@ -1,7 +1,7 @@
 # schroot Makefile template
 #
 #
-# Copyright © 2004-2005  Roger Leigh <rleigh@debian.org>
+# Copyright © 2004-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
diff --git a/schroot/sbuild-auth-conv-tty.cc b/schroot/sbuild-auth-conv-tty.cc
index fb3bf154..d1498b5a 100644
--- a/schroot/sbuild-auth-conv-tty.cc
+++ b/schroot/sbuild-auth-conv-tty.cc
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -19,6 +19,8 @@
 
 #include <config.h>
 
+#include "sbuild.h"
+
 #include <iostream>
 
 #include <termios.h>
@@ -26,12 +28,6 @@
 
 #include <boost/format.hpp>
 
-#include "sbuild-i18n.h"
-#include "sbuild-auth-conv-tty.h"
-#include "sbuild-error.h"
-#include "sbuild-log.h"
-#include "sbuild-util.h"
-
 using std::cerr;
 using std::endl;
 using boost::format;
diff --git a/schroot/sbuild-auth-conv-tty.h b/schroot/sbuild-auth-conv-tty.h
index ad035012..6ca19d96 100644
--- a/schroot/sbuild-auth-conv-tty.h
+++ b/schroot/sbuild-auth-conv-tty.h
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/sbuild-auth-conv.cc b/schroot/sbuild-auth-conv.cc
index 2b0ca1c0..910d1bf3 100644
--- a/schroot/sbuild-auth-conv.cc
+++ b/schroot/sbuild-auth-conv.cc
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include "sbuild-auth-conv.h"
+#include "sbuild.h"
 
 using namespace sbuild;
 
diff --git a/schroot/sbuild-auth-conv.h b/schroot/sbuild-auth-conv.h
index d8a6a572..8ac1d105 100644
--- a/schroot/sbuild-auth-conv.h
+++ b/schroot/sbuild-auth-conv.h
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/sbuild-auth-message.cc b/schroot/sbuild-auth-message.cc
index ce22c619..be1797b5 100644
--- a/schroot/sbuild-auth-message.cc
+++ b/schroot/sbuild-auth-message.cc
@@ -1,11 +1,11 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-2006  Roger Leigh <rleigh@debian.org>
  *
- * serror is free software; you can redistribute it and/or modify it
+ * 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 2 of the License, or
  * (at your option) any later version.
  *
- * serror is distributed in the hope that it will be useful, but
+ * 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.
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include "sbuild-auth-message.h"
+#include "sbuild.h"
 
 using namespace sbuild;
 
diff --git a/schroot/sbuild-auth-message.h b/schroot/sbuild-auth-message.h
index 1bb71aed..50c0a03d 100644
--- a/schroot/sbuild-auth-message.h
+++ b/schroot/sbuild-auth-message.h
@@ -1,11 +1,11 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-2006  Roger Leigh <rleigh@debian.org>
  *
- * serror is free software; you can redistribute it and/or modify it
+ * 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 2 of the License, or
  * (at your option) any later version.
  *
- * serror is distributed in the hope that it will be useful, but
+ * 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.
diff --git a/schroot/sbuild-auth.cc b/schroot/sbuild-auth.cc
index d8384a3d..3b2fa0d2 100644
--- a/schroot/sbuild-auth.cc
+++ b/schroot/sbuild-auth.cc
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -19,6 +19,8 @@
 
 #include <config.h>
 
+#include "sbuild.h"
+
 #include <cassert>
 #include <iostream>
 
@@ -30,14 +32,6 @@
 
 #include <boost/format.hpp>
 
-#include "sbuild-i18n.h"
-#include "sbuild-auth.h"
-#include "sbuild-auth-conv-tty.h"
-#include "sbuild-auth-message.h"
-#include "sbuild-error.h"
-#include "sbuild-log.h"
-#include "sbuild-util.h"
-
 using std::cerr;
 using std::endl;
 using boost::format;
diff --git a/schroot/sbuild-auth.h b/schroot/sbuild-auth.h
index f20411de..ef476d35 100644
--- a/schroot/sbuild-auth.h
+++ b/schroot/sbuild-auth.h
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/sbuild-chroot-block-device.cc b/schroot/sbuild-chroot-block-device.cc
index 4fb058d3..11e3955c 100644
--- a/schroot/sbuild-chroot-block-device.cc
+++ b/schroot/sbuild-chroot-block-device.cc
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -19,6 +19,8 @@
 
 #include <config.h>
 
+#include "sbuild.h"
+
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
@@ -28,12 +30,6 @@
 
 #include <boost/format.hpp>
 
-#include "sbuild-i18n.h"
-#include "sbuild-chroot-block-device.h"
-#include "sbuild-keyfile.h"
-#include "sbuild-lock.h"
-#include "sbuild-util.h"
-
 using boost::format;
 using namespace sbuild;
 
diff --git a/schroot/sbuild-chroot-block-device.h b/schroot/sbuild-chroot-block-device.h
index 82da54d3..a51805a9 100644
--- a/schroot/sbuild-chroot-block-device.h
+++ b/schroot/sbuild-chroot-block-device.h
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/sbuild-chroot-lvm-snapshot.cc b/schroot/sbuild-chroot-lvm-snapshot.cc
index bc93cf1c..096302b0 100644
--- a/schroot/sbuild-chroot-lvm-snapshot.cc
+++ b/schroot/sbuild-chroot-lvm-snapshot.cc
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -19,6 +19,8 @@
 
 #include <config.h>
 
+#include "sbuild.h"
+
 #include <iostream>
 #include <ext/stdio_filebuf.h>
 
@@ -30,13 +32,6 @@
 
 #include <boost/format.hpp>
 
-#include "sbuild-i18n.h"
-#include "sbuild-chroot-lvm-snapshot.h"
-#include "sbuild-keyfile.h"
-#include "sbuild-lock.h"
-#include "sbuild-log.h"
-#include "sbuild-util.h"
-
 using std::endl;
 using boost::format;
 using namespace sbuild;
diff --git a/schroot/sbuild-chroot-lvm-snapshot.h b/schroot/sbuild-chroot-lvm-snapshot.h
index c9df0c0c..a2be87b4 100644
--- a/schroot/sbuild-chroot-lvm-snapshot.h
+++ b/schroot/sbuild-chroot-lvm-snapshot.h
@@ -1,6 +1,4 @@
-/* sbuild-chroot-lvm-snapshot - sbuild chroot lvm snapshot object
- *
- * Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/sbuild-chroot-plain.cc b/schroot/sbuild-chroot-plain.cc
index ad44d41f..801d51d3 100644
--- a/schroot/sbuild-chroot-plain.cc
+++ b/schroot/sbuild-chroot-plain.cc
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -19,16 +19,14 @@
 
 #include <config.h>
 
+#include "sbuild.h"
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 #include <unistd.h>
 
-#include "sbuild-i18n.h"
-#include "sbuild-chroot-plain.h"
-#include "sbuild-keyfile.h"
-
 using namespace sbuild;
 
 ChrootPlain::ChrootPlain():
diff --git a/schroot/sbuild-chroot-plain.h b/schroot/sbuild-chroot-plain.h
index 73310d1e..695f1da4 100644
--- a/schroot/sbuild-chroot-plain.h
+++ b/schroot/sbuild-chroot-plain.h
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/sbuild-chroot.cc b/schroot/sbuild-chroot.cc
index 533ba32d..978ead22 100644
--- a/schroot/sbuild-chroot.cc
+++ b/schroot/sbuild-chroot.cc
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -19,12 +19,7 @@
 
 #include <config.h>
 
-#include "sbuild-i18n.h"
-#include "sbuild-chroot.h"
-#include "sbuild-chroot-plain.h"
-#include "sbuild-chroot-block-device.h"
-#include "sbuild-chroot-lvm-snapshot.h"
-#include "sbuild-keyfile.h"
+#include "sbuild.h"
 
 using namespace sbuild;
 
diff --git a/schroot/sbuild-chroot.h b/schroot/sbuild-chroot.h
index 67ac4520..b7d39e61 100644
--- a/schroot/sbuild-chroot.h
+++ b/schroot/sbuild-chroot.h
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/sbuild-config.cc b/schroot/sbuild-config.cc
index 4b04b47f..3403fc7a 100644
--- a/schroot/sbuild-config.cc
+++ b/schroot/sbuild-config.cc
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -19,6 +19,8 @@
 
 #include <config.h>
 
+#include "sbuild.h"
+
 #include <iostream>
 
 #include <ext/stdio_filebuf.h>
@@ -35,14 +37,6 @@
 
 #include <boost/format.hpp>
 
-#include "sbuild-i18n.h"
-#include "sbuild-config.h"
-#include "sbuild-lock.h"
-#include "sbuild-log.h"
-#include "sbuild-chroot.h"
-#include "sbuild-keyfile.h"
-#include "sbuild-util.h"
-
 using std::endl;
 using boost::format;
 using namespace sbuild;
diff --git a/schroot/sbuild-config.h b/schroot/sbuild-config.h
index 4941e0ac..8aa3edc6 100644
--- a/schroot/sbuild-config.h
+++ b/schroot/sbuild-config.h
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/sbuild-error.h b/schroot/sbuild-error.h
index 84f2fd53..cadf6dba 100644
--- a/schroot/sbuild-error.h
+++ b/schroot/sbuild-error.h
@@ -1,13 +1,11 @@
-/* sbuild-error - sbuild error handling
+/* Copyright © 2005-2006  Roger Leigh <rleigh@debian.org>
  *
- * Copyright © 2005  Roger Leigh <rleigh@debian.org>
- *
- * serror is free software; you can redistribute it and/or modify it
+ * 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 2 of the License, or
  * (at your option) any later version.
  *
- * serror is distributed in the hope that it will be useful, but
+ * 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.
diff --git a/schroot/sbuild-i18n.h b/schroot/sbuild-i18n.h
index 12bd51cc..3bed0ffb 100644
--- a/schroot/sbuild-i18n.h
+++ b/schroot/sbuild-i18n.h
@@ -1,6 +1,4 @@
-/* sbuild-i18n - gettext internationalisation macros
- *
- * Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/sbuild-keyfile.cc b/schroot/sbuild-keyfile.cc
index af54e4f9..373f1cf6 100644
--- a/schroot/sbuild-keyfile.cc
+++ b/schroot/sbuild-keyfile.cc
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -19,12 +19,12 @@
 
 #include <config.h>
 
+#include "sbuild.h"
+
 #include <fstream>
 
 #include <boost/format.hpp>
 
-#include "sbuild-keyfile.h"
-
 using boost::format;
 using namespace sbuild;
 
diff --git a/schroot/sbuild-keyfile.h b/schroot/sbuild-keyfile.h
index e0667379..744b9086 100644
--- a/schroot/sbuild-keyfile.h
+++ b/schroot/sbuild-keyfile.h
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/sbuild-lock.cc b/schroot/sbuild-lock.cc
index ea83ffdb..e72e7a12 100644
--- a/schroot/sbuild-lock.cc
+++ b/schroot/sbuild-lock.cc
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -19,9 +19,10 @@
 
 #include <config.h>
 
+#include "sbuild.h"
+
 #include <errno.h>
 #include <stdlib.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <unistd.h>
@@ -30,10 +31,6 @@
 
 #include <lockdev.h>
 
-#include "sbuild-i18n.h"
-#include "sbuild-lock.h"
-#include "sbuild-util.h"
-
 using boost::format;
 using namespace sbuild;
 
diff --git a/schroot/sbuild-lock.h b/schroot/sbuild-lock.h
index d1efcae1..57f5031f 100644
--- a/schroot/sbuild-lock.h
+++ b/schroot/sbuild-lock.h
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -22,6 +22,7 @@
 
 #include <string>
 
+#include <sys/time.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
diff --git a/schroot/sbuild-log.cc b/schroot/sbuild-log.cc
index 41e07bed..f6ef5340 100644
--- a/schroot/sbuild-log.cc
+++ b/schroot/sbuild-log.cc
@@ -1,11 +1,11 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-2006  Roger Leigh <rleigh@debian.org>
  *
- * serror is free software; you can redistribute it and/or modify it
+ * 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 2 of the License, or
  * (at your option) any later version.
  *
- * serror is distributed in the hope that it will be useful, but
+ * 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.
@@ -19,10 +19,9 @@
 
 #include <config.h>
 
-#include <iostream>
+#include "sbuild.h"
 
-#include "sbuild-log.h"
-#include "sbuild-nostream.h"
+#include <iostream>
 
 std::ostream&
 sbuild::log_info()
diff --git a/schroot/sbuild-log.h b/schroot/sbuild-log.h
index 08ab95bc..61a65d05 100644
--- a/schroot/sbuild-log.h
+++ b/schroot/sbuild-log.h
@@ -1,11 +1,11 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-2006  Roger Leigh <rleigh@debian.org>
  *
- * serror is free software; you can redistribute it and/or modify it
+ * 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 2 of the License, or
  * (at your option) any later version.
  *
- * serror is distributed in the hope that it will be useful, but
+ * 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.
diff --git a/schroot/sbuild-nostream.cc b/schroot/sbuild-nostream.cc
index 1fd00b15..e6b34742 100644
--- a/schroot/sbuild-nostream.cc
+++ b/schroot/sbuild-nostream.cc
@@ -1,11 +1,11 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-2006  Roger Leigh <rleigh@debian.org>
  *
- * serror is free software; you can redistribute it and/or modify it
+ * 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 2 of the License, or
  * (at your option) any later version.
  *
- * serror is distributed in the hope that it will be useful, but
+ * 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.
diff --git a/schroot/sbuild-nostream.h b/schroot/sbuild-nostream.h
index c65bcfd7..143f3eeb 100644
--- a/schroot/sbuild-nostream.h
+++ b/schroot/sbuild-nostream.h
@@ -1,11 +1,11 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-2006  Roger Leigh <rleigh@debian.org>
  *
- * serror is free software; you can redistribute it and/or modify it
+ * 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 2 of the License, or
  * (at your option) any later version.
  *
- * serror is distributed in the hope that it will be useful, but
+ * 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.
diff --git a/schroot/sbuild-session.cc b/schroot/sbuild-session.cc
index 1e6fc364..ae677c02 100644
--- a/schroot/sbuild-session.cc
+++ b/schroot/sbuild-session.cc
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -19,6 +19,8 @@
 
 #include <config.h>
 
+#include "sbuild.h"
+
 #include <cassert>
 #include <iostream>
 #include <memory>
@@ -34,12 +36,6 @@
 
 #include <uuid/uuid.h>
 
-#include "sbuild-i18n.h"
-#include "sbuild-chroot-lvm-snapshot.h"
-#include "sbuild-log.h"
-#include "sbuild-session.h"
-#include "sbuild-util.h"
-
 using std::cout;
 using std::endl;
 using boost::format;
diff --git a/schroot/sbuild-session.h b/schroot/sbuild-session.h
index bfb52928..4b02412e 100644
--- a/schroot/sbuild-session.h
+++ b/schroot/sbuild-session.h
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/sbuild-types.h b/schroot/sbuild-types.h
index 376dc88d..d50a5b6a 100644
--- a/schroot/sbuild-types.h
+++ b/schroot/sbuild-types.h
@@ -1,6 +1,4 @@
-/* sbuild-util - sbuild data types
- *
- * Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/sbuild-util.cc b/schroot/sbuild-util.cc
index c10c8dfe..3102e737 100644
--- a/schroot/sbuild-util.cc
+++ b/schroot/sbuild-util.cc
@@ -1,6 +1,4 @@
-/* sbuild-util - sbuild utility functions
- *
- * Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -21,13 +19,13 @@
 
 #include <config.h>
 
+#include "sbuild.h"
+
 #include <stdarg.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "sbuild-util.h"
-
 using namespace sbuild;
 
 namespace
diff --git a/schroot/sbuild-util.h b/schroot/sbuild-util.h
index c1fcbd24..acc4c5d1 100644
--- a/schroot/sbuild-util.h
+++ b/schroot/sbuild-util.h
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/schroot.h b/schroot/sbuild.h
index 275b0281..39ef98ea 100644
--- a/schroot/schroot.h
+++ b/schroot/sbuild.h
@@ -1,6 +1,4 @@
-/* schroot - global header
- *
- * Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -19,22 +17,29 @@
  *
  *********************************************************************/
 
-#ifndef SBUILD_SCHROOT_H
-#define SBUILD_SCHROOT_H
+#ifndef SBUILD_H
+#define SBUILD_H
 
-#include "sbuild-auth.h"
 #include "sbuild-auth-conv.h"
 #include "sbuild-auth-conv-tty.h"
+#include "sbuild-auth.h"
 #include "sbuild-auth-message.h"
-#include "sbuild-config.h"
-#include "sbuild-chroot.h"
-#include "sbuild-chroot-plain.h"
 #include "sbuild-chroot-block-device.h"
+#include "sbuild-chroot.h"
 #include "sbuild-chroot-lvm-snapshot.h"
+#include "sbuild-chroot-plain.h"
+#include "sbuild-config.h"
+#include "sbuild-error.h"
+#include "sbuild-i18n.h"
+#include "sbuild-keyfile.h"
 #include "sbuild-lock.h"
+#include "sbuild-log.h"
+#include "sbuild-nostream.h"
 #include "sbuild-session.h"
+#include "sbuild-types.h"
+#include "sbuild-util.h"
 
-#endif /* SBUILD_SCHROOT_H */
+#endif /* SBUILD_H */
 
 /*
  * Local Variables:
diff --git a/schroot/schroot-options.cc b/schroot/schroot-options.cc
index 68d6e65f..82af8ea0 100644
--- a/schroot/schroot-options.cc
+++ b/schroot/schroot-options.cc
@@ -1,6 +1,4 @@
-/* schroot-options - schroot options parser
- *
- * Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -28,11 +26,9 @@
 #include <boost/format.hpp>
 #include <boost/program_options.hpp>
 
-#include "schroot-options.h"
+#include "sbuild.h"
 
-#include "sbuild-i18n.h"
-#include "sbuild-log.h"
-#include "sbuild-util.h"
+#include "schroot-options.h"
 
 using std::endl;
 using boost::format;
diff --git a/schroot/schroot-options.h b/schroot/schroot-options.h
index fe141b80..9989cda9 100644
--- a/schroot/schroot-options.h
+++ b/schroot/schroot-options.h
@@ -1,6 +1,4 @@
-/* schroot-options - schroot options parser
- *
- * Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/schroot-releaselock-options.cc b/schroot/schroot-releaselock-options.cc
index e5a7fc8a..3586c0a2 100644
--- a/schroot/schroot-releaselock-options.cc
+++ b/schroot/schroot-releaselock-options.cc
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -26,7 +26,7 @@
 #include <boost/format.hpp>
 #include <boost/program_options.hpp>
 
-#include "sbuild-i18n.h"
+#include "sbuild.h"
 
 #include "schroot-releaselock-options.h"
 
diff --git a/schroot/schroot-releaselock-options.h b/schroot/schroot-releaselock-options.h
index 4d506979..b7442235 100644
--- a/schroot/schroot-releaselock-options.h
+++ b/schroot/schroot-releaselock-options.h
@@ -1,4 +1,4 @@
-/* Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
diff --git a/schroot/schroot-releaselock.cc b/schroot/schroot-releaselock.cc
index e7a3ba27..f32b55fb 100644
--- a/schroot/schroot-releaselock.cc
+++ b/schroot/schroot-releaselock.cc
@@ -1,6 +1,4 @@
-/* schroot-releaselock - release a device lock
- *
- * Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -35,9 +33,7 @@
 
 #include <lockdev.h>
 
-#include "sbuild-i18n.h"
-#include "sbuild-log.h"
-#include "sbuild-util.h"
+#include "sbuild.h"
 
 #include "schroot-releaselock-options.h"
 
@@ -58,7 +54,7 @@ print_version (std::ostream& stream)
 {
   stream << format(_("schroot-releaselock (Debian sbuild) %1%\n")) % VERSION
 	 << _("Written by Roger Leigh\n\n")
-	 << _("Copyright (C) 2004-2005 Roger Leigh\n")
+	 << _("Copyright (C) 2004-2006 Roger Leigh\n")
 	 << _("This is free software; see the source for copying conditions.  There is NO\n"
 	      "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n")
 	 << std::flush;
diff --git a/schroot/schroot-setup.5.in b/schroot/schroot-setup.5.in
index 4abfaf8c..c88185d5 100644
--- a/schroot/schroot-setup.5.in
+++ b/schroot/schroot-setup.5.in
@@ -1,4 +1,4 @@
-.\" Copyright © 2005  Roger Leigh <rleigh@debian.org>
+.\" Copyright © 2005-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
@@ -144,7 +144,7 @@ permissions, inside the chroot for use by sbuild.
 .SH AUTHORS
 Roger Leigh.
 .SH COPYRIGHT
-Copyright \(co 2005  Roger Leigh <rleigh@debian.org>
+Copyright \(co 2005-2006  Roger Leigh <rleigh@debian.org>
 .PP
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the Free
diff --git a/schroot/schroot.1.in b/schroot/schroot.1.in
index d99fded8..cfbf2ae4 100644
--- a/schroot/schroot.1.in
+++ b/schroot/schroot.1.in
@@ -1,4 +1,4 @@
-.\" Copyright © 2005  Roger Leigh <rleigh@debian.org>
+.\" Copyright © 2005-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
@@ -208,7 +208,7 @@ PAM configuration.
 .SH AUTHORS
 Roger Leigh.
 .SH COPYRIGHT
-Copyright \(co 2005  Roger Leigh <rleigh@debian.org>
+Copyright \(co 2005-2006  Roger Leigh <rleigh@debian.org>
 .PP
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the Free
diff --git a/schroot/schroot.cc b/schroot/schroot.cc
index 9e83805a..2cd32898 100644
--- a/schroot/schroot.cc
+++ b/schroot/schroot.cc
@@ -1,6 +1,4 @@
-/* schroot - securely enter a chroot
- *
- * Copyright © 2005  Roger Leigh <rleigh@debian.org>
+/* Copyright © 2005-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
@@ -29,13 +27,7 @@
 
 #include <syslog.h>
 
-#include "sbuild-i18n.h"
-#include "sbuild-auth-conv-tty.h"
-#include "sbuild-chroot.h"
-#include "sbuild-config.h"
-#include "sbuild-log.h"
-#include "sbuild-session.h"
-#include "sbuild-util.h"
+#include "sbuild.h"
 
 #include "schroot-options.h"
 
@@ -54,7 +46,7 @@ print_version (std::ostream& stream)
 {
   stream << format(_("schroot (Debian sbuild) %1%\n")) % VERSION
 	 << _("Written by Roger Leigh\n\n")
-	 << _("Copyright (C) 2004-2005 Roger Leigh\n")
+	 << _("Copyright (C) 2004-2006 Roger Leigh\n")
 	 << _("This is free software; see the source for copying conditions.  There is NO\n"
 	      "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n")
 	 << std::flush;
diff --git a/schroot/schroot.conf.5.in b/schroot/schroot.conf.5.in
index 488f39a5..e1933b4a 100644
--- a/schroot/schroot.conf.5.in
+++ b/schroot/schroot.conf.5.in
@@ -1,4 +1,4 @@
-.\" Copyright © 2005  Roger Leigh <rleigh@debian.org>
+.\" Copyright © 2005-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
@@ -198,7 +198,7 @@ user, and not be writable by other.
 .SH AUTHORS
 Roger Leigh.
 .SH COPYRIGHT
-Copyright \(co 2005  Roger Leigh <rleigh@debian.org>
+Copyright \(co 2005-2006  Roger Leigh <rleigh@debian.org>
 .PP
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the Free
diff --git a/schroot/setup/Makefile.am b/schroot/setup/Makefile.am
index f9af755c..75515f65 100644
--- a/schroot/setup/Makefile.am
+++ b/schroot/setup/Makefile.am
@@ -1,7 +1,7 @@
 # schroot Makefile template
 #
 #
-# Copyright © 2004-2005  Roger Leigh <rleigh@debian.org>
+# Copyright © 2004-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