Convert the entire project to GPLv3

* The entire schroot project is now licensed under the GNU General Public Licence, version 3 or later. * COPYING: Update to GPLv3. * Update licence boilerplate on all files to GPLv3.
author: Roger Leigh <rleigh@debian.org> 2007-09-16 01:42:56 +0100
committer: Roger Leigh <rleigh@debian.org> 2007-09-16 01:42:56 +0100
commit: 7793072a017e140f4e8f9c25b15813c9a1c57791 (patch)
tree: de0f7199f18a8d9edcdc76228d97966344fbafb5 /bin
parent: 9f6a5613b5363e50fc98336c651bc80d75d3cc8a (diff)
download: schroot-7793072a017e140f4e8f9c25b15813c9a1c57791.tar.gz
82 files changed, 388 insertions, 428 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 0b680060..80126755 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -3,9 +3,9 @@
 #
 # Copyright © 2004-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -14,9 +14,8 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 #
 #####################################################################
 
diff --git a/bin/csbuild/Makefile.am b/bin/csbuild/Makefile.am
index 7dd8eb2f..0df78045 100644
--- a/bin/csbuild/Makefile.am
+++ b/bin/csbuild/Makefile.am
@@ -3,9 +3,9 @@
 #
 # Copyright © 2004-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -14,9 +14,8 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 #
 #####################################################################
 
diff --git a/bin/csbuild/csbuild-debian-changes.cc b/bin/csbuild/csbuild-debian-changes.cc
index c5372133..8b889891 100644
--- a/bin/csbuild/csbuild-debian-changes.cc
+++ b/bin/csbuild/csbuild-debian-changes.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/csbuild/csbuild-debian-changes.h b/bin/csbuild/csbuild-debian-changes.h
index 6819ccb9..cd82471a 100644
--- a/bin/csbuild/csbuild-debian-changes.h
+++ b/bin/csbuild/csbuild-debian-changes.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/csbuild/csbuild-main.cc b/bin/csbuild/csbuild-main.cc
index 7a69491c..580417e8 100644
--- a/bin/csbuild/csbuild-main.cc
+++ b/bin/csbuild/csbuild-main.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/csbuild/csbuild-main.h b/bin/csbuild/csbuild-main.h
index ce563c76..64c15b4c 100644
--- a/bin/csbuild/csbuild-main.h
+++ b/bin/csbuild/csbuild-main.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/csbuild/csbuild-options.cc b/bin/csbuild/csbuild-options.cc
index d4601f3e..bd2fbb33 100644
--- a/bin/csbuild/csbuild-options.cc
+++ b/bin/csbuild/csbuild-options.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/csbuild/csbuild-options.h b/bin/csbuild/csbuild-options.h
index cf2fffa5..b02927d7 100644
--- a/bin/csbuild/csbuild-options.h
+++ b/bin/csbuild/csbuild-options.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/csbuild/csbuild.1.in b/bin/csbuild/csbuild.1.in
index 6a36ed92..7d8ee5d9 100644
--- a/bin/csbuild/csbuild.1.in
+++ b/bin/csbuild/csbuild.1.in
@@ -1,8 +1,8 @@
 .\" Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 .\"
-.\" schroot 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
+.\" 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
@@ -11,9 +11,9 @@
 .\" General Public License for more details.
 .\"
 .\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-.\" MA  02111-1307  USA
+.\" along with this program.  If not, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
 .TH CSBUILD 1 "@RELEASE_DATE@" "Version @VERSION@" "Debian sbuild"
 .SH NAME
 csbuild \[em] build debian packages from source
@@ -299,10 +299,10 @@ independent implementation.
 .SH COPYRIGHT
 Copyright \(co 2005\-2007  Roger Leigh \f[CR]<rleigh@debian.org>\fP
 .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
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
+\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),
diff --git a/bin/csbuild/csbuild.cc b/bin/csbuild/csbuild.cc
index 9b5a8a43..abf91f2e 100644
--- a/bin/csbuild/csbuild.cc
+++ b/bin/csbuild/csbuild.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot-dsa/Makefile.am b/bin/dchroot-dsa/Makefile.am
index 1a4df93a..5743d798 100644
--- a/bin/dchroot-dsa/Makefile.am
+++ b/bin/dchroot-dsa/Makefile.am
@@ -3,9 +3,9 @@
 #
 # Copyright © 2004-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -14,9 +14,8 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 #
 #####################################################################
 
