Update license to GPLv3 (dropping the "or later" bit).

Update copyright years.
Add copyright and license information to setup.py.
Add myself as author of the relevant files.

8 files changed, 43 insertions, 28 deletions

diff --git a/ec2-fetch-credentials.py b/ec2-fetch-credentials.py
index 9ebc4634..7c89d9f0 100755
--- a/ec2-fetch-credentials.py
+++ b/ec2-fetch-credentials.py
@@ -1,14 +1,13 @@
 #!/usr/bin/python
 #
 #    Fetch login credentials for EC2 
-#    Copyright 2008 Canonical Ltd.
+#    Copyright (C) 2008-2009 Canonical Ltd.
 #
 #    Author: Soren Hansen <soren@canonical.com>
 #
 #    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 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/ec2-get-info.py b/ec2-get-info.py
index b05e2408..01ffe722 100755
--- a/ec2-get-info.py
+++ b/ec2-get-info.py
@@ -1,14 +1,13 @@
 #!/usr/bin/python
 #
 #    Fetch the information about an AMI instance.
-#    Copyright 2009 Canonical Ltd.
+#    Copyright (C) 2008-2009 Canonical Ltd.
 #
 #    Author: Chuck Short <chuck.short@canonical.com>
 #
 #    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 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/ec2-run-user-data.py b/ec2-run-user-data.py
index 890bb2bf..1e682575 100755
--- a/ec2-run-user-data.py
+++ b/ec2-run-user-data.py
@@ -1,14 +1,13 @@
 #!/usr/bin/python
 #
 #    Fetch and run user-data from EC2
-#    Copyright 2009 Canonical Ltd.
+#    Copyright (C) 2008-2009 Canonical Ltd.
 #
 #    Author: Soren Hansen <soren@canonical.com>
 #
 #    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 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/ec2-set-apt-sources.py b/ec2-set-apt-sources.py
index 10fea8ec..39f25ee6 100755
--- a/ec2-set-apt-sources.py
+++ b/ec2-set-apt-sources.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 #
 #    Fetch the availabity zone and create the sources.list
-#    Copyright 2009 Canonical Ltd.
+#    Copyright (C) 2009 Canonical Ltd.
 #
 #    Author: Chuck Short <chuck.short@canonical.com>
+#            Soren Hansen <soren@canonical.com>
 #
 #    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 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/ec2-set-defaults.py b/ec2-set-defaults.py
index eec696e4..f6d6a038 100755
--- a/ec2-set-defaults.py
+++ b/ec2-set-defaults.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 #
 #    Fetch the availabity zone and create the sources.list
-#    Copyright 2009 Canonical Ltd.
+#    Copyright (C) 2008-2009 Canonical Ltd.
 #
 #    Author: Chuck Short <chuck.short@canonical.com>
+#            Soren Hansen <soren@canonical.com>
 #
 #    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 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/ec2-set-hostname.py b/ec2-set-hostname.py
index 985f4ada..4d7edc27 100755
--- a/ec2-set-hostname.py
+++ b/ec2-set-hostname.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 #
 #    Fetch login credentials for EC2 
-#    Copyright 2008 Canonical Ltd.
+#    Copyright (C) 2008-2009 Canonical Ltd.
 #
 #    Author: Chuck Short <chuck.short@canonical.com>
+#            Soren Hansen <soren@canonical.com>
 #
 #    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 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/ec2init/__init__.py b/ec2init/__init__.py
index 3fa0de1d..e75e6cbe 100644
--- a/ec2init/__init__.py
+++ b/ec2init/__init__.py
@@ -1,13 +1,12 @@
 #
 #    Common code for the EC2 initialisation scripts in Ubuntu
-#    Copyright 2009 Canonical Ltd.
+#    Copyright (C) 2008-2009 Canonical Ltd.
 #
 #    Author: Soren Hansen <soren@canonical.com>
 #
 #    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 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/setup.py b/setup.py
index 851e559f..a957f8ae 100755
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,22 @@
+#!/usr/bin/python
+#
+#    Distutils magic for ec2-init
+#    Copyright (C) 2009 Canonical Ltd.
+#
+#    Author: Soren Hansen <soren@canonical.com>
+#
+#    This program 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.
+#
+#    This program 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/>.
+#
 from distutils.core import setup
 from glob import glob
 import os.path