[SCM] milou packaging branch, master, updated. e8e7c9e8c15368f41b0807e0bc442dca5c53cc65

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/milou.git;a=commitdiff;h=61ff8e6

The following commit has been merged in the master branch:
commit 61ff8e601bcb22b69addebff403192a82dfd6f52
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Feb 10 13:56:51 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 79 ++++++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 692f7b6..930f09b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ milou (4:5.2.0-1~) UNRELEASED; urgency=medium
   * Update build dependencies to build against experimental and to
     follow cmake.
   * Bump Standards-Version to 3.9.6, no changes needed.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 10 Feb 2015 13:35:03 +0100
 
diff --git a/debian/copyright b/debian/copyright
index f1ca9dc..cec5263 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,8 @@ Upstream-Name: milou
 Source: ftp://ftp.kde.org/pub/kde/unstable/plasma/milou
 
 Files: *
-Copyright: © 2013-2014 Vishesh Handa <me at vhanda.in>
-License: LGPL-2.1+ or any
- later version accepted by the membership of KDE e.V
+Copyright: 2014, Vishesh Handa <vhanda at kde.org>
+License: LGPL-2.1+3+KDEeV
  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
@@ -21,11 +20,44 @@ License: LGPL-2.1+ or any
  .
  You should have received a copy of the GNU Lesser General Public
  License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1", likewise,
+ the complete text of the GNU Lesser General Public License version 3 can be
+ found in "/usr/share/common-licenses/LGPL-3".
+
+Files: lib/previews/videos/videoplugin.cpp
+       lib/previews/videos/videoplugin.h
+       plasmoid/applet.cpp
+       plasmoid/applet.h
+       plasmoid/configwidget.cpp
+       plasmoid/configwidget.h
+License: GPL-2+3+KDEeV
+ 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) version 3 or any later version
+ accepted by the membership of KDE e.V. (or its successor approved
+ by the membership of KDE e.V.), which shall act as a proxy
+ defined in Section 14 of 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 complete text of the GNU General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2", likewise, the
+ complete text of the GNU General Public License version 3 can be found in
+ "/usr/share/common-licenses/GPL-3".
 
 Files: lib/test/modeltest.cpp
        lib/test/modeltest.h
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
-License: GPL-3 or LGPL-2.1
+Copyright: 2013, Digia Plc and/or its subsidiary(-ies)
+License: GPL-3 or LGPL-2.1-QTexception-1.1
  GNU Lesser General Public License Usage
  Alternatively, this file may be used under the terms of the GNU Lesser
  General Public License version 2.1 as published by the Free Software
@@ -45,25 +77,28 @@ License: GPL-3 or LGPL-2.1
  packaging of this file.  Please review the following information to
  ensure the GNU General Public License version 3.0 requirements will be
  met: http://www.gnu.org/copyleft/gpl.html
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1", likewise, the
+ complete text of the GNU General Public License version 3 can be found in
+ "/usr/share/common-licenses/GPL-3".
 
-Files: lib/previews/videos/*         
-       plasmoid/* 
-       debian/*
-Copyright: 2013-2014 Vishesh Handa <me at vhanda.in>
-           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: GPL-2.0+
- 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 option) any later version.
+Files: debian/*
+Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+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 package is distributed in the hope that it will be useful,
+ 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 General Public License for more details.
+ 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 General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
+ 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 General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".

-- 
milou packaging