[SCM] kopete packaging branch, master, updated. debian/4.14.1-1-5-gd35ed03

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit d35ed03717cf7fd6c86f599e155e626ff7715fad
Author: Pino Toscano <pino at debian.org>
Date:   Sun Oct 5 16:53:23 2014 +0200

    copyright: update
---
 debian/changelog |  1 +
 debian/copyright | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3b4e1d..c95bce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ kopete (4:4.14.1-2) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * Remove (apparently unused) libgnutls-dev build dependency.
     (Closes: #764102)
+  * Update copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Oct 2014 15:50:57 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 92ff436..dad7370 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -486,7 +486,7 @@ Files: protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
 Copyright: 2010, Rion
 License: GPL-2+
 
-Files: protocols/jabber/googletalk/libjingle/*
+Files: protocols/jabber/libjingle/*
 Copyright: 2003-2012, Google Inc.
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
@@ -512,8 +512,8 @@ License: BSD-3-clause
  WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-Files: protocols/jabber/googletalk/libjingle/talk/base/md5.h
-       protocols/jabber/googletalk/libjingle/talk/base/md5c.c
+Files: protocols/jabber/libjingle/talk/base/md5.h
+       protocols/jabber/libjingle/talk/base/md5c.c
 Copyright: No copyright claimed
 License: public-domain
  This code implements the MD5 message-digest algorithm.
@@ -526,8 +526,8 @@ License: public-domain
  except that you don't need to include two pages of legalese
  with every copy.
 
-Files: protocols/jabber/googletalk/libjingle/talk/base/sha1.h
-       protocols/jabber/googletalk/libjingle/talk/base/sha1.c
+Files: protocols/jabber/libjingle/talk/base/sha1.h
+       protocols/jabber/libjingle/talk/base/sha1.c
 Copyright: No copyright claimed
 License: public-domain
  SHA-1 in C
@@ -539,7 +539,7 @@ License: public-domain
  By James H. Brown <jbrown at burgoyne.com>
  Still 100% Public Domain
 
-Files: protocols/jabber/googletalk/libjingle/talk/base/sigslot.h
+Files: protocols/jabber/libjingle/talk/base/sigslot.h
 Copyright: No copyright claimed
 License: public-domain
  Written by Sarah Thompson (sarah at telergy.com) 2002.
@@ -548,15 +548,15 @@ License: public-domain
  the proviso that the author takes on no responsibility or liability for any
  use.
 
-Files: protocols/jabber/googletalk/libjingle/talk/base/base64.h
-       protocols/jabber/googletalk/libjingle/talk/base/base64.cc
+Files: protocols/jabber/libjingle/talk/base/base64.h
+       protocols/jabber/libjingle/talk/base/base64.cc
 Copyright: 1999, Bob Withers <bwit at pobox.com>
 License:
  This code may be freely used for any purpose, either personal
  or commercial, provided the authors copyright notice remains
  intact.
 
-Files: protocols/jabber/googletalk/libjingle/talk/base/scoped_ptr.h
+Files: protocols/jabber/libjingle/talk/base/scoped_ptr.h
 Copyright: 1998-1999, Greg Colvin
            1998-1999, Beman Dawes
            2001-2002, Peter Dimov
@@ -566,7 +566,7 @@ License:
  This software is provided "as is" without express or implied
  warranty, and with no claim as to its suitability for any purpose.
 
-Files: protocols/jabber/googletalk/libjingle/talk/third_party/libudev/libudev.h
+Files: protocols/jabber/libjingle/talk/third_party/libudev/libudev.h
 Copyright: 2008-2010, Kay Sievers <kay.sievers at vrfy.org>
 License: LGPL-2.1+
 
@@ -964,7 +964,7 @@ Copyright: 1996-2000, Free Software Foundation, Inc
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2007-2013, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Copyright: 2007-2014, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+
 
 License: GPL-2+

-- 
kopete packaging