[SCM] kwindowsystem packaging branch, master, updated. ec2cdf38f714e26a3b628ef2ebdea94d999362e3

Maximiliano Curia maxy at moszumanska.debian.org
Tue Feb 24 16:27:28 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwindowsystem.git;a=commitdiff;h=8b91199

The following commit has been merged in the master branch:
commit 8b91199d9e5d8998e3d71849fee7de69d2cd1bf1
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Jan 24 16:35:38 2015 +0100

    Update copyright information.
---
 debian/changelog |   1 +
 debian/copyright | 128 ++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 86 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1228e0d..07590d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ kwindowsystem (5.6.0-1~) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Update install files.
   * Update build dependencies to follow cmake.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 23 Jan 2015 21:50:51 +0100
 
diff --git a/debian/copyright b/debian/copyright
index d400c6c..3075d04 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,68 +3,87 @@ Upstream-Name: kwindowsystem
 Source: https://projects.kde.org/projects/frameworks/kwindowsystem
 
 Files: *
-       debian/*
-Copyright: © 2001-2003, 2007-2009 Lubos Lunak <l.lunak at kde.org>
-           © 2013 Martin Gräßlin <mgraesslin at kde.org>
-           © 2006, 2008 Marijn Kruisselbrink <m.kruisselbrink at student.tue.nl>
-           © 2009, 2012 David Faure <faure at kde.org>
-           © 2004 Jarosław Staniek <staniek at kde.org>
-           © 2000 Troll Tech AS
-           © 2001 Ellis Whitehead <ellis at kde.org>
-           © 1999 Matthias Ettrich <ettrich at kde.org>
-           © 2009 Marco Martin <notmart at gmail.com>
-           © 2008 Carlo Segato <brandon.ml at gmail.com>
-           © 2003 Luboš Luňák <l.lunak at kde.org>
-           © 2009 Maciej Mrozowski <reavertm at poczta.fm>
-           © 2007 Laurent Montel <montel at kde.org>
-           © 2013 Nicolás Alvarez <nicolas.alvarez at gmail.com>
-           © 2011 Pau Garcia i Quiles <pgquiles at elpauer.org>
-           © 2007 Christian Ehrlicher <ch.ehrlicher at gmx.de>
-           © 2012 Kai Dombrowe <just89 at gmx.de>
-           © 2013 Aurélien Gâteau <agateau at kde.org>
-             2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+Copyright: 2013, Aurélien Gâteau <agateau at kde.org>
+           2008, Carlo Segato <brandon.ml at gmail.com>
+           2007, Christian Ehrlicher <ch.ehrlicher at gmx.de>
+           2009-2012, David Faure <faure at kde.org>
+           2001, Ellis Whitehead <ellis at kde.org>
+           2004, Jarosław Staniek <staniek at kde.org>
+           2012, Kai Dombrowe <just89 at gmx.de>
+           2007, Laurent Montel <montel at kde.org>
+           2001-2009, Lubos Lunak <l.lunak at kde.org>
+           2009, Maciej Mrozowski <reavertm at poczta.fm>
+           2009, Marco Martin <notmart at gmail.com>
+           2006-2008, Marijn Kruisselbrink <m.kruisselbrink at student.tue.nl>
+           2013-2014, Martin Gräßlin <mgraesslin at kde.org>
+           1999, Matthias Ettrich <ettrich at kde.org>
+           2013, Nicolás Alvarez <nicolas.alvarez at gmail.com>
+           2011, Pau Garcia i Quiles <pgquiles at elpauer.org>
+           2000, Troll Tech AS
 License: LGPL-2+
+
+Files: autotests/kwindowinfox11test.cpp
+       autotests/kwindowsystem_threadtest.cpp
+       autotests/nettesthelper.h
+       src/kwindoweffects.cpp
+       src/kwindoweffects_p.h
+       src/kwindowinfo.cpp
+       src/kwindowinfo_p.h
+       src/kwindowinfo_p_x11.h
+       src/kwindowsystem.cpp
+       src/kwindowsystem_p.h
+       src/kwindowsystem_p_x11.h
+Copyright: 2014, Aaron Seigo <aseigo at kde.org>
+           2013-2014, Martin Gräßlin <mgraesslin 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 Library General Public
+ 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) any later version.
+ version 2.1 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 6 of version 3 of the license.
  .
  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.
+ Lesser 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".
+ 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 License version 3 can be found in
+ "/usr/share/common-licenses/LGPL-3".
 
-Files: autotests/nettesthelper.h
-Copyright: 2013 Martin Gräßlin <mgraesslin at kde.org>
-License: LGPL-2.1+ accepted by the membership of KDE e.V.
- 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) 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 6 of version 3 of the license.
+Files: autotests/fixx11h_test.cpp
+       autotests/fixx11h_test2.cpp
+Copyright: 2009, David Faure <faure at kde.org>
+           2009, Maciej Mrozowski <reavertm at poczta.fm>
+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
- Lesser General Public License for more details.
+ Library General Public License for more details.
  .
- You should have received a copy of the GNU Library General Public License
+ 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".
+ 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 License version 3 can
+ be found in "/usr/share/common-licenses/LGPL-3".
 
 Files: src/fixx11h.h
        src/kselectionowner.cpp
@@ -81,10 +100,10 @@ Files: src/fixx11h.h
        src/netwm.h
        src/netwm_def.h
        src/netwm_p.h
-Copyright: 2001-2003 Lubos Lunak <l.lunak at kde.org>
-           2012 David Faure <faure at kde.org>
-           2000 Troll Tech AS
-License: MIT
+Copyright: 2012, David Faure <faure at kde.org>
+           2001-2003, Lubos Lunak <l.lunak at kde.org>
+           2000, Troll Tech AS
+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
@@ -105,3 +124,26 @@ License: MIT
  WHETHER 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: debian/*
+Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-2+
+
+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".

-- 
kwindowsystem packaging



More information about the pkg-kde-commits mailing list