[SCM] mate-control-center Debian package branch, master, updated. 421f3a0bba678f03974cb81521c7f6915f8f4e05

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-control-center.git;a=commitdiff;h=0cb2e7e

The following commit has been merged in the master branch:
commit 0cb2e7e58ff1a9381951192955a0f47d48880eb9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Apr 17 22:38:46 2014 +0200

    debian/copyright: add more license blocks
---
 debian/copyright | 44 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 60af6a1..63de998 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -268,7 +268,13 @@ License: GPL-2+
  
 Files: capplets/common/mate-theme-apply.c
 Copyright: 2002, Jonathan Blandford <aes at gnome.org>
-License: GPL-2.1+
+License: LGPL-2.1+
+Comment:
+ The license header of this file refers to a GPL-2.1+ license version which
+ does not exist. The license header also refers to "This library ...", which
+ alludes that this file should actually be dealt with as licensed under LGPL-2.1+.
+ .
+ See https://github.com/mate-desktop/mate-control-center/issues/95.
 
 Files: capplets/about-me/eel-gtk-macros.h
 Copyright: 1999-2001, Eazel, Inc
@@ -297,11 +303,27 @@ Copyright: 2011-2014, Stefano Karapetsas <stefano at karapetsas.com>
            2013-2014, Mike Gabriel <sunweaver at debian.org>
 License: GPL-2+ or LGPL-2+
 
+License: GPL-2
+ This package 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 2 of the License.
+ .
+ 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 Genaral Public License for more details.
+ .
+ You should have received a copy og 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".
+
 License: GPL-2+
  This package 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 opinion) any later version.
+ (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
@@ -331,3 +353,21 @@ License: LGPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version LGPL-2 can be found in "/usr/share/common-licenses/LGPL-2".
+
+License: LGPL-2.1+
+ This library 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; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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 library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ .
+ On Debian systems, the complete text of the GNU Library General Public License 2.1
+ can be found in "/usr/share/common-licenses/LGPL-2.1"
\ No newline at end of file

-- 
mate-control-center Debian package