[SCM] kplotting packaging branch, kubuntu_wily_archive, updated. debian/5.8.0-1-13-g0bb65f3

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kplotting.git;a=commitdiff;h=948573c

The following commit has been merged in the kubuntu_wily_archive branch:
commit 948573cdb8981ee775b45f4c9e0b54cee289f908
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jan 23 16:49:30 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 9d39eac..854c6f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kplotting (5.6.0-1~) UNRELEASED; urgency=medium
   * Bump build dependencies to build against the experimental versions.
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Update install files.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 23 Jan 2015 15:56:28 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 53ff36d..1554a74 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,30 +6,13 @@ Files: *
 Copyright: © 2003, 2006 Jason Harris <kstars at 30doradus.org>
            © 2012 Benjamin Port <benjamin.port at ben2367.fr>
            © 2005 Andreas Nicolai <andreas.nicolai at gmx.net>
+           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
 License: LGPL-2+
- This library 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 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
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB.  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/*
-       examples/* excluding:
-       examples/CMakeLists.txt
-Copyright:2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
-	  2006 by Jason Harris <kstars at 30doradus.org>
+Files: examples/testplot_main.cpp
+       examples/testplot_widget.cpp
+       examples/testplot_widget.h
+Copyright: 2006, Jason Harris <kstars at 30doradus.org>
 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
@@ -46,3 +29,26 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: debian/*
+Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-2+
+
+License: LGPL-2+
+ This library 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 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB.  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".

-- 
kplotting packaging