unity-2d

Merge lp:~mterry/unity-2d/relicense into lp:unity-2d/3.0

  1. relicense
  2. Merge into natty
Proposed by Michael Terry
Status: Merged
Approved by: Florian Boucault
Approved revision: 396
Merged at revision: 378
Proposed branch: lp:~mterry/unity-2d/relicense
Merge into: lp:unity-2d/3.0
Diff against target: 300 lines (+83/-131)
6 files modified
debian/copyright (+61/-105)
panel/lib/applet.cpp (+3/-3)
panel/lib/applet.h (+3/-3)
panel/lib/debug_p.h (+10/-14)
panel/lib/panel.cpp (+3/-3)
panel/lib/panel.h (+3/-3)
To merge this branch: bzr merge lp:~mterry/unity-2d/relicense
Reviewer Review Type Date Requested Status
Florian Boucault (community) Approve
Review via email: mp+47720@code.launchpad.net

Description of the change

According to the GPL [1], you cannot actually distribute LGPL code that is actually part of a GPL binary (vs linked to). The bits of Unity 2D that are LGPL should instead be distributed as GPL-3. The GPL-2+ bits are fine to leave as-is.

I also converted debian/copyright to DEP5 while I was there.

[1] http://www.gnu.org/licenses/gpl-faq.html#AllCompatibility

To post a comment you must log in.
lp:~mterry/unity-2d/relicense updated
395. By Michael Terry

fix typo

Revision history for this message
Florian Boucault (fboucault) wrote :

Thanks for the great heads up Michael! It's really appreciated and looks really good. Just one thing needs fixing: the copyright headers modified were not adapted entirely as it shows here:

kaleo@tequila:~/Projects/upicek/unity-2d$ grep -r Lesser *

panel/lib/applet.h: * GNU Lesser General Public License for more details.
panel/lib/debug_p.h: GNU Lesser General Public License for more details.
panel/lib/applet.cpp: * GNU Lesser General Public License for more details.
panel/lib/panel.h: * GNU Lesser General Public License for more details.
panel/lib/panel.cpp: * GNU Lesser General Public License for more details.

review: Needs Fixing
Revision history for this message
Michael Terry (mterry) wrote :

Ah, good catch. Fixed now.

lp:~mterry/unity-2d/relicense updated
396. By Michael Terry

whoops, missed some instances of 'Lesser', thanks Florian

Revision history for this message
Florian Boucault (fboucault) wrote :

