[SCM] kjobwidgets packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-3-g169af92

Kubuntu CI (Harald Sitter) kubuntu-ci-guest at moszumanska.debian.org
Wed May 20 00:02:11 UTC 2015


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

The following commit has been merged in the kubuntu_unstable branch:
commit ab7ec9105ce347f85651774e8a44fff59f91f167
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Jan 26 11:37:16 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 94 ++++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 61 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8f042c..dcdf6ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kjobwidgets (5.6.0-1~) UNRELEASED; urgency=medium
   * Update install files.
   * Update watch file.
   * Update build dependencies to follow cmake.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 26 Jan 2015 11:14:57 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 0ec07fc..ffaae45 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,17 +3,17 @@ Upstream-Name: kjobwidgets
 Source: https://projects.kde.org/projects/frameworks/kjobwidgets
 
 Files: *
-Copyright: © 2006-2008 Kevin Ottens <ervin at kde.org>
-           © 2006-2008 Rafael Fernández López <ereslibre at kde.org>
-           © 2000 Matej Koss <koss at miesto.sk>
-           © 2000, 2013 David Faure <faure at kde.org>
-           © 1997, 2000-2001 Stephan Kulow <coolo at kde.org>
-           © 2009 Shaun Reich <shaun.reich at kdemail.net>
-           © 2007 Bernhard Loos <nhuh.put at web.de>
-           © 1999-2002 Hans Petter Bieker <bieker at kde.org>
-           © 2009-2010 John Layt <john at layt.net>
-           © 2002 Lukas Tinkl <lukas at kde.org>
-           © 1999 Preston Brown <pbrown at kde.org>
+Copyright: 2007, Bernhard Loos <nhuh.put at web.de>
+           2000,2013, David Faure <faure at kde.org>
+           1999-2002, Hans Petter Bieker <bieker at kde.org>
+           2009-2010, John Layt <john at layt.net>
+           2007, Kevin Ottens <ervin at kde.org>
+           2002, Lukas Tinkl <lukas at kde.org>
+           2000, Matej Koss <koss at miesto.sk>
+           1999, Preston Brown <pbrown at kde.org>
+           2007-2008, Rafael Fernández López <ereslibre at kde.org>
+           2009, Shaun Reich <shaun.reich at kdemail.net>
+           1997-2001, Stephan Kulow <coolo 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
@@ -34,49 +34,75 @@ License: LGPL-2
 
 Files: src/kdialogjobuidelegate.cpp
        src/kdialogjobuidelegate.h
-       src/kjobwidgets.cpp
-       src/kjobwidgets.h
        src/kuiserverjobtracker_p.h
-       debian/*
-Copyright: 2000 Stephan Kulow <coolo at kde.org>
-           2000, 2013 David Faure <faure at kde.org>
-           2006,2007 Kevin Ottens <ervin at kde.org>
-           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+Copyright: 2000, 2013 David Faure <faure at kde.org>
+           2006-2007, Kevin Ottens <ervin at kde.org>
+           2000, Matej Koss <koss at miesto.sk>
+           2006-2008, Rafael Fernández López <ereslibre at kde.org>
+           2000, Stephan Kulow <coolo 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.
+
+Files: src/kjobwidgets.cpp
+       src/kjobwidgets.h
+Copyright: 2013, 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
  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".
+ Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2",
+ likewise, the complete text of the GNU Library General Public License version
+ 3 can be found in "/usr/share/common-licenses/LGPL-3".
 
-Files: src/kjobwidgets.h
-       src/kjobwidgets.cpp
-Copyright: 2013 David Faure <faure at kde.org>
-License: LGPL-2+ as approved by 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 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.
+Files: src/debug.cpp
+       src/debug.h
+Copyright: No copyright claimed
+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 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.
+ .
+ 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".
+
+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 Lesser General Public License
+ 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.

-- 
kjobwidgets packaging



More information about the pkg-kde-commits mailing list