[SCM] kopete packaging branch, master, updated. debian/4.11.3-2-2-gb2cf24e

Wed Dec 11 07:30:14 UTC 2013

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kopete.git;a=commitdiff;h=b2cf24e

The following commit has been merged in the master branch:
commit b2cf24e54d107082b035b6fe72fe70fcc91bcdbf
Author: Pino Toscano <pino at debian.org>
Date:   Wed Dec 11 08:30:00 2013 +0100

    copyright: validity fixes
---
 debian/changelog |  2 ++
 debian/copyright | 77 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de9863c..4105b3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kopete (4:4.11.3-3) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Fix validity of copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 Dec 2013 08:28:17 +0100
 
diff --git a/debian/copyright b/debian/copyright
index b71a28d..25f09fd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -401,7 +401,7 @@ License: BSD-2-clause
 
 Files: plugins/otr/*
 Copyright: 2007, Michael Zanetti <michael_zanetti at gmx.net>
-License: GPL-2+ or GPL-3+ with KDE e.V. exception
+License: GPL-2-or-GPL-3-or-eV
 
 Files: plugins/privacy/privacymessagehandler.cpp
        plugins/privacy/privacymessagehandler.h
@@ -456,7 +456,7 @@ Copyright: 2008-2010, Barracuda Networks, Inc
            2003, The Internet Society
            2010, Tobias Markmann
            1999,2000, Tom Tromey
-License: LGPL-2.1
+License: LGPL-2.1+
 
 Files: protocols/jabber/libiris/src/jdns/*
 Copyright: 2005, Jeremie Miller
@@ -551,7 +551,7 @@ License: public-domain
 Files: protocols/jabber/googletalk/libjingle/talk/base/base64.h
        protocols/jabber/googletalk/libjingle/talk/base/base64.cc
 Copyright: 1999, Bob Withers <bwit at pobox.com>
-License: Other permissive
+License:
  This code may be freely used for any purpose, either personal
  or commercial, provided the authors copyright notice remains
  intact.
@@ -560,7 +560,7 @@ Files: protocols/jabber/googletalk/libjingle/talk/base/scoped_ptr.h
 Copyright: 1998-1999, Greg Colvin
            1998-1999, Beman Dawes
            2001-2002, Peter Dimov
-License: Other permissive
+License:
  Permission to copy, use, modify, sell and distribute this software
  is granted provided this copyright notice appears in all copies.
  This software is provided "as is" without express or implied
@@ -740,6 +740,26 @@ License: LGPL-2+
 Files: protocols/oscar/liboscar/tests/main.cpp
 Copyright: 2004, Zack Rusin <zack at kde.org>
 License: BSD-2-clause
+ 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.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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.
 
 Files: protocols/oscar/aim/aimjoinchat.cpp
        protocols/oscar/aim/aimjoinchat.h
@@ -770,21 +790,6 @@ Files: protocols/qq/md5.c
        protocols/qq/md5.h
 Copyright: 1999, Aladdin Enterprises. All rights reserved
 License: Zlib
- This software is provided 'as-is', without any express or implied
- warranty.  In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
 
 Files: protocols/skype/libskype/skype.cpp
        protocols/skype/libskype/skype.h
@@ -920,21 +925,6 @@ Files: protocols/yahoo/libkyahoo/md5.c
        protocols/yahoo/libkyahoo/md5.h
 Copyright: 1999, Aladdin Enterprises. All rights reserved
 License: Zlib
- This software is provided 'as-is', without any express or implied
- warranty.  In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
 
 Files: protocols/yahoo/libkyahoo/sha1.c
        protocols/yahoo/libkyahoo/sha1.h
@@ -1049,7 +1039,7 @@ License: LGPL-2.1+
  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".
 
-License: GPL-2+ or GPL-3+ with KDE e.V. exception
+License: GPL-2-or-GPL-3-or-eV
  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
@@ -1070,3 +1060,20 @@ License: GPL-2+ or GPL-3+ with KDE e.V. exception
  versions 2 and 3 can be found in `/usr/share/common-licenses/GPL-2' and
  `/usr/share/common-licenses/GPL-3'.
 
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+

-- 
kopete packaging