Good to go! (tarmac will merge automatically)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/copyright'
--- debian/copyright 2011-01-27 22:04:48 +0000
+++ debian/copyright 2011-01-28 13:33:42 +0000
@@ -1,106 +1,62 @@
1This package was debianized by Olivier Tilloy <olivier.tilloy@canonical.com>1Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
2on Mon, 30 Aug 2010 14:56:59 +02002Upstream-Name: Unity 2D
33Source: https://code.launchpad.net/~unity-2d-team/unity-2d/trunk
4It was downloaded from:4License: GPL-3
55
6 <https://code.launchpad.net/~unity-2d-team/unity-2d/trunk>6Files: *
77Copyright: 2009,2010 Canonical Ltd.
8Upstream Author(s):8License: GPL-3
99
10 Florian Boucault <florian.boucault@canonical.com>10Files: panel/applets/indicator/indicator.c
11 Olivier Tilloy <olivier.tilloy@canonical.com>11 panel/applets/indicator/indicator.h
12 Aurélien Gâteau <aurelien.gateau@canonical.com>12Copyright: 2009 Mark Trompell <mark@foresightlinux.org>
1313License: GPL-2+
14Copyright:14
1515Files: panel/applets/legacytray/fdoselectionmanager.cpp
16 Copyright (C) 2010 Canonical Ltd.16 panel/applets/legacytray/fdoselectionmanager.h
1717 panel/applets/legacytray/x11embedpainter.cpp
18License:18 panel/applets/legacytray/x11embedpainter.h
1919 panel/applets/legacytray/x11embeddelegate.cpp
20 This program is free software: you can redistribute it and/or modify20 panel/applets/legacytray/x11embeddelegate.h
21 it under the terms of the GNU General Public License as published by21 panel/applets/legacytray/x11embedcontainer.cpp
22 the Free Software Foundation, version 3.22 panel/applets/legacytray/x11embedcontainer.h
2323Copyright: 2008 Jason Stubbs <jasonbstubbs@gmail.com>
24 This package is distributed in the hope that it will be useful,24License: GPL-2+
25 but WITHOUT ANY WARRANTY; without even the implied warranty of25
26 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the26Files: debian/*
27 GNU General Public License for more details.27Copyright: 2010 Canonical Ltd.
2828License: GPL-3
29 You should have received a copy of the GNU General Public License29
30 along with this program. If not, see <http://www.gnu.org/licenses/>.30License: GPL-2+
3131 This program is free software: you can redistribute it and/or modify
32On Debian systems, the complete text of the GNU General32 it under the terms of the GNU General Public License as published by
33Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.33 the Free Software Foundation, either version 2 of the License, or
3434 (at your option) any later version.
35The following files are licensed under the GNU General Public License 35 .
36version 2:36 This program is distributed in the hope that it will be useful,
3737 but WITHOUT ANY WARRANTY; without even the implied warranty of
38panel/applets/indicator/indicator.h38 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
39panel/applets/indicator/indicator.c39 GNU General Public License for more details.
40panel/applets/legacytray/fdoselectionmanager.c40 .
41panel/applets/legacytray/fdoselectionmanager.h41 You should have received a copy of the GNU General Public License
42panel/applets/legacytray/x11embedpainter.cpp42 along with this program. If not, see <http://www.gnu.org/licenses/>.
43panel/applets/legacytray/x11embedpainter.h43 .
44panel/applets/legacytray/x11embeddelegate.cpp44 On Debian systems, the full text of the GNU General Public License
45panel/applets/legacytray/x11embeddelegate.h45 version 2 can be found in the file /usr/share/common-licenses/GPL-2.
46panel/applets/legacytray/x11embedcontainer.cpp46
47panel/applets/legacytray/x11embedcontainer.h47License: GPL-3
4848 This program is free software: you can redistribute it and/or modify
49 This program is free software: you can redistribute it and/or modify49 it under the terms of the GNU General Public License as published by
50 it under the terms of the GNU General Public License as published by50 the Free Software Foundation, version 3 of the License.
51 the Free Software Foundation, either version 2 of the License, or51 .
52 (at your option) any later version.52 This program is distributed in the hope that it will be useful,
5353 but WITHOUT ANY WARRANTY; without even the implied warranty of
54 This package is distributed in the hope that it will be useful,54 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
55 but WITHOUT ANY WARRANTY; without even the implied warranty of55 GNU General Public License for more details.
56 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the56 .
57 GNU General Public License for more details.57 You should have received a copy of the GNU General Public License
5858 along with this program. If not, see <http://www.gnu.org/licenses/>.
59 You should have received a copy of the GNU General Public License59 .
60 along with this program. If not, see <http://www.gnu.org/licenses/>.60 On Debian systems, the full text of the GNU General Public License
6161 version 3 can be found in the file /usr/share/common-licenses/GPL-3.
62On Debian systems, the complete text of the GNU General
63Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
64
65Individual parts of this package are licensed under the GNU Lesser General Public
663 License:
67
68 This program is free software: you can redistribute it and/or modify
69 it under the terms of the GNU Lesser General Public License as
70 published by the Free Software Foundation, version 3.
71
72 This package is distributed in the hope that it will be useful,
73 but WITHOUT ANY WARRANTY; without even the implied warranty of
74 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
75 GNU Lesser General Public License for more details.
76
77 You should have received a copy of the GNU Lesser General Public License
78 along with this program. If not, see <http://www.gnu.org/licenses/>.
79
80On Debian systems, the complete text of the GNU General
81Public License version 3 can be found in `/usr/share/common-licenses/LGPL-3'.
82
83The file panel/lib/debug_p.h licensed under the GNU Library General Public
842.1 License :
85
86 This program is free software: you can redistribute it and/or modify
87 it under the terms of the GNU Library General Public License as
88 published by the Free Software Foundation, version 2.
89
90 This package is distributed in the hope that it will be useful,
91 but WITHOUT ANY WARRANTY; without even the implied warranty of
92 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
93 GNU Library General Public License for more details.
94
95 You should have received a copy of the GNU Library General Public License
96 along with this program. If not, see <http://www.gnu.org/licenses/>
97
98On Debian systems, the complete text of the GNU General
99Public License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
100
101The Debian packaging is:
102
103 Copyright (C) 2010 Canonical Ltd.
104
105and is licensed under the GPL version 3, see above.
10662
10763
=== modified file 'panel/lib/applet.cpp'
--- panel/lib/applet.cpp 2011-01-15 01:41:03 +0000
+++ panel/lib/applet.cpp 2011-01-28 13:33:42 +0000
@@ -7,15 +7,15 @@
7 * - Aurélien Gâteau <aurelien.gateau@canonical.com>7 * - Aurélien Gâteau <aurelien.gateau@canonical.com>
8 *8 *
9 * This program is free software; you can redistribute it and/or modify9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU Lesser General Public License as published10 * it under the terms of the GNU General Public License as published
11 * by the Free Software Foundation; version 3.11 * by the Free Software Foundation; version 3.
12 *12 *
13 * This program is distributed in the hope that it will be useful,13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU Lesser General Public License for more details.16 * GNU General Public License for more details.
17 *17 *
18 * You should have received a copy of the GNU Lesser General Public License18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>.19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 */20 */
2121
2222
=== modified file 'panel/lib/applet.h'
--- panel/lib/applet.h 2011-01-15 01:41:03 +0000
+++ panel/lib/applet.h 2011-01-28 13:33:42 +0000
@@ -7,15 +7,15 @@
7 * - Aurélien Gâteau <aurelien.gateau@canonical.com>7 * - Aurélien Gâteau <aurelien.gateau@canonical.com>
8 *8 *
9 * This program is free software; you can redistribute it and/or modify9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU Lesser General Public License as published 10 * it under the terms of the GNU General Public License as published
11 * by the Free Software Foundation; version 3.11 * by the Free Software Foundation; version 3.
12 *12 *
13 * This program is distributed in the hope that it will be useful,13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU Lesser General Public License for more details.16 * GNU General Public License for more details.
17 *17 *
18 * You should have received a copy of the GNU Lesser General Public License18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>.19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 */20 */
2121
2222
=== modified file 'panel/lib/debug_p.h'
--- panel/lib/debug_p.h 2010-10-06 13:52:55 +0000
+++ panel/lib/debug_p.h 2011-01-28 13:33:42 +0000
@@ -1,23 +1,19 @@
1/* This file is part of the dbusmenu-qt library1/* This file is part of unity-2d
2 Copyright 2009 Canonical2 Copyright 2009 Canonical
3 Author: Aurelien Gateau <aurelien.gateau@canonical.com>3 Author: Aurelien Gateau <aurelien.gateau@canonical.com>
44
5 This library is free software; you can redistribute it and/or5 This program is free software; you can redistribute it and/or modify
6 modify it under the terms of the GNU Library General Public6 it under the terms of the GNU General Public License as published
7 License (LGPL) as published by the Free Software Foundation;7 by the Free Software Foundation; version 3.
8 either version 2 of the License, or (at your option) any later
9 version.
108
11 This library is distributed in the hope that it will be useful,9 This program is distributed in the hope that it will be useful,
12 but WITHOUT ANY WARRANTY; without even the implied warranty of10 but WITHOUT ANY WARRANTY; without even the implied warranty of
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 Library General Public License for more details.12 GNU General Public License for more details.
1513
16 You should have received a copy of the GNU Library General Public License14 You should have received a copy of the GNU General Public License
17 along with this library; see the file COPYING.LIB. If not, write to15 along with this program. If not, see <http://www.gnu.org/licenses/>.
18 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,16 */
19 Boston, MA 02110-1301, USA.
20*/
21#ifndef DEBUG_P_H17#ifndef DEBUG_P_H
22#define DEBUG_P_H18#define DEBUG_P_H
2319
2420
=== modified file 'panel/lib/panel.cpp'
--- panel/lib/panel.cpp 2011-01-15 01:41:03 +0000
+++ panel/lib/panel.cpp 2011-01-28 13:33:42 +0000
@@ -7,15 +7,15 @@
7 * - Aurélien Gâteau <aurelien.gateau@canonical.com>7 * - Aurélien Gâteau <aurelien.gateau@canonical.com>
8 *8 *
9 * This program is free software; you can redistribute it and/or modify9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU Lesser General Public License as published10 * it under the terms of the GNU General Public License as published
11 * by the Free Software Foundation; version 3.11 * by the Free Software Foundation; version 3.
12 *12 *
13 * This program is distributed in the hope that it will be useful,13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU Lesser General Public License for more details.16 * GNU General Public License for more details.
17 *17 *
18 * You should have received a copy of the GNU Lesser General Public License18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>.19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 */20 */
2121
2222
=== modified file 'panel/lib/panel.h'
--- panel/lib/panel.h 2011-01-15 01:41:03 +0000
+++ panel/lib/panel.h 2011-01-28 13:33:42 +0000
@@ -7,15 +7,15 @@
7 * - Aurélien Gâteau <aurelien.gateau@canonical.com>7 * - Aurélien Gâteau <aurelien.gateau@canonical.com>
8 *8 *
9 * This program is free software; you can redistribute it and/or modify9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU Lesser General Public License as published10 * it under the terms of the GNU General Public License as published
11 * by the Free Software Foundation; version 3.11 * by the Free Software Foundation; version 3.
12 *12 *
13 * This program is distributed in the hope that it will be useful,13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU Lesser General Public License for more details.16 * GNU General Public License for more details.
17 *17 *
18 * You should have received a copy of the GNU Lesser General Public License18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>.19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 */20 */
2121

Subscribers

People subscribed via source and target branches