[SCM] powerdevil packaging branch, master, updated. f01e47b2c7f3afc4421543d593986bc8fd3c099f

Sun Jul 5 06:32:29 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/powerdevil.git;a=commitdiff;h=7608a24

The following commit has been merged in the master branch:
commit 7608a2453a51d991b380b4962a7a271d068e2d48
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 2 10:34:36 2015 +0200

    Update copyright information.
---
 debian/changelog |   1 +
 debian/copyright | 166 +++++++++++++++++++++++++++++++++----------------------
 2 files changed, 100 insertions(+), 67 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c7eabb1..8bfd870 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ powerdevil (4:5.3.2-1~) UNRELEASED; urgency=medium
   * New upstream release (5.3.0).
   * New upstream release (5.3.1).
   * New upstream release (5.3.2).
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:26:23 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 45f5ce8..1628ce0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,8 +16,39 @@ Copyright: 2012-2013, Alejandro Fiestas Olivares <afiestas at kde.org>
            2012, Michael Zanetti <mzanetti at kde.org>
            2014, Nikita Skovoroda <chalkerx at gmail.com>
            2010, Sebastian Kugler <sebas at kde.org>
+           2008-2014, Free Software Foundation
+           2002-2014, Free Software Foundation, Inc
+           2008-2009, K Desktop Environment
+           2009, Rosetta Contributors and Canonical Ltd 2009
+           2011, Rosetta Contributors and Canonical Ltd 2011
+           2012, Rosetta Contributors and Canonical Ltd 2012
+           2008-2015, This_file_is_part_of_KDE
 License: GPL-2+
 
+Files: daemon/backends/upower/udevqt_p.h
+       daemon/backends/upower/udevqtclient.cpp
+       daemon/backends/upower/udevqtclient.h
+       daemon/backends/upower/udevqtdevice.cpp
+       daemon/backends/upower/udevqtdevice.h
+       po/ca/libpowerdevilcommonconfig.po
+       po/ca/powerdevil.po
+       po/ca/powerdevilactivitiesconfig.po
+       po/ca/powerdevilglobalconfig.po
+       po/ca/powerdevilprofilesconfig.po
+       po/ca at valencia/libpowerdevilcommonconfig.po
+       po/ca at valencia/powerdevil.po
+       po/ca at valencia/powerdevilactivitiesconfig.po
+       po/ca at valencia/powerdevilglobalconfig.po
+       po/ca at valencia/powerdevilprofilesconfig.po
+       po/uk/libpowerdevilcommonconfig.po
+       po/uk/powerdevil.po
+       po/uk/powerdevilactivitiesconfig.po
+       po/uk/powerdevilglobalconfig.po
+       po/uk/powerdevilprofilesconfig.po
+Copyright: 2009, Benjamin K. Stuhl <bks24 at cornell.edu>
+           2008-2015, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
+
 Files: daemon/backends/hal/halsuspendjob.cpp
        daemon/backends/hal/halsuspendjob.h
        daemon/backends/hal/powerdevilhalbackend.cpp
@@ -34,79 +65,25 @@ Files: daemon/backends/hal/halsuspendjob.cpp
        daemon/backends/upower/xrandrbrightness.h
 Copyright: 2010, Alejandro Fiestas <alex at eyeos.org>
            2008-2010, Dario Freddi <drf at kde.org>
+           2015, Kai Uwe Broulik <kde at privat.broulik.de>
            2006, Kevin Ottens <ervin at kde.org>
            2010-2013, Lukáš Tinkl <ltinkl at redhat.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 version 2 as published by the Free Software Foundation.
- .
- 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".
-
-Files: daemon/backends/upower/udevqt_p.h
-       daemon/backends/upower/udevqtclient.cpp
-       daemon/backends/upower/udevqtclient.h
-       daemon/backends/upower/udevqtdevice.cpp
-       daemon/backends/upower/udevqtdevice.h
-Copyright: 2009, Benjamin K. Stuhl <bks24 at cornell.edu>
-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
- 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
- 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",
- likewise, the complete text of the GNU Lesser General Public License version
- 3 can be found in "/usr/share/common-licenses/LGPL-3".
 
 Files: daemon/powerdevil_debug.cpp
        daemon/powerdevil_debug.h
 Copyright: 2014, Hrvoje Senjan <hrvoje.senjan at gmail.com>
 License: LGPL-2+
- This program 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 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 Library General Public License for more details
- .
- You should have received a copy of the GNU Library 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 Library General Public
- License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
 
 Files: cmake/FindUDev.cmake
 Copyright: 2010, Rafael Fernández López <ereslibre at kde.org>
 License: BSD-3-clause
+
+Files: debian/*
+Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: GPL-2+
+
+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:
@@ -130,10 +107,6 @@ License: BSD-3-clause
  (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: GPL-2+
-
 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
@@ -147,6 +120,65 @@ License: GPL-2+
  .
  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".
+ version 2 can be found in `/usr/share/common-licenses/GPL-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 version 2 as published by the Free Software Foundation.
+ .
+ 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'.
+
+License: LGPL-2+
+ This program 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 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 Library General Public License for more details
+ .
+ You should have received a copy of the GNU Library 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 Library General Public
+ License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
+
+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
+ 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
+ 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', likewise,
+ the complete text of the GNU Lesser General Public License version 3 can be
+ found in `/usr/share/common-licenses/LGPL-3'.

-- 
powerdevil packaging

