[SCM] kcm-touchpad packaging branch, master, updated. fb612158ab9285fbb41d5a3dd573f3559fa4d95c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kcm-touchpad.git;a=commitdiff;h=5d85993

The following commit has been merged in the master branch:
commit 5d85993eb89b8afc6dca0f512b373308aa03b4d4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Feb 7 16:16:37 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6b5ca2..20816fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kcm-touchpad (4:5.1.95-1~) UNRELEASED; urgency=medium
   * Update build dependencies to build against experimental and to
     follow cmake.
   * Add myself as Uploader.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 07 Feb 2015 15:28:22 +0100
 
diff --git a/debian/copyright b/debian/copyright
index bbc53b2..d5887f7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,15 +3,65 @@ Upstream-Name: kcm-touchpad
 Source: git://anongit.kde.org/kcm-touchpad
 
 Files: *
-Copyright: Copyright: © 2013 Alexander Mezin <mezin.alexander at gmail.com>
-           Copyright: © 2002-2005, 2007 Peter Osterlund <petero2 at telia.com>
-           Copyright: © 2012 Fredrik Höglund <fredrik at kde.org>
-           Copyright: © 2007 Matthias Kretz <kretz at kde.org>
-           Copyright: © 2008 Helio Chissini de Castro <helio at kde.org>
+Copyright: 2013, Alexander Mezin
+           2013, Alexander Mezin <mezin.alexander at gmail.com>
+           1989-1991, Free Software Foundation, Inc
+           2002-2007, Peter Osterlund
 License: GPL-2+
 
+Files: cmake/modules/COPYING-CMAKE-SCRIPTS
+       cmake/modules/FindX11_XCB.cmake
+       cmake/modules/FindXCB.cmake
+Copyright: 2012, Fredrik Höglund <fredrik at kde.org>
+           2008, Helio Chissini de Castro <helio at kde.org>
+           2007, Matthias Kretz <kretz at kde.org>
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: src/applet/qml/contents/ui/touchpad.qml
+Copyright: 2013, Alexander Mezin <mezin.alexander at gmail.com>
+License: LGPL
+ 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; either version 2 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 Library General Public
+ License along with this program; 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 version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+
 Files: debian/*
-Copyright: 2013 Rohan Garg <rohangarg at kubuntu.org>
+Copyright: 2013, Rohan Garg <rohangarg at kubuntu.org>
 License: GPL-2+
 
 License: GPL-2+

-- 
kcm-touchpad packaging