[SCM] kbookmarks packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g32ca8de
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Tue May 19 12:55:46 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kbookmarks.git;a=commitdiff;h=d76c666
The following commit has been merged in the kubuntu_wily_archive branch:
commit d76c666856b47b7b4a4119105abda9ff6bab52b5
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Mar 25 13:46:55 2015 +0100
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 122 +++++++++++++++++++++++++++++++++++++++++--------------
2 files changed, 93 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1cb8d1d..7a40f9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
kbookmarks (5.8.0-1) experimental; urgency=medium
* New upstream release (5.8.0).
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Sun, 22 Mar 2015 11:39:03 +0100
diff --git a/debian/copyright b/debian/copyright
index f54ac5a..e5524be 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,23 +10,17 @@ Copyright: 2002-2003, Alexander Kellett <lypanov at kde.org>
1996-1998, Martin R. Jones <mjones at kde.org>
2008, Norbert Frese <nf2 at scheinwelt.at>
2006, Thiago Macieira <thiago at kde.org>
+ 1998, Erez Nir <erez-n at actcom.co.il>
+ 1999-2004, Free Software Foundation, Inc
+ 2004-2006, KDE Russian translation team
+ 2003-2004, KDE Team
+ 2000-2002, KDE e.v
+ 2007, KDE i18n Project for Vietnamese
+ 1999-2003, Meni Livne <livne at kde.org>
+ 2009, Rosetta Contributors and Canonical Ltd 2009
+ 2008, This_file_is_part_of_KDE
+ 2001, translate.org.za
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/kbookmarkaction.cpp
src/kbookmarkaction.h
@@ -49,33 +43,52 @@ Copyright: 2002-2003, Alexander Kellett <lypanov at kde.org>
1998-1999, Torben Weis <weis at kde.org>
License: LGPL-2+
+Files: po/ca/kbookmarks5_qt.po
+ po/ca at valencia/kbookmarks5_qt.po
+ po/uk/kbookmarks5_qt.po
+Copyright: 1998-2014, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
+
Files: tests/kbookmarkdialogtest.cpp
Copyright: 2013, David Faure <faure+bluesystems at kde.org>
License: LGPL-2+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 ) version 3 or, at the discretion of KDE e.V. ( which shall
- act as a proxy as in section 14 of the GPLv3 ), any later version.
+
+Files: COPYING.LIB
+Copyright: 1991-1999, Free Software Foundation, Inc
+License: LGPL-2.1+
+
+Files: po/bg/kbookmarks5_qt.po
+Copyright: 2010, Yasen Pramatarov <yasen at lindeas.com>
+ 2006-2009, Zlatko Popov <zlatkopopov at fsa-bg.org>
+License: GPL
+
+Files: debian/*
+Copyright: 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-2+
+
+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'.
+
+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 Lesser General Public License
+ 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",
- likewise, the complete text of the GNU Lesser General Public License version
- 3 can be found in "/usr/share/common-licenses/LGPL-3".
-
-Files: debian/*
-Copyright: 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: LGPL-2+
+ 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
@@ -95,3 +108,52 @@ License: LGPL-2+
.
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.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 St, 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+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 ) version 3 or, at the discretion of KDE e.V. ( which shall
+ act as a proxy as in section 14 of the GPLv3 ), 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 Lesser 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",
+ 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+3+KDEeV
+ This file is distributed under the license LGPL version 2.1 or
+ version 3 or later versions approved by the membership of KDE e.V.
+ .
+ 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'.
--
kbookmarks packaging
More information about the pkg-kde-commits
mailing list