[SCM] libkscreen packaging branch, master, updated. 2c7935aecf54363a98fc9929f7f6a1f44317bf0c
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Mar 21 15:57:45 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/libkscreen.git;a=commitdiff;h=3296e9b
The following commit has been merged in the master branch:
commit 3296e9b623a54335ab6c69e20b0328db498872b0
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Mon Feb 9 17:00:10 2015 +0100
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 119 +++++++++++++++++++++----------------------------------
2 files changed, 46 insertions(+), 74 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 84fed77..b420452 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libkscreen (4:5.2.0-1~) UNRELEASED; urgency=medium
* Bump Standards-Version to 3.9.6, no changes needed.
* Update build dependencies to build against experimental and to
follow cmake.
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Mon, 09 Feb 2015 16:29:21 +0100
diff --git a/debian/copyright b/debian/copyright
index 157610b..162a1fe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,37 +1,42 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: libkscreen2
-Source: ftp://ftp.kde.org/pub/kde/unstable/plasma/
+Upstream-Name: libkscreen
+Source: git://anongit.kde.org/libkscreen
Files: *
-Copyright: © 2012-2014 Alejandro Fiestas Olivares <afiestas at kde.org>
- © 2012-2013 Daniel Vrátil <dvratil at redhat.com>
- © 2012 Daniel Nicoletti <dantti12 at gmail.com>
- © 2012 Fredrik Höglund <fredrik at kde.org>
- © 2007 Matthias Kretz <kretz at kde.org>
- © 2008 Helio Chissini de Castro <helio at kde.org>
- © 2012-2013 Martin Gräßlin <mgraesslin at kde.org>
- © 2003 Lubos Lunak <l.lunak at kde.org>
+Copyright: 2012-2014, Alejandro Fiestas Olivares <afiestas at kde.org>
+ 2012, Daniel Nicoletti <dantti12 at gmail.com>
+ 2012-2014, Daniel Vrátil <dvratil at redhat.com>
+ 2012-2014, Sebastian Kügler <sebas 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.
+
+Files: COPYING
+ COPYING.LIB
+ backends/xrandr1.1/wrapper.h
+ tests/testplugandplay.cpp
+Copyright: 1989-1991, Free Software Foundation, Inc
+ 2012-2013, Martin Gräßlin <mgraesslin at kde.org>
+ 2014, Sebastian Kügler <sebas at kde.org>
+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 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,
+ 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
- Lesser General Public License for more details.
+ 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 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
+ 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 Lesser General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2.1".
+ 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: backends/xrandr1.1/fixx11h.h
-Copyright: 2003 Lubos Lunak <l.lunak at kde.org>
-License: MIT
+Copyright: 2003, Lubos Lunak <l.lunak at kde.org>
+License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
@@ -49,58 +54,24 @@ License: MIT
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Files: cmake/modules/*
-Copyright: 2012 Fredrik Höglund <fredrik at kde.org>
- 2008 Helio Chissini de Castro <helio at kde.org>
- 2007 Matthias Kretz <kretz at kde.org>
-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 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: debian/*
+Copyright: 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-2.1+
-Files: backends/xrandr1.1/wrapper.h
- tests/*
- debian/*
-Copyright: 2012, 2013 Martin Gräßlin <mgraesslin at kde.org>
- 2013 by Alejandro Fiestas Olivares <afiestas at kde.org>
- 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: GPL-2.0+
- 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.
+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 package is distributed in the hope that it will be useful,
+ 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
+ Lesser 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 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 General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ 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".
--
libkscreen packaging
More information about the pkg-kde-commits
mailing list