[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-24-g60380b4
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Sat Jun 13 02:26:40 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=60380b4
The following commit has been merged in the master branch:
commit 60380b41c263b59647c4f7cba686affb144c3b1a
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Fri Jun 12 09:57:45 2015 +1000
copyright: better 3rdparty coverage
---
debian/copyright | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 985b2d6..0aaede8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,7 +12,7 @@ Files-Excluded:
Comment:
This file needs comprehensive review: autogenerated data is rubbish.
-Files: ./3rdparty/google-breakpad/*
+Files: 3rdparty/google-breakpad/*
Copyright: 2003-2014 Google Inc
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
@@ -63,8 +63,7 @@ Copyright: 2007-2009 Google Inc.
2007-2009 Neal Norwitz
License: Apache-2.0
-Files:
- 3rdparty/google-breakpad/src/common/mac/testing/GTMSenTestCase.h
+Files: 3rdparty/google-breakpad/src/common/mac/testing/GTMSenTestCase.h
Copyright: 2007-2008 Google Inc.
1997-2005, Sen:te (Sente SA)
License: Apache-2.0
@@ -91,7 +90,7 @@ Comment: Portions of this file fall under the following license (BSD-2-clause):
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: ./3rdparty/google-breakpad/src/third_party/curl/*
+Files: 3rdparty/google-breakpad/src/third_party/curl/*
Copyright: 1996-2011 Daniel Stenberg <daniel at haxx.se>
License: Expat-noAD
Permission to use, copy, modify, and distribute this software for any purpose
@@ -136,6 +135,20 @@ Files: 3rdparty/google-breakpad/src/common/md5.cc
Copyright: not-applicable
License: Public-Domain
+Files: 3rdparty/kdchart/*
+ 3rdparty/kdgantt/*
+Copyright: 2001-2011 Klarälvdalens Datakonsult AB.
+License: GPL-2 or GPL-3
+
+Files:
+ 3rdparty/kdgantt/kdgantttimescalezoomdialog.*
+Copyright: 2008 Dag Andersen <kplato at kde.org>
+License: LGPL-2+
+Comment:
+ part of the Calligra project.
+
+
+
Files: ./extras/calligra/main.cpp
./kexi/core/KexiRecentProjects.cpp
./kexi/core/KexiRecentProjects.h
@@ -7192,15 +7205,6 @@ Copyright: 2007-2009 Adam Pigg <adam at piggz.co.uk>
2011-2012 Jarosław Staniek <staniek at kde.org>
License: LGPL-2.1+
-Files: ./3rdparty/kdchart/kdablibfakes/src/*
- ./3rdparty/kdchart/src/*
- ./3rdparty/kdchart/src/LeveyJennings/*
- ./3rdparty/kdchart/src/PrerenderedElements/*
- ./3rdparty/kdchart/src/Scenery/*
- ./3rdparty/kdchart/src/Ternary/*
-Copyright: 2001-2011 Klaralvdalens Datakonsult AB.
-License: GPL-2+
-
Files: ./filters/libmso/pole.h
./filters/libmsooxml/ooxml_pole.cpp
./filters/libmsooxml/ooxml_pole.h
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list