[SCM] user-manager packaging branch, master, updated. 31a9c75c83585ea4169655004a799939a59d806d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/user-manager.git;a=commitdiff;h=f55c9d1

The following commit has been merged in the master branch:
commit f55c9d15726aea66a679b5b127e8b0d75e51456f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 13 15:05:43 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42e9632..3b80281 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ user-manager (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>  Fri, 13 Feb 2015 14:49:18 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 455f6bc..9ceff9e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,14 +4,21 @@ Upstream-Maintainer: Alejandro Fiestas Olivares <afiestas at kde.org>
 Source: git://anongit.kde.org/user-manager
 
 Files: *
-Copyright: Copyright 2012, Alejandro Fiestas Olivares <afiestas at kde.org>
-Copyright: Copyright 2010-2012, Bart Kroon <bart at tarmack.eu>
+Copyright: 2012-2013, Alejandro Fiestas Olivares <afiestas at kde.org>
+           1989-1991, Free Software Foundation, Inc
 License: GPL-2+
 
-Files: src/lib/modeltest.*
-Copyright: Copyright 2007, Trolltech ASA. All rights reserved.
+Files: src/lib/modeltest.cpp
+       src/lib/modeltest.h
+Copyright: 2007, Trolltech ASA
 License: GPL-2
 
+Files: debian/*
+Copyright: 2015, Maximiliano Curia <maxy at debian.org>
+License: Permissive
+ The packaging efforts in this debian package are free software; the copyright
+ holder(s) give unlimited permission to copy, distribute and modify it.
+
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public

-- 
user-manager packaging