[SCM] baloo packaging branch, master, updated. 1391c65420aad7cd4db13efb6fd89e51131acb37
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jul 1 12:18:34 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/baloo.git;a=commitdiff;h=1391c65
The following commit has been merged in the master branch:
commit 1391c65420aad7cd4db13efb6fd89e51131acb37
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Jul 1 10:22:16 2015 +0200
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 176 +++++++++++++++++++++++++++++++------------------------
2 files changed, 99 insertions(+), 78 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9a99560..24342de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ baloo-kf5 (5.9.2-1) unstable; urgency=medium
* New upstream release (5.9.0).
* New upstream release (5.9.1).
* New upstream release (5.9.2).
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Wed, 01 Jul 2015 09:23:52 +0200
diff --git a/debian/copyright b/debian/copyright
index 0fd0563..33dc030 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,29 +6,15 @@ Files: *
Copyright: 2013, David Edmundson <davidedmundson at kde.org>
2010-2011, Sebastian Trueg <trueg at kde.org>
2013, Simeon Bird <bladud at gmail.com>
+ 2013-2015, This_file_is_part_of_KDE
2010-2014, Vishesh Handa <handa.vish at gmail.com>
+ 2012-2014, Vishesh Handa <me at vhanda.in>
2013-2014, Vishesh Handa <vhanda at kde.org>
+ 2008-2014, Free Software Foundation, Inc
+ 2010, Rosetta Contributors and Canonical Ltd 2010
+ 2015, Rosetta Contributors and Canonical Ltd 2015
+ 2008-2015, This_file_is_part_of_KDE
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.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 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/>.
- .
- 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", likewise,
- the complete text of the GNU Lesser General Public License version 3 can be
- found in "/usr/share/common-licenses/LGPL-3".
Files: COPYING.LIB
src/file/autotests/basicindexingjobtest.cpp
@@ -98,24 +84,9 @@ Copyright: 2014, David Faure <faure at kde.org>
1991-1999, Free Software Foundation, Inc
2014, Pinak Ahuja <pinak.ahuja at gmail.com>
2014, Raphael Kubo da Costa <rakuco at FreeBSD.org>
+ 2012-2014, Vishesh Handa <me at vhanda.in>
2014, Vishesh Handa <vhanda at kde.org>
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".
Files: src/file/eventmonitor.cpp
src/file/eventmonitor.h
@@ -137,23 +108,8 @@ Files: src/file/eventmonitor.cpp
Copyright: 2006-2007, Jos van den Oever <jos at vandenoever.info>
2007-2011, Sebastian Trueg <trueg at kde.org>
2010-2014, Vishesh Handa <handa.vish at gmail.com>
+ 2010-2014, Vishesh Handa <me at vhanda.in>
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 version 2 as published by the Free Software Foundation.
- .
- 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".
Files: src/file/kinotify.cpp
src/file/kinotify.h
@@ -171,33 +127,21 @@ Files: src/file/autotests/kinotifytest.cpp
src/tools/balooctl/main.cpp
src/tools/balooshow/main.cpp
Copyright: 2009-2010, Sebastian Trueg <trueg at kde.org>
+ 2012-2013, Vishesh Handa <me at vhanda.in>
2014, Vishesh Handa <vhanda at kde.org>
License: GPL-2+3+KDEeV
- 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 2 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 14 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.
- .
- 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 complete text of the GNU General Public License
- version 2 can be found in "/usr/share/common-licenses/GPL-2", likewise, the
- complete text of the GNU General Public License version 3 can be found in
- "/usr/share/common-licenses/GPL-3".
Files: COPYING
src/kioslaves/search/kio_search.cpp
Copyright: 1989-1991, Free Software Foundation, Inc
2008-2010, Sebastian Trueg <trueg at kde.org>
+ 2012-2014, Vishesh Handa <me at vhanda.in>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-2+
+
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 published by
@@ -212,13 +156,49 @@ License: GPL-2+
You should have received a copy of the GNU General Public License
along with this program; 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 General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-2+3+KDEeV
+ 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 2 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 14 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.
+ .
+ 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 complete text of the GNU General Public License
- version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ version 2 can be found in `/usr/share/common-licenses/GPL-2', likewise, the
+ complete text of the GNU General Public License version 3 can be found in
+ `/usr/share/common-licenses/GPL-3'.
-Files: debian/*
-Copyright: 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: LGPL-2+
+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 version 2 as published by the Free Software Foundation.
+ .
+ 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'.
License: LGPL-2+
This library is free software; you can redistribute it and/or
@@ -235,6 +215,46 @@ License: LGPL-2+
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".
+ License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
+
+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'.
+
+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.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 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/>.
+ --
+ 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', likewise,
+ the complete text of the GNU Lesser General Public License version 3 can be
+ found in `/usr/share/common-licenses/LGPL-3'.
--
baloo packaging
More information about the pkg-kde-commits
mailing list