[SCM] kfilemetadata packaging branch, master, updated. 1dd5ba2fe36fc4e96f27425709bbc2bb29a2bdb2
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Feb 7 11:17:33 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kfilemetadata.git;a=commitdiff;h=b2c1db8
The following commit has been merged in the master branch:
commit b2c1db8c8e26151543b9d2a607d527ce3b55a6ec
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sat Feb 7 09:11:31 2015 +0100
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 130 +++++++++++++++++++++++++++++++++----------------------
2 files changed, 79 insertions(+), 52 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 93ebdb6..d16293e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ kfilemetadata-kf5 (5.6.0-1~) UNRELEASED; urgency=medium
* Update build dependencies to build against experimental and to
follow cmake.
* Bump Standards-Version to 3.9.6, no changes needed.
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Fri, 06 Feb 2015 23:43:16 +0100
diff --git a/debian/copyright b/debian/copyright
index a01900f..6e740f1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,44 +3,90 @@ Upstream-Name: kfilemetadata
Source: git://anongit.kde.org/kfilemetadata
Files: *
-Copyright: © 2012-2014 Vishesh Handa <me at vhanda.in>
- © 2013 David Edmundson <davidedmundson at kde.org>
- © 2012 Jörg Ehrichs <joerg.ehrichs at gmx.de>
- © 2013 Denis Steckelmacher <steckdenis at yahoo.fr>
- © 2011 Tirtha Chatterjee <tirtha.p.chatterjee at gmail.com>
- © 2008 Pino Toscano <pino at kde.org>
- © 2006 Wilfried Huss <wilfried.huss at gmx.at>
- © 2010 Evgeny Egorochkin <phreedom.stdin at gmail.com>
- © 2008 Jakub Stachowski <qbast at go2.pl>
+Copyright: 2013, Denis Steckelmacher <steckdenis at yahoo.fr>
+ 2010, Evgeny Egorochkin <phreedom.stdin at gmail.com>
+ 2008, Jakub Stachowski <qbast at go2.pl>
+ 2009, Jos van den Oever <jos at vandenoever.info>
+ 2012, Jörg Ehrichs <joerg.ehrichs at gmx.de>
+ 2007, Montel Laurent <montel at kde.org>
+ 2014, Nick Shaforostoff <shaforostoff at gmail.com>
+ 2014, Raphael Kubo da Costa <rakuco at FreeBSD.org>
+ 2011, Tirtha Chatterjee <tirtha.p.chatterjee at gmail.com>
License: LGPL-2.1+
-Files: src/kfilemetadata_export.h
-Copyright: © 2007 David Faure <faure at kde.org>
-License: LGPL-2
-
-Files: debian/*
-Copyright: Rohan Garg <rohangarg at kubuntu.org>
-License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
+Files: autotests/indexerextractortests.cpp
+ autotests/indexerextractortests.h
+ autotests/indexerextractortestsconfig.h.in
+ src/extractionresult.cpp
+ src/extractionresult.h
+ src/propertyinfo.cpp
+ src/propertyinfo.h
+ tests/dump.cpp
+Copyright: 2013, David Edmundson <davidedmundson at kde.org>
+License: LGPL-2.1+3+KDEeV
+ 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 of the License, or (at your option) any later
- version.
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
.
- 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.
+ 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, see <http://www.gnu.org/licenses/>.
.
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
+ On Debian systems, the full text of the GNU Lesser General Public License
+ version 2.1 can be found in the file "/usr/share/common-licenses/LGPL-2.1",
+ likewise, the full text of the GNU Lesser General Public License version 3
+ can be found in the file "/usr/share/common-licenses/LGPL-3".
+
+Files: COPYING-CMAKE-SCRIPTS
+ cmake/FindEPub.cmake
+ cmake/FindExiv2.cmake
+ cmake/FindFFmpeg.cmake
+ cmake/FindLibraryWithDebug.cmake
+ cmake/FindPopplerQt5.cmake
+ cmake/FindTaglib.cmake
+Copyright: 2008-2010, Alexander Neundorf <neundorf at kde.org>
+ 2007, Christian Ehrlicher <ch.ehrlicher at gmx.de>
+ 2008, Gilles Caulier <caulier.gilles at gmail.com>
+ 2006, Laurent Montel <montel at kde.org>
+ 2006, Matthias Kretz <kretz at kde.org>
+ 2011, Michael Jansen <kde at michael-jansen.biz>
+ 2008, Pino Toscano <pino at kde.org>
+ 2006, Wilfried Huss <wilfried.huss at gmx.at>
+License: BSD-3-clause
+ 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 copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
.
- 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'.
+ 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.
+
+Files: debian/*
+Copyright: 2014-2015, Rohan Garg <rohangarg at kubuntu.org>
+License: LGPL-2.1+
License: LGPL-2.1+
This library is free software; you can redistribute it and/or
@@ -60,23 +106,3 @@ License: LGPL-2.1+
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
-
-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
- License as published by the Free Software Foundation; either
- version 2 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
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. 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 Library General Public License version 2 can be found in
- /usr/share/common-licenses/LGPL-2
--
kfilemetadata packaging
More information about the pkg-kde-commits
mailing list