Compiz

Merge ~mitya57/compiz:lp1923481 into compiz:master

  1. Git
  2. lp:~mitya57/compiz
  3. lp1923481
  4. Merge into master
Proposed by Dmitry Shachnev
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 56c15b4819860e383ff69f740af6dbcb4e14db8b
Merged at revision: 70b867436f667fd4712b2ea6f62433158447550c
Proposed branch: ~mitya57/compiz:lp1923481
Merge into: compiz:master
Diff against target: 73 lines (+9/-12)
2 files modified
COPYING.GPL (+7/-8)
COPYING.LGPL (+2/-4)
Reviewer Review Type Date Requested Status
Artem (community) Approve
Alberts Muktupāvels Approve
Compiz Maintainers Pending
Review via email: mp+400988@code.launchpad.net

Commit message

Update FSF addresses.

To post a comment you must log in.
Revision history for this message
Alberts Muktupāvels (muktupavels) :
review: Approve
Revision history for this message
Artem (artem4) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/COPYING.GPL b/COPYING.GPL
2index d60c31a..5d6ef9f 100644
3--- a/COPYING.GPL
4+++ b/COPYING.GPL
5@@ -1,8 +1,8 @@
6 GNU GENERAL PUBLIC LICENSE
7 Version 2, June 1991
8
9- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
10- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
11+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
12+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
13 Everyone is permitted to copy and distribute verbatim copies
14 of this license document, but changing it is not allowed.
15
16@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
17 General Public License applies to most of the Free Software
18 Foundation's software and to any other program whose authors commit to
19 using it. (Some other Free Software Foundation software is covered by
20-the GNU Library General Public License instead.) You can apply it to
21+the GNU Lesser General Public License instead.) You can apply it to
22 your programs, too.
23
24 When we speak of free software, we are referring to freedom, not
25@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
26 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27 GNU General Public License for more details.
28
29- You should have received a copy of the GNU General Public License
30- along with this program; if not, write to the Free Software
31- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
32-
33+ You should have received a copy of the GNU General Public License along
34+ with this program; if not, write to the Free Software Foundation, Inc.,
35+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
36
37 Also add information on how to contact you by electronic and paper mail.
38
39@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
40 This General Public License does not permit incorporating your program into
41 proprietary programs. If your program is a subroutine library, you may
42 consider it more useful to permit linking proprietary applications with the
43-library. If this is what you want to do, use the GNU Library General
44+library. If this is what you want to do, use the GNU Lesser General
45 Public License instead of this License.
46diff --git a/COPYING.LGPL b/COPYING.LGPL
47index b124cf5..5703cfc 100644
48--- a/COPYING.LGPL
49+++ b/COPYING.LGPL
50@@ -3,7 +3,7 @@
51 Version 2.1, February 1999
52
53 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
54- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
55+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
56 Everyone is permitted to copy and distribute verbatim copies
57 of this license document, but changing it is not allowed.
58
59@@ -490,7 +490,7 @@ notice is found.
60
61 You should have received a copy of the GNU Lesser General Public
62 License along with this library; if not, write to the Free Software
63- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
64+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
65
66 Also add information on how to contact you by electronic and paper mail.
67
68@@ -506,5 +506,3 @@ if necessary. Here is a sample; alter the names:
69 Ty Coon, President of Vice
70
71 That's all there is to it!
72-
73-

Subscribers

People subscribed via source and target branches