diff --git a/bin/dchroot-dsa/dchroot-dsa-chroot-config.cc b/bin/dchroot-dsa/dchroot-dsa-chroot-config.cc
index b743eef3..2d9997ee 100644
--- a/bin/dchroot-dsa/dchroot-dsa-chroot-config.cc
+++ b/bin/dchroot-dsa/dchroot-dsa-chroot-config.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot-dsa/dchroot-dsa-chroot-config.h b/bin/dchroot-dsa/dchroot-dsa-chroot-config.h
index 1a34e3ec..a1d10659 100644
--- a/bin/dchroot-dsa/dchroot-dsa-chroot-config.h
+++ b/bin/dchroot-dsa/dchroot-dsa-chroot-config.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot-dsa/dchroot-dsa-main.cc b/bin/dchroot-dsa/dchroot-dsa-main.cc
index b8ce116d..4cc69b6f 100644
--- a/bin/dchroot-dsa/dchroot-dsa-main.cc
+++ b/bin/dchroot-dsa/dchroot-dsa-main.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot-dsa/dchroot-dsa-main.h b/bin/dchroot-dsa/dchroot-dsa-main.h
index 3edcf19f..022acf39 100644
--- a/bin/dchroot-dsa/dchroot-dsa-main.h
+++ b/bin/dchroot-dsa/dchroot-dsa-main.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot-dsa/dchroot-dsa-options.cc b/bin/dchroot-dsa/dchroot-dsa-options.cc
index d87d2d24..fec282d9 100644
--- a/bin/dchroot-dsa/dchroot-dsa-options.cc
+++ b/bin/dchroot-dsa/dchroot-dsa-options.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot-dsa/dchroot-dsa-options.h b/bin/dchroot-dsa/dchroot-dsa-options.h
index f8403445..6410faa5 100644
--- a/bin/dchroot-dsa/dchroot-dsa-options.h
+++ b/bin/dchroot-dsa/dchroot-dsa-options.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot-dsa/dchroot-dsa-session.cc b/bin/dchroot-dsa/dchroot-dsa-session.cc
index 696c8fc1..63df008f 100644
--- a/bin/dchroot-dsa/dchroot-dsa-session.cc
+++ b/bin/dchroot-dsa/dchroot-dsa-session.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot-dsa/dchroot-dsa-session.h b/bin/dchroot-dsa/dchroot-dsa-session.h
index faa3c9e9..20ad328b 100644
--- a/bin/dchroot-dsa/dchroot-dsa-session.h
+++ b/bin/dchroot-dsa/dchroot-dsa-session.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot-dsa/dchroot-dsa.1.in b/bin/dchroot-dsa/dchroot-dsa.1.in
index 6d631c5f..72d3620a 100644
--- a/bin/dchroot-dsa/dchroot-dsa.1.in
+++ b/bin/dchroot-dsa/dchroot-dsa.1.in
@@ -1,8 +1,8 @@
 .\" Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 .\"
-.\" schroot 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
+.\" 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
@@ -11,9 +11,9 @@
 .\" General Public License for more details.
 .\"
 .\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-.\" MA  02111-1307  USA
+.\" along with this program.  If not, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
 .TH DCHROOT-DSA 1 "@RELEASE_DATE@" "Version @VERSION@" "Debian sbuild"
 .SH NAME
 dchroot\-dsa \[em] enter a chroot environment
