[SCM] ksysguard packaging branch, master, updated. 3c762f355ead6a7510c9f13555ed1e0ae1d784b6
Maximiliano Curia
maxy at moszumanska.debian.org
Sun Jul 5 06:29:34 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/ksysguard.git;a=commitdiff;h=7f2dca0
The following commit has been merged in the master branch:
commit 7f2dca0cbf5f0d4eb19a8ab272570ca69030c414
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Thu Jul 2 22:28:09 2015 +0200
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 196 +++++++++++++++++++++++++++++++++++++++----------------
2 files changed, 140 insertions(+), 57 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e1919e0..92753d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ksysguard (4:5.3.2-1) unstable; urgency=medium
* New upstream release (5.3.0).
* New upstream release (5.3.1).
* New upstream release (5.3.2).
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Wed, 01 Jul 2015 11:24:03 +0200
diff --git a/debian/copyright b/debian/copyright
index e82f76a..5538f1d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,10 +13,19 @@ Copyright: 1999-2001, Chris Schlaeger <cs at kde.org>
2001-2006, Tobias Koenig <tokoe at kde.org>
1989-1992, William LeFebvre, Northwestern University
1984-1989, William LeFebvre, Rice University
+ 2000-2015, Free Software Foundation, Inc
+ 2004-2009, K Desktop Environment
+ 2005, KDE Russian translation team
+ 2002-2004, KDE Team
+ 2000-2002, KDE e.v
+ 2007, KDE i18n Project for Vietnamese
+ 2000-2002, Meni Livne <livne at kde.org>
+ 2009, Rosetta Contributors and Canonical Ltd 2009
+ 2002-2011, This_file_is_part_of_KDE
+ 2001, translate.org.za
License: GPL-2+
-Files: gui/SensorDisplayLib/ProcessController.cpp
- ksysguardd/FreeBSD/netdev.c
+Files: ksysguardd/FreeBSD/netdev.c
ksysguardd/FreeBSD/netdev.h
ksysguardd/Irix/LoadAvg.c
ksysguardd/Irix/Memory.c
@@ -72,26 +81,10 @@ Files: gui/SensorDisplayLib/ProcessController.cpp
ksysguardd/ksysguardd.h
ksysguardd/modules.h
Copyright: 1999-2003, Chris Schlaeger <cs at kde.org>
- 2006, John Tapsell <john.tapsell at kde.org>
2005, Sirtaj Singh Kang <taj at kde.org> -- Battery fixes and Thermal
2003, Stephan Uhlmann <su at su2.info>
2001-2003, Tobias Koenig <tokoe at kde.org>
License: GPL-2
- This program is free software; you can redistribute it and/or
- modify it under the terms of version 2 of the GNU General Public
- License as published by the Free Software Foundation.
- .
- 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, 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".
Files: gui/HostConnector.cpp
gui/HostConnector.h
@@ -128,24 +121,18 @@ Copyright: 1999-2002, Chris Schlaeger <cs at kde.org>
2006, John Tapsell <tapsell at kde.org>
2001, Tobias Koenig <tokoe 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 version 2 or at your option version 3 as published by
- the Free Software Foundation.
- .
- 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, 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", likewise, the
- complete text of the GNU General Public License version 3 can be found in
- "/usr/share/common-licenses/GPL-3".
+
+Files: doc/ca/index.docbook
+ doc/de/index.docbook
+ doc/en/index.docbook
+ doc/en_US/index.docbook
+ doc/it/index.docbook
+ doc/nl/index.docbook
+ doc/pt_BR/index.docbook
+ doc/sv/index.docbook
+ doc/uk/index.docbook
+Copyright: 2000, Chris.Schlaeger
+License: GFDL-1.2+
Files: gui/ksortfilterproxymodel.cpp
gui/ksortfilterproxymodel.h
@@ -155,27 +142,27 @@ Copyright: 2009, John Tapsell <tapsell at kde.org>
2007-2008, Omat Holding B.V <info at omat.nl>
2002, Tobias Koenig <tokoe at kde.org>
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".
+
+Files: po/ca/ksysguard.po
+ po/uk/ksysguard.po
+Copyright: 2000-2015, This_file_is_part_of_KDE
+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'.
+
+Files: gui/SensorDisplayLib/ProcessController.cpp
+Copyright: 1999-2001, Chris Schlaeger <cs at kde.org>
+ 2006, John Tapsell <john.tapsell at kde.org>
+License: GPL-2+3
Files: ksysguardd/FreeBSD/stat.c
Copyright: 2011, David Naylor <naylor.b.david at gmail.com>
-License: BSD-3-clause or GPL-2+
+License: BSD-3-clause_and_GPL-2+
Copyright (c) 2011 David Naylor <naylor.b.david at gmail.com>
.
This program is free software; you can redistribute it and/or
@@ -221,14 +208,51 @@ License: BSD-3-clause or GPL-2+
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
- .
+ --
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'.
+
+Files: po/bg/ksysguard.po
+Copyright: 2009-2011, 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, Scarlett Clark <scarlett at scarlettgatelyclark.com>
License: GPL-2+
+License: GFDL-1.2+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+ --
+ On Debian systems, the complete text of the GNU Free Documentation License
+ version 1.2 can be found in `/usr/share/common-licenses/GFDL-1.2'.
+
+License: GPL-2
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of version 2 of the GNU General Public
+ License as published by the Free Software Foundation.
+ .
+ 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, 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+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -242,6 +266,64 @@ License: GPL-2+
.
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'.
+
+License: GPL-2+3
+ 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; version 2 of
+ the License, or (at your option) version 3.
+ .
+ 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'.
+
+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 version 2 or at your option version 3 as published by
+ the Free Software Foundation.
+ .
+ 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, 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".
+ 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'.
+
+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'.
--
ksysguard packaging
More information about the pkg-kde-commits
mailing list