Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcodecs.git;a=commitdiff;h=0a0751f
The following commit has been merged in the master branch:
commit 0a0751fd7565c325d19bbe6e2af6bb22a6ad146b
Author: Harald Sitter <sitter at kde.org>
Date: Fri Sep 23 15:14:10 2016 +0200
drop excess delta with debian
---
debian/copyright | 106 +++++++++++++++++++++++--------------------------------
1 file changed, 45 insertions(+), 61 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index e706af9..b8c8a56 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,14 +26,9 @@ Copyright: 1999, Lars Knoll <knoll at kde.org>
2001, translate.org.za
License: LGPL-2+
-Files: COPYING
- autotests/kcharsetstest.cpp
- autotests/kcharsetstest.h
- autotests/kencodingprobertest.cpp
- autotests/kencodingprobertest.h
-Copyright: 1989-1991, Free Software Foundation, Inc
+Files: autotests/*
+Copyright: 2011, Romain Perier <bambi at kubuntu.org>
2012, Ni Hui <shuizhuyuanluo at 126.com>
- 2011, Romain Perier <bambi at kubuntu.org>
License: GPL-2+
Files: src/probers/*
@@ -64,6 +59,16 @@ Copyright: 2014, Daniel Vrátil <dvratil at redhat.com>
1996-1999, Ronald Tschalär
License: LGPL-2
+Files: COPYING
+ autotests/kcharsetstest.cpp
+ autotests/kcharsetstest.h
+ autotests/kencodingprobertest.cpp
+ autotests/kencodingprobertest.h
+Copyright: 1989-1991, Free Software Foundation, Inc
+ 2012, Ni Hui <shuizhuyuanluo at 126.com>
+ 2011, Romain Perier <bambi at kubuntu.org>
+License: GPL-2+
+
Files: po/ca/kcodecs5_qt.po
po/ca at valencia/kcodecs5_qt.po
po/uk/kcodecs5_qt.po
@@ -74,41 +79,6 @@ Files: src/probers/nsSJISProber.h
src/probers/nsSBCSGroupProber.h
Copyright: 2001, Netscape Communications Corporation
License: MPL-1.1 or GPL-2+ or LGPL-2.1+
-
-Files: po/bg/kcodecs5_qt.po
-Copyright: 2009-2013, Yasen Pramatarov <yasen at lindeas.com>
- 2006-2009, Zlatko Popov <zlatkopopov at fsa-bg.org>
-License: GPL
- This file is licensed under the GPL.
- .
- On Debian systems, the complete text of the GNU General Public License can be
- found in `/usr/share/common-licenses/GPL'.
-
-Files: debian/*
-Copyright: 2014, Rohan Garg <rohangarg at kubuntu.org>
-License: LGPL-2+
-
-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
- 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:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- 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.
-
-License: MPL-1.1
***** BEGIN LICENSE BLOCK *****
Version: MPL 1.1/GPL 2.0/LGPL 2.1
.
@@ -146,6 +116,39 @@ License: MPL-1.1
.
***** END LICENSE BLOCK *****
+Files: po/bg/kcodecs5_qt.po
+Copyright: 2009-2013, Yasen Pramatarov <yasen at lindeas.com>
+ 2006-2009, Zlatko Popov <zlatkopopov at fsa-bg.org>
+License: GPL
+ This file is licensed under the GPL.
+ .
+ On Debian systems, the complete text of the GNU General Public License can be
+ found in `/usr/share/common-licenses/GPL'.
+
+Files: debian/*
+Copyright: 2014, Rohan Garg <rohangarg at kubuntu.org>
+License: LGPL-2+
+
+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
+ 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:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ 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.
+
License: GPL-2+
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -205,22 +208,3 @@ License: LGPL-2.1+3+KDEeV
version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1', likewise,
the complete text of the GNU Lesser General Public License version 3 can be
found in `/usr/share/common-licenses/LGPL-3'.
-
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library 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
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- .
- 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
--
kcodecs packaging