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
=== modified file 'COPYING.txt'
--- COPYING.txt 2006-07-30 16:43:12 +0000
+++ COPYING.txt 2016-02-04 22:55:45 +0000
@@ -1,12 +1,12 @@
1 GNU GENERAL PUBLIC LICENSE1 GNU GENERAL PUBLIC LICENSE
2 Version 2, June 19912 Version 2, June 1991
33
4 Copyright (C) 1989, 1991 Free Software Foundation, Inc.,4 Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
5 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA5 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6 Everyone is permitted to copy and distribute verbatim copies6 Everyone is permitted to copy and distribute verbatim copies
7 of this license document, but changing it is not allowed.7 of this license document, but changing it is not allowed.
88
9 Preamble9 Preamble
1010
11 The licenses for most software are designed to take away your11 The licenses for most software are designed to take away your
12freedom to share and change it. By contrast, the GNU General Public12freedom to share and change it. By contrast, the GNU General Public
@@ -56,7 +56,7 @@
56 The precise terms and conditions for copying, distribution and56 The precise terms and conditions for copying, distribution and
57modification follow.57modification follow.
5858
59 GNU GENERAL PUBLIC LICENSE59 GNU GENERAL PUBLIC LICENSE
60 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION60 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
6161
62 0. This License applies to any program or other work which contains62 0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@
255of preserving the free status of all derivatives of our free software and255of preserving the free status of all derivatives of our free software and
256of promoting the sharing and reuse of software generally.256of promoting the sharing and reuse of software generally.
257257
258 NO WARRANTY258 NO WARRANTY
259259
260 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY260 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
261FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN261FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@
277PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE277PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278POSSIBILITY OF SUCH DAMAGES.278POSSIBILITY OF SUCH DAMAGES.
279279
280 END OF TERMS AND CONDITIONS280 END OF TERMS AND CONDITIONS
281281
282 How to Apply These Terms to Your New Programs282 How to Apply These Terms to Your New Programs
283283
284 If you develop a new program, and you want it to be of the greatest284 If you develop a new program, and you want it to be of the greatest
285possible use to the public, the best way to achieve this is to make it285possible use to the public, the best way to achieve this is to make it