Merge lp:~statik/tarmac/fix-licensing into lp:tarmac

[Elliot Murphy]

Small licensing fixes made.

[Elliot Murphy (statik)]

Some license cleanups that I noticed while making a debian package. This updates setup.py to say GPLv3 instead of AGPLv3, and adds GPL3 license headers to all the source files.

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'bzrplugin/__init__.py'
--- bzrplugin/__init__.py	2009-05-12 02:07:02 +0000
+++ bzrplugin/__init__.py	2009-07-10 15:10:28 +0000
@@ -1,3 +1,18 @@
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Bazaar Plugin for Tarmac.'''
 
 from bzrlib.lazy_import import lazy_import

=== modified file 'setup.py'
--- setup.py	2009-05-12 02:10:05 +0000
+++ setup.py	2009-07-10 15:10:28 +0000
@@ -1,5 +1,20 @@
 #!/usr/bin/env python
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+#
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
 '''Tarmac installation script.'''
 
 from distutils.core import setup
@@ -11,12 +26,12 @@
     version=__version__,
     description=u'Tarmac - The Launchpad Lander',
     url=u'http://edge.launchpad.net/tarmac',
-    license=u'AGPLv3',
+    license=u'GPLv3',
     package_dir={
         'bzrlib.plugins.tarmac': 'bzrplugin',
         'tarmac': 'tarmac'},
     packages=['bzrlib.plugins.tarmac', 'tarmac'],
-    scripts=['tarmac-lander'],
+    scripts=['tarmac-lander', 'tarmac-authenticate'],
     long_description='''
         Tarmac is a series of scripts to facilitate the landing of Bazaar
         branches in Launchpad (http://edge.launchpad.net).''',

=== modified file 'tarmac-authenticate'
--- tarmac-authenticate	2009-07-03 02:55:30 +0000
+++ tarmac-authenticate	2009-07-10 15:10:28 +0000
@@ -1,5 +1,21 @@
 #!/usr/bin/env python
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+#
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 from tarmac.bin import TarmacAuthenticate
 
 if __name__ == '__main__':

=== modified file 'tarmac-lander'
--- tarmac-lander	2009-05-12 02:10:05 +0000
+++ tarmac-lander	2009-07-10 15:10:28 +0000
@@ -1,5 +1,21 @@
 #!/usr/bin/env python
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+#
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 from tarmac.bin import TarmacLander
 
 if __name__ == '__main__':

=== modified file 'tarmac/__init__.py'
--- tarmac/__init__.py	2009-06-29 05:33:49 +0000
+++ tarmac/__init__.py	2009-07-10 15:10:28 +0000
@@ -1,4 +1,19 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Tarmac - A tool for controlling the landing of Launchpad branches.'''
 
 __version__ = u'0.2a'

=== modified file 'tarmac/bin.py'
--- tarmac/bin.py	2009-07-03 03:16:58 +0000
+++ tarmac/bin.py	2009-07-10 15:10:28 +0000
@@ -1,4 +1,19 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Code used by Tarmac scripts.'''
 import atexit
 import logging

=== modified file 'tarmac/branch.py'
--- tarmac/branch.py	2009-06-29 04:24:28 +0000
+++ tarmac/branch.py	2009-07-10 15:10:28 +0000
@@ -1,4 +1,19 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Tarmac branch tools.'''
 import os
 import shutil

=== modified file 'tarmac/config.py'
--- tarmac/config.py	2009-06-29 05:38:40 +0000
+++ tarmac/config.py	2009-07-10 15:10:28 +0000
@@ -1,4 +1,19 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Configuration handler.'''
 # pylint: disable-msg=C0103
 import os

=== modified file 'tarmac/exceptions.py'
--- tarmac/exceptions.py	2009-05-12 02:10:05 +0000
+++ tarmac/exceptions.py	2009-07-10 15:10:28 +0000
@@ -1,2 +1,17 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Tarmac specific exceptions.'''

=== modified file 'tarmac/hooks.py'
--- tarmac/hooks.py	2009-05-16 01:59:34 +0000
+++ tarmac/hooks.py	2009-07-10 15:10:28 +0000
@@ -1,4 +1,19 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Hooks for Tarmac.'''
 
 from bzrlib import hooks

=== modified file 'tarmac/plugin.py'
--- tarmac/plugin.py	2009-06-29 04:22:00 +0000
+++ tarmac/plugin.py	2009-07-10 15:10:28 +0000
@@ -1,3 +1,18 @@
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Plugin utilities for Tarmac.'''
 # pylint: disable-msg=W0122,W0612
 

=== modified file 'tarmac/plugins/__init__.py'
--- tarmac/plugins/__init__.py	2009-05-12 02:46:16 +0000
+++ tarmac/plugins/__init__.py	2009-07-10 15:10:28 +0000
@@ -1,4 +1,19 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Tarmac supported plugins.'''
 
 

=== modified file 'tarmac/plugins/ciavc.py'
--- tarmac/plugins/ciavc.py	2009-06-29 19:09:49 +0000
+++ tarmac/plugins/ciavc.py	2009-07-10 15:10:28 +0000
@@ -1,4 +1,19 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Tarmac plugin for enforcing a commit message format.
 
 This code is derived from Jelmer Vernooij's CIA script for Bazaar that is found

=== modified file 'tarmac/plugins/commitmessage.py'
--- tarmac/plugins/commitmessage.py	2009-06-29 04:27:59 +0000
+++ tarmac/plugins/commitmessage.py	2009-07-10 15:10:28 +0000
@@ -1,4 +1,19 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Tarmac plugin for enforcing a commit message format.'''
 from tarmac.hooks import tarmac_hooks
 from tarmac.plugins import TarmacPlugin

=== modified file 'tarmac/plugins/runtest.py'
--- tarmac/plugins/runtest.py	2009-06-29 04:32:38 +0000
+++ tarmac/plugins/runtest.py	2009-07-10 15:10:28 +0000
@@ -1,4 +1,19 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Tarmac plugin for running tests pre-commit.'''
 import os
 import subprocess

=== modified file 'tarmac/tests/__init__.py'
--- tarmac/tests/__init__.py	2009-05-12 02:10:05 +0000
+++ tarmac/tests/__init__.py	2009-07-10 15:10:28 +0000
@@ -1,2 +1,17 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Tests for Tarmac!'''

=== modified file 'tarmac/tests/mock.py'
--- tarmac/tests/mock.py	2009-05-16 06:24:35 +0000
+++ tarmac/tests/mock.py	2009-07-10 15:10:28 +0000
@@ -1,4 +1,19 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Mock objects for Tarmac!'''
 from base64 import b64encode
 import math

=== modified file 'tarmac/tests/test_branch.py'
--- tarmac/tests/test_branch.py	2009-06-29 04:44:23 +0000
+++ tarmac/tests/test_branch.py	2009-07-10 15:10:28 +0000
@@ -1,4 +1,19 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Tests for tarmac.branch'''
 import os
 import unittest

=== modified file 'tarmac/tests/test_scripts.py'
--- tarmac/tests/test_scripts.py	2009-06-29 04:39:46 +0000
+++ tarmac/tests/test_scripts.py	2009-07-10 15:10:28 +0000
@@ -1,4 +1,19 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Tests for Tarmac scripts.'''
 # pylint: disable-msg=W0212,W0223
 __metaclass__ = type

=== modified file 'tarmac/utils.py'
--- tarmac/utils.py	2009-07-03 03:16:58 +0000
+++ tarmac/utils.py	2009-07-10 15:10:28 +0000
@@ -1,4 +1,19 @@
-# Copyright 2009 Paul Hummer - See LICENSE
+# Copyright 2009 Paul Hummer
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac 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 Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 '''Utilities for Tarmac, mostly dealing with Launchpad.'''
 import os