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

[Michael Terry]

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

[lp:~mterry/unity-2d/relicense]

395. By Michael Terry on 2011-01-27

fix typo

[Florian Boucault (fboucault)]

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

[Michael Terry (mterry)]

Ah, good catch. Fixed now.

[lp:~mterry/unity-2d/relicense]

396. By Michael Terry on 2011-01-28

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

[Florian Boucault (fboucault)]

Good to go! (tarmac will merge automatically)

review: Approve

=== 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 @@
-This package was debianized by Olivier Tilloy <[e-mail]>
-on Mon, 30 Aug 2010 14:56:59 +0200
-
-It was downloaded from:
-
-    <https://code.launchpad.net/~unity-2d-team/unity-2d/trunk>
-
-Upstream Author(s):
-
-    Florian Boucault <[e-mail]>
-    Olivier Tilloy <[e-mail]>
-    Aurélien Gâteau <[e-mail]>
-
-Copyright:
-
-    Copyright (C) 2010 Canonical Ltd.
-
-License:
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, version 3.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU General
-Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
-
-The following files are licensed under the GNU General Public License 
-version 2:
-
-panel/applets/indicator/indicator.h
-panel/applets/indicator/indicator.c
-panel/applets/legacytray/fdoselectionmanager.c
-panel/applets/legacytray/fdoselectionmanager.h
-panel/applets/legacytray/x11embedpainter.cpp
-panel/applets/legacytray/x11embedpainter.h
-panel/applets/legacytray/x11embeddelegate.cpp
-panel/applets/legacytray/x11embeddelegate.h
-panel/applets/legacytray/x11embedcontainer.cpp
-panel/applets/legacytray/x11embedcontainer.h
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 2 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-
-Individual parts of this package are licensed under the GNU Lesser General Public
-3 License:
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as 
-    published by the Free Software Foundation, version 3.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU General
-Public License version 3 can be found in `/usr/share/common-licenses/LGPL-3'.
-
-The file panel/lib/debug_p.h licensed under the GNU Library General Public
-2.1 License :
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Library General Public License as 
-    published by the Free Software Foundation, version 2.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Canonical Ltd.
-
-and is licensed under the GPL version 3, see above.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Upstream-Name: Unity 2D
+Source: https://code.launchpad.net/~unity-2d-team/unity-2d/trunk
+License: GPL-3
+
+Files: *
+Copyright: 2009,2010 Canonical Ltd.
+License: GPL-3
+
+Files: panel/applets/indicator/indicator.c
+       panel/applets/indicator/indicator.h
+Copyright: 2009 Mark Trompell <[e-mail]>
+License: GPL-2+
+
+Files: panel/applets/legacytray/fdoselectionmanager.cpp
+       panel/applets/legacytray/fdoselectionmanager.h
+       panel/applets/legacytray/x11embedpainter.cpp
+       panel/applets/legacytray/x11embedpainter.h
+       panel/applets/legacytray/x11embeddelegate.cpp
+       panel/applets/legacytray/x11embeddelegate.h
+       panel/applets/legacytray/x11embedcontainer.cpp
+       panel/applets/legacytray/x11embedcontainer.h
+Copyright: 2008 Jason Stubbs <[e-mail]>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2010 Canonical Ltd.
+License: GPL-3
+
+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file /usr/share/common-licenses/GPL-2.
+
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 3 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file /usr/share/common-licenses/GPL-3.
 

=== 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 @@
  * - Aurélien Gâteau <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
+ * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

=== 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 @@
  * - Aurélien Gâteau <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published 
+ * it under the terms of the GNU General Public License as published 
  * by the Free Software Foundation; version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

=== 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 @@
-/* This file is part of the dbusmenu-qt library
+/* This file is part of unity-2d
    Copyright 2009 Canonical
    Author: Aurelien Gateau <[e-mail]>
 
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License (LGPL) as published by the Free Software Foundation;
-   either version 2 of the License, or (at your option) any later
-   version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 3.
 
-   This library is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #ifndef DEBUG_P_H
 #define DEBUG_P_H
 

=== 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 @@
  * - Aurélien Gâteau <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
+ * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

=== 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 @@
  * - Aurélien Gâteau <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
+ * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */