[SCM] sddm-kcm packaging branch, master, updated. ff30c2e07c4f152c14f440fd3ce9c20e5fa7618e

Maximiliano Curia maxy at moszumanska.debian.org
Sun Mar 22 07:43:54 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/sddm-kcm.git;a=commitdiff;h=47b5a00

The following commit has been merged in the master branch:
commit 47b5a005e24d54299fe5e08795d9dbc133ab9c90
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 13 14:37:05 2015 +0100

    Update copyright information.
---
 debian/changelog |   1 +
 debian/copyright | 133 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 69 insertions(+), 65 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index daba133..1fcf202 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ sddm-kcm (4:5.2.0-1~) UNRELEASED; urgency=medium
   * Prepare initial Debian release.
   * Update build dependencies to build against experimental and to
     follow cmake.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 13 Feb 2015 14:24:06 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 1b30c8f..1aae7eb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,44 +1,26 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: sddm-kcm
-Source: https://github.com/sddm/sddm-kcm.git,branch=qt5
+Source: git://anongit.kde.org/sddm-kcm
 
 Files: *
-       debian/*
-Copyright: © 2013 Reza Fatahilah Shah <rshah0385 at kireihana.com>
-           © 2005-2007 Fredrik Höglund <fredrik at kde.org>
-           © 2011-2012, 2014 David Edmundson <kde at davidedmundson.co.uk> <davidedmundson at kde.org>
-           © 2011 Martin Klapetek <martin.klapetek at gmail.com>
-           © 2007 Paolo Capriotti <p.capriotti at gmail.com>
-           © 1987, 1998 The Open Group
-           © 1998 Kurt Granroth <granroth at kde.org>
-           © 1992-2006 Trolltech AS.
-           © 1987 Digital Equipment Corporation
-           © 2010 Dario Andres Rodriguez <andresbajotierra at gmail.com>
-             2014 Harald Sitter <apachelogger at kubuntu.org>
-             2014 Scarlett Clark sgclark at kubuntu.org
+Copyright: 2013, Abdurrahman AVCI <abdurrahmanavci at gmail.com>
+           2010, Dario Andres Rodriguez <andresbajotierra at gmail.com>
+           2014, David Edmundson <davidedmundson at kde.org>
+           2011-2012, David Edmundson <kde at davidedmundson.co.uk>
+           1989-1991, Free Software Foundation, Inc
+           2007, Paolo Capriotti <p.capriotti at gmail.com>
+           2013, Reza Fatahilah Shah <rshah0385 at kireihana.com>
 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 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
 
-Files: src/cursortheme/* excluding:
-        src/cursortheme/dummytheme.cpp
-        src/cursortheme/dummytheme.h
-Copyright: © 2006-2007 Fredrik Höglund <fredrik at kde.org>
-License: GPL-2 or GPL-3
+Files: src/cursortheme/cursortheme.cpp
+       src/cursortheme/cursortheme.h
+       src/cursortheme/sortproxymodel.cpp
+       src/cursortheme/sortproxymodel.h
+       src/cursortheme/thememodel.h
+       src/cursortheme/xcursortheme.cpp
+       src/cursortheme/xcursortheme.h
+Copyright: 2005-2007, Fredrik Höglund <fredrik at kde.org>
+License: GPL-2+3
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public
  License version 2 or at your option version 3 as published
@@ -54,36 +36,16 @@ License: GPL-2 or GPL-3
  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
-
-Files: src/configwidgets/selectimagebuttondesignerfactory.cpp
-       src/configwidgets/selectimagebuttondesignerfactory.h
-Copyright: 2011, 2012 David Edmundson <kde at davidedmundson.co.uk>
-License: GPL-3+
- LightDM-KDE 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 3 of the License, or
- (at your option) any later version.
- .
- LightDM-KDE 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 LightDM-KDE.  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-3
+ 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: src/configwidgets/selectimagebutton.cpp
        src/configwidgets/selectimagebutton.h
-Copyright: 2011  Martin Klapetek <martin.klapetek at gmail.com>
-           2011, 2012 David Edmundson <kde at davidedmundson.co.uk>
-License: LPGL-2.1+
+Copyright: 2011-2014, David Edmundson <kde at davidedmundson.co.uk>
+           2011, Martin Klapetek <martin.klapetek at gmail.com>
+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
@@ -98,6 +60,47 @@ License: LPGL-2.1+
  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/LGPL-2.1
+ 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: src/cursortheme/thememodel.cpp
+Copyright: 2005-2007, Fredrik Höglund <fredrik 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 version 2 as published by the Free Software Foundation.
+ .
+ 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; see the file COPYING.  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'.
+
+Files: debian/*
+Copyright: 2014, Harald Sitter <apachelogger at kubuntu.org>
+           2014, Scarlett Clark sgclark at kubuntu.org
+License: GPL-2+
+
+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 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'.

-- 
sddm-kcm packaging



More information about the pkg-kde-commits mailing list