[SCM] cantor packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-2-4-g93870be

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/cantor.git;a=commitdiff;h=93870be

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 93870be86a525f967d08aacbc583651453561b07
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Dec 3 11:51:52 2014 +0100

    Tidy up debian/copyright
---
 debian/changelog |  4 +++
 debian/copyright | 88 ++++++++++++++++++++++++++------------------------------
 2 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a3da7d4..35e4ee8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 cantor (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Scarlett Clark ]
   * New upstream release candidate
 
+  [ Jonathan Riddell ]
+  * Tidy up debian/copyright
+
  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 02 Dec 2014 09:53:39 -0800
 
 cantor (4:14.11.95-0ubuntu2) vivid; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index 03877ea..be22e23 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,19 @@ Comment: This package was developed for Ubuntu by the Kubuntu Developers and
 
 Files: doc/*
 Copyright: 2009 Alexander Rieder <alexanderrieder at gmail.com>
-License: GFDL-NIV-1.2+
+License: GFDL-1.2+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+ .
+ On Debian systems, the full text of the GNU Free Documentation
+ License version 1.2 can be found in the file
+ `/usr/share/common-licenses/GFDL-1.2'.
 
-Files: src/*
+Files: *
 Copyright: 2009-2010 Alexander Rieder <alexanderrieder at gmail.com>
            2010 Miha Čančula <miha.cancula at gmail.com>
            2006 David Saxton <david at bluehaze.org>
@@ -23,39 +33,6 @@ License: GPL-2+
 Files: src/backends/qalculate/settingswidget.*
 Copyright: 2011  Matteo Agostinelli <agostinelli at gmail.com>
 License: GPL-3+
-
-Files: cmake/*
-Copyright: 2006-2007 Pino Toscano <pino at kde.org>
-           2008 Albert Astals Cid <aacid at kde.org>
-           2007 Vladimir Kuznetsov <ks.vladimir at gmail.com>
-License: BSD-3-clause
-
-Files: debian/*
-Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.launchpad.net>
-           2012 José Manuel Santamaría Lema <panfaust at gmail.com>
-License: GPL-2+
-
-License: GPL-2+
- 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) 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 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 full text of the GNU General Public License
- version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
-
-License: GPL-3+
  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 3 of the License, or
@@ -73,18 +50,10 @@ License: GPL-3+
  version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
 
-License: GFDL-NIV-1.2+
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.2
- or any later version published by the Free Software Foundation;
- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
- A copy of the license is included in the section entitled "GNU
- Free Documentation License".
- .
- On Debian systems, the full text of the GNU Free Documentation
- License version 1.2 can be found in the file
- `/usr/share/common-licenses/GFDL-1.2'.
-
+Files: cmake/*
+Copyright: 2006-2007 Pino Toscano <pino at kde.org>
+           2008 Albert Astals Cid <aacid at kde.org>
+           2007 Vladimir Kuznetsov <ks.vladimir at gmail.com>
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -108,3 +77,28 @@ License: BSD-3-clause
  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: debian/*
+Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.launchpad.net>
+           2012 José Manuel Santamaría Lema <panfaust at gmail.com>
+License: GPL-2+
+
+License: GPL-2+
+ 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) 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 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 full text of the GNU General Public License
+ version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.

-- 
cantor packaging