Merge lp:~canonical-platform-qa/ubuntu-system-tests/fix_licence_text into lp:ubuntu-system-tests

[Brendan Donegan]

Fix licence text

Our licence text was slightly wrong, particularly we shouldn't be allowing use of GPL v3 *or later*, but only GPL v3

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:113
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/230/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/230/rebuild

review: Needs Fixing (continuous-integration)

[Max Brustkern (nuclearbob)]

Not sure why it's failing the CI run, but other than that, LGTM.

review: Approve

Unmerged revisions

113. By Brendan Donegan on 2015-05-20

Fix project licencing to follow policy

=== modified file 'debian/tests/sanity'
--- debian/tests/sanity	2015-02-04 17:56:52 +0000
+++ debian/tests/sanity	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'setup.py'
--- setup.py	2015-02-04 21:23:17 +0000
+++ setup.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/__init__.py'
--- ubuntu_sanity_tests/__init__.py	2015-03-03 08:18:04 +0000
+++ ubuntu_sanity_tests/__init__.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/command_line.py'
--- ubuntu_sanity_tests/command_line.py	2015-03-10 10:46:34 +0000
+++ ubuntu_sanity_tests/command_line.py	2015-05-20 14:46:37 +0000
@@ -6,9 +6,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/config.py'
--- ubuntu_sanity_tests/config.py	2015-03-30 00:30:24 +0000
+++ ubuntu_sanity_tests/config.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/external_tests/__init__.py'
--- ubuntu_sanity_tests/external_tests/__init__.py	2015-03-11 19:16:05 +0000
+++ ubuntu_sanity_tests/external_tests/__init__.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/addressbook/__init__.py'
--- ubuntu_sanity_tests/helpers/addressbook/__init__.py	2015-02-27 04:37:40 +0000
+++ ubuntu_sanity_tests/helpers/addressbook/__init__.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/addressbook/fixture_setup.py'
--- ubuntu_sanity_tests/helpers/addressbook/fixture_setup.py	2015-02-19 06:19:08 +0000
+++ ubuntu_sanity_tests/helpers/addressbook/fixture_setup.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/autopilot.py'
--- ubuntu_sanity_tests/helpers/autopilot.py	2015-05-08 09:37:52 +0000
+++ ubuntu_sanity_tests/helpers/autopilot.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/backup_restore_fixture.py'
--- ubuntu_sanity_tests/helpers/backup_restore_fixture.py	2015-03-10 10:38:24 +0000
+++ ubuntu_sanity_tests/helpers/backup_restore_fixture.py	2015-05-20 14:46:37 +0000
@@ -4,9 +4,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/camera.py'
--- ubuntu_sanity_tests/helpers/camera.py	2015-03-10 15:39:14 +0000
+++ ubuntu_sanity_tests/helpers/camera.py	2015-05-20 14:46:37 +0000
@@ -4,9 +4,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/click.py'
--- ubuntu_sanity_tests/helpers/click.py	2015-05-08 09:37:52 +0000
+++ ubuntu_sanity_tests/helpers/click.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/images.py'
--- ubuntu_sanity_tests/helpers/images.py	2015-03-10 10:29:29 +0000
+++ ubuntu_sanity_tests/helpers/images.py	2015-05-20 14:46:37 +0000
@@ -4,9 +4,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/indicators.py'
--- ubuntu_sanity_tests/helpers/indicators.py	2015-02-18 04:57:19 +0000
+++ ubuntu_sanity_tests/helpers/indicators.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/ofono.py'
--- ubuntu_sanity_tests/helpers/ofono.py	2015-05-07 16:34:54 +0000
+++ ubuntu_sanity_tests/helpers/ofono.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/radio_killswitch.py'
--- ubuntu_sanity_tests/helpers/radio_killswitch.py	2015-02-18 04:57:19 +0000
+++ ubuntu_sanity_tests/helpers/radio_killswitch.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/system_settings.py'
--- ubuntu_sanity_tests/helpers/system_settings.py	2015-03-04 10:00:51 +0000
+++ ubuntu_sanity_tests/helpers/system_settings.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/testbed.py'
--- ubuntu_sanity_tests/helpers/testbed.py	2015-05-05 12:20:35 +0000
+++ ubuntu_sanity_tests/helpers/testbed.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/ubuntuone_credentials.py'
--- ubuntu_sanity_tests/helpers/ubuntuone_credentials.py	2015-02-24 18:06:44 +0000
+++ ubuntu_sanity_tests/helpers/ubuntuone_credentials.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/unity8/__init__.py'
--- ubuntu_sanity_tests/helpers/unity8/__init__.py	2015-03-27 05:05:20 +0000
+++ ubuntu_sanity_tests/helpers/unity8/__init__.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/unity8/dash.py'
--- ubuntu_sanity_tests/helpers/unity8/dash.py	2015-04-06 21:55:41 +0000
+++ ubuntu_sanity_tests/helpers/unity8/dash.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/unity8/fixture_setup.py'
--- ubuntu_sanity_tests/helpers/unity8/fixture_setup.py	2015-02-03 19:05:44 +0000
+++ ubuntu_sanity_tests/helpers/unity8/fixture_setup.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/unity8/greeter.py'
--- ubuntu_sanity_tests/helpers/unity8/greeter.py	2015-03-11 18:10:31 +0000
+++ ubuntu_sanity_tests/helpers/unity8/greeter.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/unity8/shell.py'
--- ubuntu_sanity_tests/helpers/unity8/shell.py	2015-05-11 04:01:14 +0000
+++ ubuntu_sanity_tests/helpers/unity8/shell.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/unityclickscope.py'
--- ubuntu_sanity_tests/helpers/unityclickscope.py	2015-02-25 15:09:04 +0000
+++ ubuntu_sanity_tests/helpers/unityclickscope.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/helpers/webbrowser.py'
--- ubuntu_sanity_tests/helpers/webbrowser.py	2015-04-09 09:56:15 +0000
+++ ubuntu_sanity_tests/helpers/webbrowser.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/results.py'
--- ubuntu_sanity_tests/results.py	2015-02-11 19:47:05 +0000
+++ ubuntu_sanity_tests/results.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/sanity.py'
--- ubuntu_sanity_tests/sanity.py	2015-02-06 14:32:00 +0000
+++ ubuntu_sanity_tests/sanity.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/selftests/__init__.py'
--- ubuntu_sanity_tests/selftests/__init__.py	2015-02-05 07:08:23 +0000
+++ ubuntu_sanity_tests/selftests/__init__.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/selftests/test_command_line.py'
--- ubuntu_sanity_tests/selftests/test_command_line.py	2015-03-09 11:54:42 +0000
+++ ubuntu_sanity_tests/selftests/test_command_line.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/selftests/test_config.py'
--- ubuntu_sanity_tests/selftests/test_config.py	2015-03-30 20:53:26 +0000
+++ ubuntu_sanity_tests/selftests/test_config.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/selftests/test_results.py'
--- ubuntu_sanity_tests/selftests/test_results.py	2015-02-11 19:47:05 +0000
+++ ubuntu_sanity_tests/selftests/test_results.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/selftests/test_testbed_commands.py'
--- ubuntu_sanity_tests/selftests/test_testbed_commands.py	2015-02-06 16:33:08 +0000
+++ ubuntu_sanity_tests/selftests/test_testbed_commands.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/selftests/test_tests_to_run.py'
--- ubuntu_sanity_tests/selftests/test_tests_to_run.py	2015-03-11 19:16:05 +0000
+++ ubuntu_sanity_tests/selftests/test_tests_to_run.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/tests/__init__.py'
--- ubuntu_sanity_tests/tests/__init__.py	2015-02-25 16:49:02 +0000
+++ ubuntu_sanity_tests/tests/__init__.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/tests/base.py'
--- ubuntu_sanity_tests/tests/base.py	2015-05-15 07:48:41 +0000
+++ ubuntu_sanity_tests/tests/base.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/tests/test_add_contact.py'
--- ubuntu_sanity_tests/tests/test_add_contact.py	2015-02-27 04:37:40 +0000
+++ ubuntu_sanity_tests/tests/test_add_contact.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/tests/test_app_store.py'
--- ubuntu_sanity_tests/tests/test_app_store.py	2015-03-30 09:25:06 +0000
+++ ubuntu_sanity_tests/tests/test_app_store.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/tests/test_camera.py'
--- ubuntu_sanity_tests/tests/test_camera.py	2015-05-07 10:53:33 +0000
+++ ubuntu_sanity_tests/tests/test_camera.py	2015-05-20 14:46:37 +0000
@@ -4,9 +4,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/tests/test_flight_mode.py'
--- ubuntu_sanity_tests/tests/test_flight_mode.py	2015-05-07 10:57:45 +0000
+++ ubuntu_sanity_tests/tests/test_flight_mode.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/tests/test_html5_application.py'
--- ubuntu_sanity_tests/tests/test_html5_application.py	2015-03-30 17:04:24 +0000
+++ ubuntu_sanity_tests/tests/test_html5_application.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/tests/test_sim_pin.py'
--- ubuntu_sanity_tests/tests/test_sim_pin.py	2015-05-07 10:57:45 +0000
+++ ubuntu_sanity_tests/tests/test_sim_pin.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/tests/test_tutorial.py'
--- ubuntu_sanity_tests/tests/test_tutorial.py	2015-02-17 05:29:17 +0000
+++ ubuntu_sanity_tests/tests/test_tutorial.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/tests/test_uninstall_application.py'
--- ubuntu_sanity_tests/tests/test_uninstall_application.py	2015-03-26 16:58:15 +0000
+++ ubuntu_sanity_tests/tests/test_uninstall_application.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2015 Canonical
 #
 # 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
 
=== modified file 'ubuntu_sanity_tests/tests/test_with_webbrowser.py'
--- ubuntu_sanity_tests/tests/test_with_webbrowser.py	2015-04-30 10:58:05 +0000
+++ ubuntu_sanity_tests/tests/test_with_webbrowser.py	2015-05-20 14:46:37 +0000
@@ -5,9 +5,8 @@
 # Copyright (C) 2014, 2015 Canonical
 #
 # 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