[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-19-g00dcd4a

[Dmitry Smirnov]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=00dcd4a

The following commit has been merged in the master branch:
commit 00dcd4aea4e1780377d2a087c142d0e0f13ae2f8
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Fri Jun 5 22:54:14 2015 +1000

    copyright: drop non-free file and license
---
 debian/copyright | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 4238cb0..ff96ff3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,7 @@ Files-Excluded:
  3rdparty/google-breakpad/src/third_party/linux/lib/glog/libglog.a
  3rdparty/google-breakpad/src/third_party/linux/lib/gflags/libgflags.a
  3rdparty/google-breakpad/src/tools/windows/binaries/*.exe
+ 3rdparty/google-breakpad/src/client/mac/handler/breakpad_nlist_64.cc
 Comment:
  Disclaimer: Autogenerated by CDBS
 
@@ -135,13 +136,6 @@ Files: 3rdparty/google-breakpad/src/common/md5.cc
 Copyright: not-applicable
 License: Public-Domain
 
-Files: ./3rdparty/google-breakpad/src/client/mac/handler/breakpad_nlist_64.cc
-Copyright: 1999 Apple Computer Inc.
-License: APSL-2.0
- http://www.opensource.apple.com/license/apsl/
-Comment: non-DFSG!!!
- Contains portions licensed under BSD-4-clause.
-
 Files: ./extras/calligra/main.cpp
  ./kexi/core/KexiRecentProjects.cpp
  ./kexi/core/KexiRecentProjects.h
@@ -14387,23 +14381,6 @@ License: BSD (3 clause)
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-4-clause
- All rights reserved.
- .
- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- .
- 1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- .
- 2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- .
- 3) All advertising materials mentioning features or use of this software must display the following acknowledgement:
- This product includes software developed by the organization.
- .
- 4) Neither the name of the organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL {{COPYRIGHT HOLDER}} BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
-
 License: BSL-1.0
  Permission is hereby granted, free of charge, to any person or organization
  obtaining a copy of the software and accompanying documentation covered by

-- 
Calligra suite packaging