pkgme

Merge lp:~james-w/pkgme/fix-up-licenses into lp:pkgme

  1. fix-up-licenses
  2. Merge into trunk
Proposed by James Westby
Status: Merged
Approved by: Jonathan Lange
Approved revision: 114
Merged at revision: 113
Proposed branch: lp:~james-w/pkgme/fix-up-licenses
Merge into: lp:pkgme
Diff against target: 41 lines (+3/-6)
3 files modified
pkgme/__init__.py (+1/-2)
setup.py (+1/-2)
template.py (+1/-2)
To merge this branch: bzr merge lp:~james-w/pkgme/fix-up-licenses
Reviewer Review Type Date Requested Status
Jonathan Lange Approve
Review via email: mp+110828@code.launchpad.net

Commit message

Drop the or later clause from the GPL3 where it was mistakenly added.

Description of the change

Hi,

It seems some files got marked as "GPL3 or later" by accident. These
are original pkgme files, so we can change them.

Thanks,

James

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

This is good, and complies with Canonical policy to my understanding.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pkgme/__init__.py'
2--- pkgme/__init__.py 2011-11-01 18:51:24 +0000
3+++ pkgme/__init__.py 2012-06-18 14:09:19 +0000
4@@ -4,8 +4,7 @@
5 #
6 # This program is free software: you can redistribute it and/or modify
7 # it under the terms of the GNU General Public License as published by
8-# the Free Software Foundation, either version 3 of the License, or
9-# (at your option) any later version.
10+# the Free Software Foundation, version 3 of the License.
11 #
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14
15=== modified file 'setup.py'
16--- setup.py 2011-11-25 01:50:29 +0000
17+++ setup.py 2012-06-18 14:09:19 +0000
18@@ -4,8 +4,7 @@
19 #
20 # This program is free software: you can redistribute it and/or modify
21 # it under the terms of the GNU General Public License as published by
22-# the Free Software Foundation, either version 3 of the License, or
23-# (at your option) any later version.
24+# the Free Software Foundation, version 3 of the License.
25 #
26 # This program is distributed in the hope that it will be useful,
27 # but WITHOUT ANY WARRANTY; without even the implied warranty of
28
29=== modified file 'template.py'
30--- template.py 2010-11-10 23:20:33 +0000
31+++ template.py 2012-06-18 14:09:19 +0000
32@@ -4,8 +4,7 @@
33 #
34 # This program is free software: you can redistribute it and/or modify
35 # it under the terms of the GNU General Public License as published by
36-# the Free Software Foundation, either version 3 of the License, or
37-# (at your option) any later version.
38+# the Free Software Foundation, version 3 of the License.
39 #
40 # This program is distributed in the hope that it will be useful,
41 # but WITHOUT ANY WARRANTY; without even the implied warranty of

Subscribers

People subscribed via source and target branches

to all changes: