[SCM] libkdcraw packaging branch, master, updated. debian/4.10.5-1

Sat Jul 13 12:59:09 UTC 2013

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

The following commit has been merged in the master branch:
commit a730489388f471a966ca4ec52f6035f84cb11741
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Apr 7 16:12:52 2013 +0200

    Update debian/copyright file
---
 debian/changelog |    1 +
 debian/copyright |  174 +++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 154 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6418a19..ca96259 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libkdcraw (4:4.10.2-1) UNRELEASED; urgency=low
 
   [ Maximiliano Curia ]
   * Add missing authors file refered in the documentation
+  * Update debian/copyright file
 
  -- Sune Vuorela <sune at debian.org>  Sat, 06 Apr 2013 23:13:46 +0000
 
diff --git a/debian/copyright b/debian/copyright
index 538d0fe..f61faf9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,54 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libkdcraw
+Upstream-Contact: Marcel Wiesweg <marcel.wiesweg at gmx.de>
 Source: ftp.kde.org
 Comment: This package was developed for Ubuntu by the Kubuntu Developers and
  modified to be included in Debian. See below the copyright holders for debian/*
  files.
 
+Files: *
+Copyright: 2005-2012, Gilles Caulier <caulier.gilles at gmail.com>
+           2006-2012, Marcel Wiesweg <marcel.wiesweg at gmx.de>
+License: GPL-2+
+
+Files: *.cmake
+Copyright: Caulier Gilles <caulier.gilles at gmail.com>
+           2006-2012, Marcel Wiesweg <marcel.wiesweg at gmx.de>
+License: BSD-3-clause
+
+Files: libkdcraw/dcrawsettingswidget.cpp
+       libkdcraw/dcrawsettingswidget.h
+       libkdcraw/kdcraw.cpp
+       libkdcraw/kdcraw.h
+       libkdcraw/rawdecodingsettings.cpp
+       libkdcraw/rawdecodingsettings.h
+Copyright: 2007-2008, Guillaume Castagnino <casta at xwing.info>
+           2006-2012, Gilles Caulier <caulier.gilles at gmail.com>
+           2006-2012, Marcel Wiesweg <marcel.wiesweg at gmx.de>
+License: GPL-2+
+
+Files: libkdcraw/ractionthreadbase.cpp
+       libkdcraw/ractionthreadbase.h
+       libkdcraw/ractionthreadbase_p.cpp
+       libkdcraw/ractionthreadbase_p.h
+Copyright: 2011-2012, Gilles Caulier <caulier.gilles at gmail.com>
+           2011-2012, A Janardhan Reddy <annapareddyjanardhanreddy at gmail.com>
+License: GPL-2+
+
+Files: libkdcraw/rexpanderbox.cpp
+       libkdcraw/rexpanderbox.h
+Copyright: 2008-2012, Marcel Wiesweg <marcel.wiesweg at gmx.de>
+           2010, Manuel Viet <contact at 13zenrv.fr>
+           2008-2012, Gilles Caulier <caulier.gilles at gmail.com>
+License: GPL-2+
+
+Files: libkdcraw/squeezedcombobox.cpp
+       libkdcraw/squeezedcombobox.h
+Copyright: 2008, Andi Clemens <andi.clemens at googlemail.com>
+           2006-2012, Gilles Caulier <caulier.gilles at gmail.com>
+           2005, Tom Albers <tomalbers at kde.nl>
+License: GPL-2+
+
 Files: libkdcraw/* test/raw2png.cpp
 Copyright: 2006-2011 by Gilles Caulier
            2006-2011 by Marcel Wiesweg
@@ -19,35 +63,87 @@ Copyright: 2007 David Faure <faure at kde.org>
 License: LGPL-2+
 
 Files: cmake/modules/FindKdcraw.cmake
-Copyright:
- Copyright (c) 2008-2011, Gilles Caulier, <caulier.gilles at gmail.com>
- Copyright (c) 2011, Michael G. Hansen, <mike at mghansen.de>
+Copyright: 2008-2011, Gilles Caulier <caulier.gilles at gmail.com>
+           2011, Michael G. Hansen <mike at mghansen.de>
 License: BSD-3-clause
 
-Files: debian/*
-Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-License: GPL-2+
+Files: cmake/modules/FindLCMS2.cmake
+Copyright: 2008, Adrian Page <adrian at pagenet.plus.com>
+           2009, Cyrille Berger <cberger at cberger.net>
+License: BSD-3-clause
 
 Files: libraw/*
 Copyright: 2008-2010 LibRaw LLC (http://www.libraw.org, info at libraw.org)
-License:
- LibRaw is free software; you can redistribute it and/or modify
- it under the terms of the one of three licenses as you choose:
- .
- 1. GNU LESSER GENERAL PUBLIC LICENSE version 2.1 
- (See file LICENSE.LGPL provided in LibRaw distribution archive for details).
+License: LibRaw license
+
+Files: libraw/CMakeLists.txt
+       libraw/crlf2lf.sh
+Copyright: 2006-2012, Gilles Caulier <caulier.gilles at gmail.com>
+License: GPL-2+
+
+Files: libraw/demosaic-pack-GPL2/*
+Copyright: 2009, Paul Lee
+License: GPL-2+
+
+Files: libraw/demosaic-pack-GPL2/dcraw_foveon.c
+Copyright: 1997-2012, Dave Coffin <dcoffin at cybercom.net>
+License: GPL-2+
+Comment:
+ No license is required to download and use dcraw.c.  However,
+ to lawfully redistribute dcraw, you must either (a) offer, at
+ no extra charge, full source code* for all executable files
+ containing RESTRICTED functions, (b) distribute this code under
+ the GPL Version 2 or later, (c) remove all RESTRICTED functions,
+ re-implement them, or copy them from an earlier, unrestricted
+ Revision of dcraw.c, or (d) purchase a license from the author.
  .
- 2. COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 
- (See file LICENSE.CDDL provided in LibRaw distribution archive for details).
+ The functions that process Foveon images have been RESTRICTED
+ since Revision 1.237.  All other code remains free for all uses.
  .
- 3. LibRaw Software License 27032010
- (See file LICENSE.LibRaw.pdf provided in LibRaw distribution archive for details).
+ *If you have not modified dcraw.c in any way, a link to my
+ homepage qualifies as "full source code".
+
+Files: libraw/demosaic-pack-GPL3/*
+Copyright: 2008-2010, Emil Martinec <ejmartin at uchicago.edu>
+License: GPL-3+
+
+Files: libraw/internal/dcb_demosaicing.c
+Copyright: 2010, Jacek Gozdz <cuniek at kft.umcs.lublin.pl>
+License: BSD-3-clause
+
+Files: libraw/internal/wf_filtering.cpp
+Copyright: 2011, Yan Vladimirovich
+License: LibRaw license
+
+Files: libraw/RawSpeed/*
+Copyright: 2009-2012, Klaus Post
+License: LGPL-2+
+
+Files: libraw/RawSpeed/TiffTag.h
+Copyright: 2004-2006, Novell, Inc (http://www.novell.com)
+License: MIT/X11
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
  .
- LibRaw uses code from dcraw.c -- Dave Coffin's raw photo decoder,
- dcraw.c is copyright 1997-2010 by Dave Coffin, dcoffin a cybercom o net.
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
  .
- LibRaw uses DCB demosaic and FBDD denoise licensed under BSD-like 3-clause license
- DCB and FBDD are Copyright (C) 2010,  Jacek Gozdz (cuniek at kft.umcs.lublin.pl)
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Files: debian/*
+Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
+License: GPL-2+
  
 License: GPL-2+
  This program is free software; you can redistribute it
@@ -64,6 +160,22 @@ License: GPL-2+
  On Debian systems, the full text of the GNU General Public License version 2
  can be found in the file `/usr/share/common-licenses/GPL-2'.
 
+License: GPL-3+
+ 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 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public License version 3
+ can be found in the file `/usr/share/common-licenses/GPL-3'.
 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
@@ -106,3 +218,23 @@ License: BSD-3-clause
  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: LibRaw license
+ LibRaw is free software; you can redistribute it and/or modify
+ it under the terms of the one of three licenses as you choose:
+ .
+ 1. GNU LESSER GENERAL PUBLIC LICENSE version 2.1 
+ (See file LICENSE.LGPL provided in LibRaw distribution archive for details).
+ .
+ 2. COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 
+ (See file LICENSE.CDDL provided in LibRaw distribution archive for details).
+ .
+ 3. LibRaw Software License 27032010
+ (See file LICENSE.LibRaw.pdf provided in LibRaw distribution archive for details).
+ .
+ LibRaw uses code from dcraw.c -- Dave Coffin's raw photo decoder,
+ dcraw.c is copyright 1997-2010 by Dave Coffin, dcoffin a cybercom o net.
+ .
+ LibRaw uses DCB demosaic and FBDD denoise licensed under BSD-like 3-clause license
+ DCB and FBDD are Copyright (C) 2010,  Jacek Gozdz (cuniek at kft.umcs.lublin.pl)
+

-- 
libkdcraw packaging

