[SCM] kcodecs packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-gfdd9501
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Tue May 19 12:55:57 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcodecs.git;a=commitdiff;h=19a6ceb
The following commit has been merged in the kubuntu_wily_archive branch:
commit 19a6cebfd8d50d3eab3ad0332cb116f92f413977
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Thu Jan 22 17:56:03 2015 +0100
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 116 +++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 92 insertions(+), 25 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7ce7226..7cda8bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ kcodecs (5.6.0-1~) UNRELEASED; urgency=medium
* Bump Standards-Version to 3.9.6, no changes needed.
* Update install files.
* Update build dependencies to follow cmake.
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Thu, 22 Jan 2015 16:55:48 +0100
diff --git a/debian/copyright b/debian/copyright
index e5aa762..82022e2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,9 +21,10 @@ License: GPL-2+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Files: src/probers/*
-Copyright: © 1998,2008 <developer at mozilla.org>
- © 2008 <wkai at gmail.com>
-License: MIT/X11
+Copyright: 1998-2008, <developer at mozilla.org>
+ 2008, <wkai at gmail.com>
+ 2008, <zealot.kai at gmail.com>
+License: Expat
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
@@ -43,33 +44,98 @@ License: MIT/X11
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: src/kcharsets.cpp
-Copyright: © 1999 Lars Knoll <knoll at kde.org>
- © 2001, 2003, 2004, 2005, 2006 Nicolas GOUTTE <goutte at kde.org>
- © 2007 Nick Shaforostoff <shafff at ukr.net>
-License: LGPL-2+
+Files: autotests/kcodecstest.cpp
+ autotests/kcodecstest.h
+ autotests/kemailaddresstest.cpp
+ autotests/kemailaddresstest.h
+ autotests/rfc2047test.cpp
+ autotests/rfc2047test.h
+ src/kcodecs.cpp
+ src/kcodecs.h
+ src/kcodecs_p.h
+Copyright: 2014, Daniel Vrátil <dvratil at redhat.com>
+ 2004, David Faure <faure at kde.org>
+ 2000-2001, Dawit Alemayehu <adawit at kde.org>
+ 2001-2002, Marc Mutz <mutz at kde.org>
+ 2001, Rik Hemsley (rikkus) <rik at kde.org>
+ 2009, Thomas McGuire <mcguire at kde.org>
+ 2006, Volker Krause <vkrause at kde.org>
+ 2001, Rik Hemsley <rik at kde.org>
+ 1991-1992, RSA Data Security Inc.
+ 1995, Mordechai T. Abzug
+ 1996-1999, Ronald Tschalär
+License: LGPL-2
-Files: src/kcodecs.*
- src/probers/nsSJISProber.h
+Files: src/probers/nsSJISProber.h
src/probers/nsSBCSGroupProber.h
-Copyright:
- © 1998 <developer at mozilla.org>
- © 2001 Shy Shalom <shooshX at gmail.com>
- © 2000-2001 Dawit Alemayehu <adawit at kde.org>
- © 2001 Rik Hemsley <rik at kde.org>
- © 1991 RSA Data Security Inc. Created
- © 1991 All Rights Reserved.
- © 2000-2001 Dawit Alemayehu <adawit at kde.org>
-License: LGPL-2
+Copyright: 2001, Netscape Communications Corporation
+License: MPL-1.1 or GPL-2+ or LGPL-2.1+
+ ***** BEGIN LICENSE BLOCK *****
+ Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ .
+ The contents of this file are subject to the Mozilla Public License Version
+ 1.1 (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+ .
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the
+ License.
+ .
+ The Original Code is Mozilla Universal charset detector code.
+ .
+ The Initial Developer of the Original Code is
+ Netscape Communications Corporation.
+ Portions created by the Initial Developer are Copyright (C) 2001
+ the Initial Developer. All Rights Reserved.
+ .
+ Contributor(s):
+ Shy Shalom <shooshX at gmail.com>
+ .
+ Alternatively, the contents of this file may be used under the terms of
+ either the GNU General Public License Version 2 or later (the "GPL"), or
+ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ in which case the provisions of the GPL or the LGPL are applicable instead
+ of those above. If you wish to allow use of your version of this file only
+ under the terms of either the GPL or the LGPL, and not to allow others to
+ use your version of this file under the terms of the MPL, indicate your
+ decision by deleting the provisions above and replace them with the notice
+ and other provisions required by the GPL or the LGPL. If you do not delete
+ the provisions above, a recipient may use your version of this file under
+ the terms of any one of the MPL, the GPL or the LGPL.
+ .
+ ***** END LICENSE BLOCK *****
-Files: src/kencodingprober.*
- src/kentities.c
+Files: autotests/base64benchmark.cpp
+ autotests/codectest.cpp
+ autotests/codectest.h
+ src/kcharsets.cpp
src/kcharsets.h
+ src/kcodecsbase64.cpp
+ src/kcodecsbase64.h
+ src/kcodecsidentity.cpp
+ src/kcodecsidentity.h
+ src/kcodecsqp.cpp
+ src/kcodecsqp.h
+ src/kcodecsuuencode.cpp
+ src/kcodecsuuencode.h
+ src/kemailaddress.cpp
+ src/kemailaddress.h
+ src/kencodingprober.cpp
+ src/kencodingprober.h
+ src/kentities.c
debian/*
-Copyright: © 2008 Wang Hoi <zealot.hoi at gmail.com>
- © 1999 Lars Knoll <knoll at mpi-hd.mpg.de>
- © 1999 Lars Knoll <knoll at kde.org>
- 2014 Rohan Garg <rohangarg at kubuntu.org>
+Copyright: 1999, Lars Knoll <knoll at kde.org>
+ 1999, Lars Knoll <knoll at mpi-hd.mpg.de>
+ 2001-2004, Marc Mutz <mutz at kde.org>
+ 2004, Matt Douhan <matt at fruitsalad.org>
+ 2007, Nick Shaforostoff <shafff at ukr.net>
+ 2001-2006, Nicolas GOUTTE <goutte at kde.org>
+ 2010, Thomas McGuire <mcguire at kde.org>
+ 2010, Volker Krause <vkrause at kde.org>
+ 2008, Wang Hoi <zealot.hoi at gmail.com>
+ 2014, Rohan Garg <rohangarg at kubuntu.org>
License: LGPL-2+
License: LGPL-2+
--
kcodecs packaging
More information about the pkg-kde-commits
mailing list