[SCM] kinit packaging branch, master, updated. d01a5a8bd9940c33d6f97d403f2f5a0b37e27ae4
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Feb 24 17:12:33 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kinit.git;a=commitdiff;h=9be30ec
The following commit has been merged in the master branch:
commit 9be30ec92891958aff5de2f151a456d5e3c2c57e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Fri Jan 30 14:36:39 2015 +0100
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 119 +++++++++++++++++++++++++++++++++++++++----------------
2 files changed, 85 insertions(+), 35 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7c2e163..c997959 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kinit (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> Tue, 27 Jan 2015 16:22:52 +0100
diff --git a/debian/copyright b/debian/copyright
index a7cb3fe..8beb456 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,17 +3,11 @@ Upstream-Name: kinit
Source: https://projects.kde.org/projects/frameworks/kinit
Files: *
- debian/*
-Copyright: 1999-2001 Waldo Bastian <bastian at kde.org>
- 2001, 2006-2007 Lubos Lunak <l.lunak at kde.org>
- 1999 Mario Weilguni <mweilguni at sime.com>
- 2006-2009 David Faure <faure at kde.org>
- 2006-2011 Ralf Habacker <ralf.habacker at freenet.de>
- 2007 The ProFTPD Project
- 2007 Alex Merry <alex.merry at kdemail.net>
- 2006-2007 Thiago Macieira <thiago at kde.org>
- 2009 Patrick Spendrin <ps_ml at gmx.de>
- 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+Copyright: 2001-2007, Lubos Lunak <l.lunak at kde.org>
+ 1999, Mario Weilguni <mweilguni at sime.com>
+ 2009, Patrick Spendrin <ps_ml at gmx.de>
+ 2006-2011, Ralf Habacker <ralf.habacker at freenet.de>
+ 1999-2001, Waldo Bastian <bastian 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
@@ -29,15 +23,14 @@ License: LGPL-2
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".
+ 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/klauncher/klauncher_adaptor.cpp
src/klauncher/klauncher_adaptor.h
- src/klauncher_cmds.cpp
-Copyright: 2006, 2007 Thiago Macieira <thiago at kde.org>
- 2006-2008 David Faure <faure at kde.org>
-License: LGPL-2.1+
+Copyright: 2006-2008, David Faure <faure at kde.org>
+ 2006-2007, Thiago Macieira <thiago 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
@@ -54,27 +47,83 @@ License: LGPL-2.1+
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".
-Comment: or any later version accepted 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: src/kdeinit/proctitle.cpp
+Files: cmake/FindLibcap.cmake
+ src/kdeinit/proctitle.cpp
src/kdeinit/proctitle.h
-Copyright: 2007 The ProFTPD Project team
- 2007 Alex Merry <alex.merry at kdemail.net>
-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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+Copyright: 2014, Alex Merry <alex.merry at kde.org>
+ 2003, Damien Miller
+ 1983-1997, Eric P. Allman
+ 2014, Hrvoje Senjan <hrvoje.senjan at gmail.com>
+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 above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
.
- This package is distributed in the hope that it will be useful,
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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: src/klauncher_cmds.cpp
+Copyright: 2009, David Faure <faure 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.
+ .
+ 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 General Public License for more details.
+ 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 Lesser 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+
+ 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 General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
+ You should have received a copy of the GNU Library 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 General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-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".
--
kinit packaging
More information about the pkg-kde-commits
mailing list