[SCM] karchive packaging branch, master, updated. 6699009983930b01fbd56577f07251d4642b1e86

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/karchive.git;a=commitdiff;h=67da45c

The following commit has been merged in the master branch:
commit 67da45c795943e99fb4a3832c3a035897eb46772
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jul 15 11:41:54 2014 +0200

    Update copyright information
---
 debian/copyright | 84 +++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 29 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 900f48e..1bfb549 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,13 +4,11 @@ Source: git://anongit.kde.org/karchive
 
 Files: *
        debian/*
-Copyright: 2000-2005,2006,2007,2009 David Faure <faure at kde.org>
-           2002 Holger Schroeder <holger-kde at holgis.net>
-           2002 Laurence Anderson <l.d.anderson at warwick.ac.uk>
-           2003 Leo Savernik <l.savernik at aon.at>
-           2007-2008 Per Øyvind Karlsen <peroyvind at mandriva.org>
-           2011 Mario Bensi <mbensi at ipsquad.net>
+Copyright: 2000-2010, David Faure <faure at kde.org>
            2014 Jonathan Riddell <jriddell at ubuntu.com>,
+           2011-2012, Mario Bensi <mbensi at ipsquad.net>
+           2007-2008 Per Øyvind Karlsen <peroyvind at mandriva.org>
+           2009, Pino Toscano <pino at kde.org>
            2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
 License: LGPL-2+
  This library is free software; you can redistribute it and/or
@@ -31,38 +29,37 @@ License: LGPL-2+
  On Debian systems, the complete text of the GNU Library General
  Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
 
-Files: autotests/kfiltertest.h
-       autotests/kfiltertest.cpp
+Files: autotests/kfiltertest.cpp
+       autotests/kfiltertest.h
+       src/k7zip.cpp
+       src/k7zip.h
        src/karchive.cpp
        src/karchivedirectory.h
-       src/kar.cpp
-       src/kzip.cpp
-       src/klimitediodevice.cpp
-       src/kzip.h
-       src/kfilterdev.cpp
-       src/kcompressiondevice.cpp
+       src/karchiveentry.h
+       src/karchivefile.h
        src/karchive.h
        src/karchive_p.h
-       src/klimitediodevice_p.h
-       src/k7zip.cpp
+       src/kar.cpp
+       src/kar.h
+       src/kcompressiondevice.cpp
        src/kcompressiondevice.h
+       src/kfilterdev.cpp
        src/kfilterdev.h
+       src/klimitediodevice.cpp
+       src/klimitediodevice_p.h
        src/ktar.cpp
-       src/k7zip.h
-       src/kzipfileentry.h
-       src/karchiveentry.h
-       src/kar.h
        src/ktar.h
-       src/karchivefile.h
-       tests/kziptest.cpp
-       tests/ktartest.cpp
+       src/kzip.cpp
+       src/kzipfileentry.h
+       src/kzip.h
        tests/k7ziptest.cpp
-Copyright: 2000-2005,2006,2007,2009 David Faure <faure at kde.org>
-           2002 Holger Schroeder <holger-kde at holgis.net>
-           2002 Laurence Anderson <l.d.anderson at warwick.ac.uk>
-           2003 Leo Savernik <l.savernik at aon.at>
-           2007-2008 Per Øyvind Karlsen <peroyvind at mandriva.org>
-           2011 Mario Bensi <mbensi at ipsquad.net>
+       tests/ktartest.cpp
+       tests/kziptest.cpp
+Copyright: 2000-2013, David Faure <faure at kde.org>
+           2002, Holger Schroeder <holger-kde at holgis.net>
+           2002, Laurence Anderson <l.d.anderson at warwick.ac.uk>
+           2003, Leo Savernik <l.savernik at aon.at>
+           2011, Mario Bensi <mbensi at ipsquad.net>
 License: LGPL-2
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
@@ -80,3 +77,32 @@ License: LGPL-2
  .
  On Debian systems, the complete text of the GNU Library General
  Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+
+Files: examples/bzip2gzip/main.cpp
+       examples/helloworld/main.cpp
+       examples/tarlocalfiles/main.cpp
+       examples/unzipper/main.cpp
+Copyright: 2013-2014, Maarten De Meyer <de.meyer.maarten at gmail.com>
+License: BSD-2-clause
+ You may use this file under the terms of the BSD license as follows:
+ .
+ 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.

-- 
karchive packaging