@@ -251,10 +251,10 @@ which provides a \fBdchroot\-dsa\fP package, written by Ben Collins
 .SH COPYRIGHT
 Copyright \(co 2005\-2007  Roger Leigh \f[CR]<rleigh@debian.org>\fP
 .PP
-This program is free software; you can redistribute it and/or modify it
+\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 2 of the License, or (at your option)
-any later version.
+Software Foundation, either version 3 of the License, or (at your option) any
+later version.
 .SH SEE ALSO
 .BR schroot (1),
 .BR sbuild (1),
diff --git a/bin/dchroot-dsa/dchroot-dsa.cc b/bin/dchroot-dsa/dchroot-dsa.cc
index 5b9f1d45..80a8eb7a 100644
--- a/bin/dchroot-dsa/dchroot-dsa.cc
+++ b/bin/dchroot-dsa/dchroot-dsa.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot/Makefile.am b/bin/dchroot/Makefile.am
index 8e97adf3..546c1f7a 100644
--- a/bin/dchroot/Makefile.am
+++ b/bin/dchroot/Makefile.am
@@ -3,9 +3,9 @@
 #
 # Copyright © 2004-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -14,9 +14,8 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 #
 #####################################################################
 
diff --git a/bin/dchroot/dchroot-chroot-config.cc b/bin/dchroot/dchroot-chroot-config.cc
index ce854f4c..5d06bc92 100644
--- a/bin/dchroot/dchroot-chroot-config.cc
+++ b/bin/dchroot/dchroot-chroot-config.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot/dchroot-chroot-config.h b/bin/dchroot/dchroot-chroot-config.h
index cc9dfff4..1ee47790 100644
--- a/bin/dchroot/dchroot-chroot-config.h
+++ b/bin/dchroot/dchroot-chroot-config.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot/dchroot-main-base.cc b/bin/dchroot/dchroot-main-base.cc
index e523d227..ec61bf36 100644
--- a/bin/dchroot/dchroot-main-base.cc
+++ b/bin/dchroot/dchroot-main-base.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot/dchroot-main-base.h b/bin/dchroot/dchroot-main-base.h
index a12382c7..a8d365ea 100644
--- a/bin/dchroot/dchroot-main-base.h
+++ b/bin/dchroot/dchroot-main-base.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot/dchroot-main.cc b/bin/dchroot/dchroot-main.cc
index fbf82a52..2cad19f7 100644
--- a/bin/dchroot/dchroot-main.cc
+++ b/bin/dchroot/dchroot-main.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot/dchroot-main.h b/bin/dchroot/dchroot-main.h
index 371675e0..2bf273fc 100644
--- a/bin/dchroot/dchroot-main.h
+++ b/bin/dchroot/dchroot-main.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot/dchroot-options.cc b/bin/dchroot/dchroot-options.cc
index 9730c590..7d6ddedb 100644
--- a/bin/dchroot/dchroot-options.cc
+++ b/bin/dchroot/dchroot-options.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot/dchroot-options.h b/bin/dchroot/dchroot-options.h
index 32ab21d2..52af8074 100644
--- a/bin/dchroot/dchroot-options.h
+++ b/bin/dchroot/dchroot-options.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot/dchroot-session-base.cc b/bin/dchroot/dchroot-session-base.cc
index 7df733d9..c0ce8281 100644
--- a/bin/dchroot/dchroot-session-base.cc
+++ b/bin/dchroot/dchroot-session-base.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot/dchroot-session-base.h b/bin/dchroot/dchroot-session-base.h
index f5619003..1d8938f3 100644
--- a/bin/dchroot/dchroot-session-base.h
+++ b/bin/dchroot/dchroot-session-base.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot/dchroot-session.cc b/bin/dchroot/dchroot-session.cc
index c08e76e7..967dc2d0 100644
--- a/bin/dchroot/dchroot-session.cc
+++ b/bin/dchroot/dchroot-session.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot/dchroot-session.h b/bin/dchroot/dchroot-session.h
index 43f7cbc9..8c215c00 100644
--- a/bin/dchroot/dchroot-session.h
+++ b/bin/dchroot/dchroot-session.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/dchroot/dchroot.1.in b/bin/dchroot/dchroot.1.in
index e2b8ae60..e7794464 100644
--- a/bin/dchroot/dchroot.1.in
+++ b/bin/dchroot/dchroot.1.in
@@ -1,8 +1,8 @@
 .\" Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 .\"
-.\" schroot 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
+.\" 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
@@ -11,9 +11,9 @@
 .\" General Public License for more details.
 .\"
 .\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-.\" MA  02111-1307  USA
+.\" along with this program.  If not, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
 .TH DCHROOT 1 "@RELEASE_DATE@" "Version @VERSION@" "Debian sbuild"
 .SH NAME
 dchroot \[em] enter a chroot environment
@@ -299,10 +299,10 @@ independent implementation.
 .SH COPYRIGHT
 Copyright \(co 2005\-2007  Roger Leigh \f[CR]<rleigh@debian.org>\fP
 .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
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
+\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),
diff --git a/bin/dchroot/dchroot.cc b/bin/dchroot/dchroot.cc
index 03a094c4..60a99131 100644
--- a/bin/dchroot/dchroot.cc
+++ b/bin/dchroot/dchroot.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-base/Makefile.am b/bin/schroot-base/Makefile.am
index 17bf2278..e091f4dc 100644
--- a/bin/schroot-base/Makefile.am
+++ b/bin/schroot-base/Makefile.am
@@ -3,9 +3,9 @@
 #
 # Copyright © 2004-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -14,9 +14,8 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 #
 #####################################################################
 
diff --git a/bin/schroot-base/schroot-base-main.cc b/bin/schroot-base/schroot-base-main.cc
index 0c5b2535..1d8df072 100644
--- a/bin/schroot-base/schroot-base-main.cc
+++ b/bin/schroot-base/schroot-base-main.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-base/schroot-base-main.h b/bin/schroot-base/schroot-base-main.h
index ead2ea0b..c7e2b8de 100644
--- a/bin/schroot-base/schroot-base-main.h
+++ b/bin/schroot-base/schroot-base-main.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-base/schroot-base-option-action.cc b/bin/schroot-base/schroot-base-option-action.cc
index f5996ab1..e0638a57 100644
--- a/bin/schroot-base/schroot-base-option-action.cc
+++ b/bin/schroot-base/schroot-base-option-action.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2006-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-base/schroot-base-option-action.h b/bin/schroot-base/schroot-base-option-action.h
index aaa6a2ca..87545f7a 100644
--- a/bin/schroot-base/schroot-base-option-action.h
+++ b/bin/schroot-base/schroot-base-option-action.h
@@ -1,8 +1,8 @@
 /* Copyright © 2006-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-base/schroot-base-options.cc b/bin/schroot-base/schroot-base-options.cc
index 22f6c51f..e4621870 100644
--- a/bin/schroot-base/schroot-base-options.cc
+++ b/bin/schroot-base/schroot-base-options.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-base/schroot-base-options.h b/bin/schroot-base/schroot-base-options.h
index 33fef715..b297662e 100644
--- a/bin/schroot-base/schroot-base-options.h
+++ b/bin/schroot-base/schroot-base-options.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-base/schroot-base-run.h b/bin/schroot-base/schroot-base-run.h
index 9fa0c761..fc3aa696 100644
--- a/bin/schroot-base/schroot-base-run.h
+++ b/bin/schroot-base/schroot-base-run.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-listmounts/Makefile.am b/bin/schroot-listmounts/Makefile.am
index afa8d4a4..f9148a9f 100644
--- a/bin/schroot-listmounts/Makefile.am
+++ b/bin/schroot-listmounts/Makefile.am
@@ -3,9 +3,9 @@
 #
 # Copyright © 2004-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -14,9 +14,8 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 #
 #####################################################################
 
diff --git a/bin/schroot-listmounts/schroot-listmounts-main.cc b/bin/schroot-listmounts/schroot-listmounts-main.cc
index f26590fc..7d0d3618 100644
--- a/bin/schroot-listmounts/schroot-listmounts-main.cc
+++ b/bin/schroot-listmounts/schroot-listmounts-main.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-listmounts/schroot-listmounts-main.h b/bin/schroot-listmounts/schroot-listmounts-main.h
index cc31eb2f..eba67ac2 100644
--- a/bin/schroot-listmounts/schroot-listmounts-main.h
+++ b/bin/schroot-listmounts/schroot-listmounts-main.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-listmounts/schroot-listmounts-options.cc b/bin/schroot-listmounts/schroot-listmounts-options.cc
index 125d18fc..0b245827 100644
--- a/bin/schroot-listmounts/schroot-listmounts-options.cc
+++ b/bin/schroot-listmounts/schroot-listmounts-options.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-listmounts/schroot-listmounts-options.h b/bin/schroot-listmounts/schroot-listmounts-options.h
index e819cda5..9bf2a92b 100644
--- a/bin/schroot-listmounts/schroot-listmounts-options.h
+++ b/bin/schroot-listmounts/schroot-listmounts-options.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-listmounts/schroot-listmounts.cc b/bin/schroot-listmounts/schroot-listmounts.cc
index 0b4d2dcc..13b61689 100644
--- a/bin/schroot-listmounts/schroot-listmounts.cc
+++ b/bin/schroot-listmounts/schroot-listmounts.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-releaselock/Makefile.am b/bin/schroot-releaselock/Makefile.am
index 8655951b..2c0cf65e 100644
--- a/bin/schroot-releaselock/Makefile.am
+++ b/bin/schroot-releaselock/Makefile.am
@@ -3,9 +3,9 @@
 #
 # Copyright © 2004-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -14,9 +14,8 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 #
 #####################################################################
 
diff --git a/bin/schroot-releaselock/schroot-releaselock-main.cc b/bin/schroot-releaselock/schroot-releaselock-main.cc
index 3bca9adc..28b476ae 100644
--- a/bin/schroot-releaselock/schroot-releaselock-main.cc
+++ b/bin/schroot-releaselock/schroot-releaselock-main.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-releaselock/schroot-releaselock-main.h b/bin/schroot-releaselock/schroot-releaselock-main.h
index 5725778c..27b18f5c 100644
--- a/bin/schroot-releaselock/schroot-releaselock-main.h
+++ b/bin/schroot-releaselock/schroot-releaselock-main.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-releaselock/schroot-releaselock-options.cc b/bin/schroot-releaselock/schroot-releaselock-options.cc
index 6d16ba13..52c490a2 100644
--- a/bin/schroot-releaselock/schroot-releaselock-options.cc
+++ b/bin/schroot-releaselock/schroot-releaselock-options.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-releaselock/schroot-releaselock-options.h b/bin/schroot-releaselock/schroot-releaselock-options.h
index c752d667..43097ce2 100644
--- a/bin/schroot-releaselock/schroot-releaselock-options.h
+++ b/bin/schroot-releaselock/schroot-releaselock-options.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot-releaselock/schroot-releaselock.cc b/bin/schroot-releaselock/schroot-releaselock.cc
index 1df83cff..ca6cc3c2 100644
--- a/bin/schroot-releaselock/schroot-releaselock.cc
+++ b/bin/schroot-releaselock/schroot-releaselock.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot/Makefile.am b/bin/schroot/Makefile.am
index fdcbad08..a6dbe23a 100644
--- a/bin/schroot/Makefile.am
+++ b/bin/schroot/Makefile.am
@@ -3,9 +3,9 @@
 #
 # Copyright © 2004-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -14,9 +14,8 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 #
 #####################################################################
 
diff --git a/bin/schroot/exec/00check b/bin/schroot/exec/00check
index 05d32a38..24387fcf 100755
--- a/bin/schroot/exec/00check
+++ b/bin/schroot/exec/00check
@@ -1,4 +1,21 @@
 #!/bin/sh
+# Copyright © 2005-2007  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/>.
+#
+#####################################################################
 
 if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
   . "$CHROOT_SCRIPT_CONFIG"
diff --git a/bin/schroot/exec/Makefile.am b/bin/schroot/exec/Makefile.am
index 1df1e061..b5acaba2 100644
--- a/bin/schroot/exec/Makefile.am
+++ b/bin/schroot/exec/Makefile.am
@@ -3,9 +3,9 @@
 #
 # Copyright © 2004-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -14,9 +14,8 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 #
 #####################################################################
 
diff --git a/bin/schroot/pam/Makefile.am b/bin/schroot/pam/Makefile.am
index 2cc028aa..8498b58b 100644
--- a/bin/schroot/pam/Makefile.am
+++ b/bin/schroot/pam/Makefile.am
@@ -3,9 +3,9 @@
 #
 # Copyright © 2004-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -14,9 +14,8 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 #
 #####################################################################
 
diff --git a/bin/schroot/schroot-main-base.cc b/bin/schroot/schroot-main-base.cc
index f3c6c3a5..c33a9a62 100644
--- a/bin/schroot/schroot-main-base.cc
+++ b/bin/schroot/schroot-main-base.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot/schroot-main-base.h b/bin/schroot/schroot-main-base.h
index 9e122332..22af8aa4 100644
--- a/bin/schroot/schroot-main-base.h
+++ b/bin/schroot/schroot-main-base.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot/schroot-main.cc b/bin/schroot/schroot-main.cc
index 32d21599..054f9ce4 100644
--- a/bin/schroot/schroot-main.cc
+++ b/bin/schroot/schroot-main.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot/schroot-main.h b/bin/schroot/schroot-main.h
index 875846dd..dcfe2f49 100644
--- a/bin/schroot/schroot-main.h
+++ b/bin/schroot/schroot-main.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot/schroot-options-base.cc b/bin/schroot/schroot-options-base.cc
index 07c658d1..b1276bd1 100644
--- a/bin/schroot/schroot-options-base.cc
+++ b/bin/schroot/schroot-options-base.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot/schroot-options-base.h b/bin/schroot/schroot-options-base.h
index df1cba21..a73a9b11 100644
--- a/bin/schroot/schroot-options-base.h
+++ b/bin/schroot/schroot-options-base.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot/schroot-options.cc b/bin/schroot/schroot-options.cc
index cd86e05e..dae40bcc 100644
--- a/bin/schroot/schroot-options.cc
+++ b/bin/schroot/schroot-options.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot/schroot-options.h b/bin/schroot/schroot-options.h
index 1443e0aa..d620e27b 100644
--- a/bin/schroot/schroot-options.h
+++ b/bin/schroot/schroot-options.h
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot/schroot-setup.5.in b/bin/schroot/schroot-setup.5.in
index bb73de2f..a203bb9d 100644
--- a/bin/schroot/schroot-setup.5.in
+++ b/bin/schroot/schroot-setup.5.in
@@ -1,8 +1,8 @@
 .\" Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 .\"
-.\" schroot 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
+.\" 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
@@ -11,9 +11,9 @@
 .\" General Public License for more details.
 .\"
 .\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-.\" MA  02111-1307  USA
+.\" along with this program.  If not, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
 .TH SCHROOT-SETUP 5 "@RELEASE_DATE@" "Version @VERSION@" "Debian sbuild"
 .SH NAME
 schroot-setup \[em] schroot chroot setup scripts
@@ -178,10 +178,10 @@ Roger Leigh.
 .SH COPYRIGHT
 Copyright \(co 2005\-2007  Roger Leigh \f[CR]<rleigh@debian.org>\fP
 .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
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
+\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.conf (5),
diff --git a/bin/schroot/schroot.1.in b/bin/schroot/schroot.1.in
index 69eba7c7..d04b6ff2 100644
--- a/bin/schroot/schroot.1.in
+++ b/bin/schroot/schroot.1.in
@@ -1,9 +1,9 @@
 .\" Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 .\" Copyright © 2006       Andreas Bombe <aeb@debian.org>
 .\"
-.\" schroot 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
+.\" 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
@@ -12,9 +12,9 @@
 .\" General Public License for more details.
 .\"
 .\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-.\" MA  02111-1307  USA
+.\" along with this program.  If not, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
 .TH SCHROOT 1 "@RELEASE_DATE@" "Version @VERSION@" "Debian sbuild"
 .SH NAME
 schroot \[em] securely enter a chroot environment
@@ -512,10 +512,10 @@ Roger Leigh.
 .SH COPYRIGHT
 Copyright \(co 2005\-2007  Roger Leigh \f[CR]<rleigh@debian.org>\fP
 .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
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
+\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),
diff --git a/bin/schroot/schroot.cc b/bin/schroot/schroot.cc
index c0bb7bd8..83c86230 100644
--- a/bin/schroot/schroot.cc
+++ b/bin/schroot/schroot.cc
@@ -1,8 +1,8 @@
 /* Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
  *
- * schroot 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
+ * 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
@@ -11,9 +11,8 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *********************************************************************/
 
diff --git a/bin/schroot/schroot.conf.5.in b/bin/schroot/schroot.conf.5.in
index 02dc6744..db06e68e 100644
--- a/bin/schroot/schroot.conf.5.in
+++ b/bin/schroot/schroot.conf.5.in
@@ -1,8 +1,8 @@
 .\" Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 .\"
-.\" schroot 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
+.\" 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
@@ -11,9 +11,9 @@
 .\" General Public License for more details.
 .\"
 .\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-.\" MA  02111-1307  USA
+.\" along with this program.  If not, see
+.\" <http://www.gnu.org/licenses/>.
+.\"
 .TH SCHROOT.CONF 5 "@RELEASE_DATE@" "Version @VERSION@" "Debian sbuild"
 .SH NAME
 schroot.conf \[em] chroot definition file for schroot
@@ -383,10 +383,10 @@ Roger Leigh.
 .SH COPYRIGHT
 Copyright \(co 2005\-2007  Roger Leigh \f[CR]<rleigh@debian.org>\fP
 .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
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
+\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),
diff --git a/bin/schroot/setup/00check b/bin/schroot/setup/00check
index dbf24f3c..11bf7e07 100755
--- a/bin/schroot/setup/00check
+++ b/bin/schroot/setup/00check
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -12,9 +12,10 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
 
 if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
   . "$CHROOT_SCRIPT_CONFIG"
diff --git a/bin/schroot/setup/05file b/bin/schroot/setup/05file
index 31bcc8a3..01db115f 100755
--- a/bin/schroot/setup/05file
+++ b/bin/schroot/setup/05file
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -12,9 +12,10 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
 
 set -e
 
diff --git a/bin/schroot/setup/05lvm b/bin/schroot/setup/05lvm
index 06a9d1b8..1453a0eb 100755
--- a/bin/schroot/setup/05lvm
+++ b/bin/schroot/setup/05lvm
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -12,9 +12,10 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
 
 set -e
 
diff --git a/bin/schroot/setup/10mount b/bin/schroot/setup/10mount
index b9ccd60c..a2800146 100755
--- a/bin/schroot/setup/10mount
+++ b/bin/schroot/setup/10mount
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -12,9 +12,10 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
 
 set -e
 
diff --git a/bin/schroot/setup/15killprocs b/bin/schroot/setup/15killprocs
index e064e6ed..044eaa7e 100755
--- a/bin/schroot/setup/15killprocs
+++ b/bin/schroot/setup/15killprocs
@@ -2,9 +2,9 @@
 # Copyright © 2007  Kees Cook <kees@outflux.net>
 # Copyright © 2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -13,9 +13,10 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
 
 set -e
 
diff --git a/bin/schroot/setup/20network b/bin/schroot/setup/20network
index a01e4a68..07212bcb 100755
--- a/bin/schroot/setup/20network
+++ b/bin/schroot/setup/20network
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -12,9 +12,10 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
 
 if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
   . "$CHROOT_SCRIPT_CONFIG"
diff --git a/bin/schroot/setup/30passwd b/bin/schroot/setup/30passwd
index d40406fd..c3c348a1 100755
--- a/bin/schroot/setup/30passwd
+++ b/bin/schroot/setup/30passwd
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -12,9 +12,10 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
 
 if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
   . "$CHROOT_SCRIPT_CONFIG"
diff --git a/bin/schroot/setup/50chrootname b/bin/schroot/setup/50chrootname
index 4be3c8f1..86413c94 100755
--- a/bin/schroot/setup/50chrootname
+++ b/bin/schroot/setup/50chrootname
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -12,9 +12,10 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
 
 if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
   . "$CHROOT_SCRIPT_CONFIG"
diff --git a/bin/schroot/setup/50sbuild b/bin/schroot/setup/50sbuild
index 2fc8dbc6..541020f1 100755
--- a/bin/schroot/setup/50sbuild
+++ b/bin/schroot/setup/50sbuild
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Copyright © 2005-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -12,9 +12,10 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
 
 if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
   . "$CHROOT_SCRIPT_CONFIG"
diff --git a/bin/schroot/setup/Makefile.am b/bin/schroot/setup/Makefile.am
index 0e3d0990..aa1885c6 100644
--- a/bin/schroot/setup/Makefile.am
+++ b/bin/schroot/setup/Makefile.am
@@ -3,9 +3,9 @@
 #
 # Copyright © 2004-2007  Roger Leigh <rleigh@debian.org>
 #
-# schroot 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
+# 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
@@ -14,9 +14,8 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
 #
 #####################################################################
author	Roger Leigh <rleigh@debian.org>	2007-09-16 01:42:56 +0100
committer	Roger Leigh <rleigh@debian.org>	2007-09-16 01:42:56 +0100
commit	7793072a017e140f4e8f9c25b15813c9a1c57791 (patch)
tree	de0f7199f18a8d9edcdc76228d97966344fbafb5 /bin
parent	9f6a5613b5363e50fc98336c651bc80d75d3cc8a (diff)
download	schroot-7793072a017e140f4e8f9c25b15813c9a1c57791.tar.gz