[SCM] libksysguard packaging branch, master, updated. cf05206d4784eba027073c51323699e2c5fb75da
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jun 30 22:24:39 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/libksysguard.git;a=commitdiff;h=c2a6024
The following commit has been merged in the master branch:
commit c2a60249fc44e6ab4772a22d339cddf86df97a84
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Jun 30 17:03:52 2015 +0200
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 75 ++++++++++++++++++++++++++++++++++++++++----------------
2 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1666306..d24fa50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libksysguard (4:5.3.2-1~) UNRELEASED; urgency=medium
* New upstream release (5.3.2).
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Tue, 30 Jun 2015 12:26:37 +0200
diff --git a/debian/copyright b/debian/copyright
index 0926786..84cf743 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,7 @@ Files: *
Copyright: 2007, Adriaan de Groot <groot at kde.org>
2010, Alex Hornung <ahornung at gmail.com>
1999-2001, Chris Schlaeger <cs at kde.org>
+ 2014-2015, Gregor Mi <codestruct at posteo.org>
2014, Hrvoje Senjan <hrvoje.senjan at gmail.com>
2006-2009, John Tapsell <john.tapsell at kde.org>
2006, John Tapsell <john.tapsell at kdemail.net>
@@ -14,6 +15,14 @@ Copyright: 2007, Adriaan de Groot <groot at kde.org>
2007, Mark Davies <mark at mcs.vuw.ac.nz>
2009, Pino Toscano <pino at kde.org>
2007, Trent Waddington <trent.waddington at gmail.com>
+ 2006, Dean Edwards
+ 2007-2014, Free Software Foundation
+ 2009-2014, Free Software Foundation Inc
+ 2002-2008, Free Software Foundation, Inc
+ 2008-2009, K Desktop Environment
+ 2009, Rosetta Contributors and Canonical Ltd 2009
+ 2010, Rosetta Contributors and Canonical Ltd 2010
+ 2007-2015, This_file_is_part_of_KDE
License: LGPL-2+
Files: ksgrd/SensorAgent.cpp
@@ -33,26 +42,28 @@ Files: ksgrd/SensorAgent.cpp
Copyright: 1999-2001, Chris Schlaeger <cs at kde.org>
2006-2009, John Tapsell <tapsell 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: po/ca/ksgrd.po
+ po/ca/ksysguardlsofwidgets.po
+ po/ca/processcore.po
+ po/ca/processui.po
+ po/ca at valencia/ksgrd.po
+ po/ca at valencia/ksysguardlsofwidgets.po
+ po/ca at valencia/processcore.po
+ po/ca at valencia/processui.po
+ po/uk/ksgrd.po
+ po/uk/ksysguardlsofwidgets.po
+ po/uk/processcore.po
+ po/uk/processui.po
+Copyright: 2007-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: COPYING
processcore/atop_p.h
@@ -75,7 +86,7 @@ License: GPL-2+
version 2 can be found in "/usr/share/common-licenses/GPL-2".
Files: scripts/smaps/sorttable.js
-Copyright: 2007 Stuart Langridge
+Copyright: 2007, Stuart Langridge
License: MIT
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -98,6 +109,28 @@ Files: debian/*
Copyright: 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
License: LGPL-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', 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
--
libksysguard packaging
More information about the pkg-kde-commits
mailing list