Bazaar

Merge lp:~richard-wilbur/bzr/fix-gpl into lp:bzr

  1. fix-gpl
  2. Merge into bzr.dev
Proposed by Richard Wilbur
Status: Merged
Approved by: Richard Wilbur
Approved revision: no longer in the source branch.
Merged at revision: 6618
Proposed branch: lp:~richard-wilbur/bzr/fix-gpl
Merge into: lp:bzr
Diff against target: 49 lines (+7/-7)
1 file modified
COPYING.txt (+7/-7)
To merge this branch: bzr merge lp:~richard-wilbur/bzr/fix-gpl
Reviewer Review Type Date Requested Status
Richard Wilbur Approve
Review via email: mp+285132@code.launchpad.net

Commit message

Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt (Only differences were in whitespace.) Thanks to Petr Stodulka for pointing out the discrepancy.

Description of the change

Update COPYING.txt from http://www.gnu.org/licenses/gpl-2.0.txt to alleviate some whitespace differences.

(Trivial change)

To post a comment you must log in.
Revision history for this message
Richard Wilbur (richard-wilbur) wrote :

Trivial whitespace changes. Now COPYING.txt mirrors gpl-2.0.txt.
+2

review: Approve
Revision history for this message
Richard Wilbur (richard-wilbur) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'COPYING.txt'
2--- COPYING.txt 2006-07-30 16:43:12 +0000
3+++ COPYING.txt 2016-02-04 22:55:45 +0000
4@@ -1,12 +1,12 @@
5- GNU GENERAL PUBLIC LICENSE
6- Version 2, June 1991
7+ GNU GENERAL PUBLIC LICENSE
8+ Version 2, June 1991
9
10 Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
11 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
12 Everyone is permitted to copy and distribute verbatim copies
13 of this license document, but changing it is not allowed.
14
15- Preamble
16+ Preamble
17
18 The licenses for most software are designed to take away your
19 freedom to share and change it. By contrast, the GNU General Public
20@@ -56,7 +56,7 @@
21 The precise terms and conditions for copying, distribution and
22 modification follow.
23
24- GNU GENERAL PUBLIC LICENSE
25+ GNU GENERAL PUBLIC LICENSE
26 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
27
28 0. This License applies to any program or other work which contains
29@@ -255,7 +255,7 @@
30 of preserving the free status of all derivatives of our free software and
31 of promoting the sharing and reuse of software generally.
32
33- NO WARRANTY
34+ NO WARRANTY
35
36 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
37 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
38@@ -277,9 +277,9 @@
39 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
40 POSSIBILITY OF SUCH DAMAGES.
41
42- END OF TERMS AND CONDITIONS
43+ END OF TERMS AND CONDITIONS
44
45- How to Apply These Terms to Your New Programs
46+ How to Apply These Terms to Your New Programs
47
48 If you develop a new program, and you want it to be of the greatest
49 possible use to the public, the best way to achieve this is to make it