[SCM] attica packaging branch, master, updated. 3ace267fadd2e23f7e3771ebaa36d76d1871e9b0

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/attica.git;a=commitdiff;h=6fad34f

The following commit has been merged in the master branch:
commit 6fad34ffbb586a24d5ab21721e8af479fc2e200b
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 11 12:27:27 2014 -0700

    Update Copyright
---
 debian/changelog |  1 +
 debian/copyright | 26 +++++---------------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb2700b..de5ff86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ attica-kf5 (5.0.0-1~) UNRELEASED; urgency=medium
   [ Scarlett Clark ]
   * Fix install file
   * Update watch file to stable
+  * Update copyright to match upstream 
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Jul 2014 11:54:08 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 843d5e3..e4bde22 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,7 @@ Upstream-Name: attica
 Source: git://anongit.kde.org/attica
 
 Files: *
+       debian/*
 Copyright: 2000, Charles Samuels <charles at kde.org>
            2008, Cornelius Schumacher <schumacher at kde.org>
            2010-2011, Dan Leinir Turthra Jensen <admin at leinir.dk>
@@ -10,11 +11,13 @@ Copyright: 2000, Charles Samuels <charles at kde.org>
            2009-2010, Frederik Gladhorn <gladhorn at kde.org>
            2010, Intel Corporation
            2012, Jeff Mitchell <mitchell at kde.org>
+           2014, Jonathan Riddell <jriddell at ubuntu.com>
            2005, Joseph Wenninger <kde at jowenn.at>
            2011-2012, Laszlo Papp <lpapp at kde.org>
            2009, Marco Martin <notmart at gmail.com>
            2010, Martin Sandsmark <martin.sandsmark at kde.org>
            1999, Matthias Kalle Dalheimer <kalle at kde.org>
+           2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
            2010, Sebastian Kügler <sebas at kde.org>
 LLicense: LGPL-2.1 or LGPL-3 or later approved by KDE e.v.
  This library is free software; you can redistribute it and/or
@@ -33,24 +36,5 @@ LLicense: LGPL-2.1 or LGPL-3 or later approved by KDE e.v.
  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".
-
-Files: debian/*
-Copyright: 2014 Jonathan Riddell <jriddell at ubuntu.com>
-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 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".
+ 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".

-- 
attica packaging