Remove old FSF address. Thanks Dan Callaghan.

23 files changed, 23 insertions, 49 deletions

diff --git a/__init__.py b/__init__.py
index c77b302..989f392 100644
--- a/__init__.py
+++ b/__init__.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 r"""FastImport Plugin
 =================
diff --git a/branch_mapper.py b/branch_mapper.py
index acc37c9..047fb3f 100644
--- a/branch_mapper.py
+++ b/branch_mapper.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """An object that maps git ref names to bzr branch names.  Note that it is not
 used to map git ref names to bzr tag names."""
diff --git a/branch_updater.py b/branch_updater.py
index 680f10f..fcb13d5 100644
--- a/branch_updater.py
+++ b/branch_updater.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """An object that updates a bunch of branches based on data imported."""
 
diff --git a/bzr_commit_handler.py b/bzr_commit_handler.py
index 9933db8..f72b401 100644
--- a/bzr_commit_handler.py
+++ b/bzr_commit_handler.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """CommitHandlers that build and save revisions & their inventories."""
 
diff --git a/cache_manager.py b/cache_manager.py
index 4321fe6..9a0b651 100644
--- a/cache_manager.py
+++ b/cache_manager.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """A manager of caches."""
 
diff --git a/cmds.py b/cmds.py
index b8910b4..537e0f0 100644
--- a/cmds.py
+++ b/cmds.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Fastimport/fastexport commands."""
 
diff --git a/exporter.py b/exporter.py
index 755833f..78b5dba 100644
--- a/exporter.py
+++ b/exporter.py
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Based on bzr-fast-export
 # Copyright (c) 2008 Adeodato Simó
diff --git a/exporters/__init__.py b/exporters/__init__.py
index 6d282d6..3175109 100644
--- a/exporters/__init__.py
+++ b/exporters/__init__.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Simplified and unified access to the various xxx-fast-export tools."""
 
diff --git a/exporters/darcs/d2x b/exporters/darcs/d2x
index 959cc00..85e15e2 100755
--- a/exporters/darcs/d2x
+++ b/exporters/darcs/d2x
@@ -15,9 +15,7 @@
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-#   USA.
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 usage()
diff --git a/exporters/darcs/git-darcs b/exporters/darcs/git-darcs
index 18455a2..c4343ef 100755
--- a/exporters/darcs/git-darcs
+++ b/exporters/darcs/git-darcs
@@ -19,9 +19,7 @@
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-#   USA.
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 add()
diff --git a/exporters/darcs/x2d b/exporters/darcs/x2d
index 398103d..ea4bdbd 100755
--- a/exporters/darcs/x2d
+++ b/exporters/darcs/x2d
@@ -15,9 +15,7 @@
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-#   USA.
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 usage()
diff --git a/helpers.py b/helpers.py
index afc867d..fed4d68 100644
--- a/helpers.py
+++ b/helpers.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Miscellaneous useful stuff."""
 
diff --git a/marks_file.py b/marks_file.py
index 7066a1c..78282a9 100644
--- a/marks_file.py
+++ b/marks_file.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Routines for reading/writing a marks file."""
 
diff --git a/processors/__init__.py b/processors/__init__.py
index 8a16d9c..6e104f5 100644
--- a/processors/__init__.py
+++ b/processors/__init__.py
@@ -11,7 +11,6 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Actual import processors."""
diff --git a/processors/generic_processor.py b/processors/generic_processor.py
index 9305df9..4ab0ac3 100644
--- a/processors/generic_processor.py
+++ b/processors/generic_processor.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Import processor that supports all Bazaar repository formats."""
 
diff --git a/revision_store.py b/revision_store.py
index 73943ca..6b92f15 100644
--- a/revision_store.py
+++ b/revision_store.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """An abstraction of a repository providing just the bits importing needs."""
 
diff --git a/tests/__init__.py b/tests/__init__.py
index 8db9140..c4f26b7 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -10,8 +10,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """Tests for bzr-fastimport."""
diff --git a/tests/test_branch_mapper.py b/tests/test_branch_mapper.py
index 6d6f170..587eebc 100644
--- a/tests/test_branch_mapper.py
+++ b/tests/test_branch_mapper.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Test the BranchMapper methods."""
 
diff --git a/tests/test_commands.py b/tests/test_commands.py
index 1679a66..282cfc3 100644
--- a/tests/test_commands.py
+++ b/tests/test_commands.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Test the command implementations."""
 
diff --git a/tests/test_exporter.py b/tests/test_exporter.py
index 24fedb1..c2a8442 100644
--- a/tests/test_exporter.py
+++ b/tests/test_exporter.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Test the exporter."""
 
diff --git a/tests/test_generic_processor.py b/tests/test_generic_processor.py
index c491c51..1b4a809 100644
--- a/tests/test_generic_processor.py
+++ b/tests/test_generic_processor.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import time
 
diff --git a/tests/test_revision_store.py b/tests/test_revision_store.py
index 9e39254..95d0ab8 100644
--- a/tests/test_revision_store.py
+++ b/tests/test_revision_store.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Direct tests of the revision_store classes."""
 
diff --git a/user_mapper.py b/user_mapper.py
index 9bde2cf..d5d1708 100644
--- a/user_mapper.py
+++ b/user_mapper.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from email import Utils