[SCM] kscreen packaging branch, master, updated. 26c31f92d851fd2085c162e3e0bdb0ec30aff23a

Mon Dec 16 15:47:32 UTC 2013

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kscreen.git;a=commitdiff;h=9819e6c

The following commit has been merged in the master branch:
commit 9819e6ceba60c45641d3e134e6ccc4106467bf6b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Dec 6 11:17:35 2013 +0100

    Update copyright file, updating the TODO.
---
 debian/TODO.Debian |   2 -
 debian/copyright   | 139 +++++++++++++++++++++++++++++++++++------------------
 2 files changed, 91 insertions(+), 50 deletions(-)

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 78d3bbd..ef6e9b0 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,7 +1,5 @@
 TODO:
 
-	* Fix lintian complains
-
 	* kscreen-console.1 manpage:
 	  + replace standard options with a reference to kdeoptions manpage
 
diff --git a/debian/copyright b/debian/copyright
index 2ab60f1..635e2c2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,31 +1,104 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: kscreen
-Source: ftp://ftp.kde.org/pub/kde/unstable/kscreen/
-
-
-Files: kded/* test/*
-Copyright: 2012 by Alejandro Fiestas Olivares <afiestas at kde.org>
-License: GPL-2.0+
+Source: ftp://ftp.kde.org/pub/kde/stable/kscreen/
 
+Files: *
+Copyright: 2012, Alejandro Fiestas Olivares <afiestas at kde.org>
+           2012, Kscreen Team
+License: GPL-2+
 
 Files: kcm/src/* kcm/qml/*
-Copyright: 2012,2013 Dan Vratil <dvratil at redhat.com>
-           2011 Marco Martin <mart at kde.org>
+Copyright: 2012-2013, Dan Vratil <dvratil at redhat.com>
+           2011, Marco Martin <mart at kde.org>
 License: LGPL-2.1+
 
+Files: kcm/src/fallbackcomponent.*
+Copyright: 2011, Marco Martin <mart at kde.org>
+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: kcm/qml/plasmacomponents/*
-Copyright: 2011,2012 Marco Martin  <mart at kde.org>
-           2011 Nokia Corporation and/or its subsidiary(-ies)
-License: BSD
+Copyright: 2011, Marco Martin <mart at kde.org>
+           2011, Nokia Corporation and/or its subsidiary(-ies)
+License: BSD-3-clause
+ You may use this file under the terms of the BSD license as follows:
+ .
+ "Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * 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.
+   * Neither the name of Nokia Corporation and its Subsidiary(-ies) 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 COPYRIGHT HOLDERS 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 COPYRIGHT
+ OWNER 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: kcm/qml/plasmacomponents/private/InlineDialog.qml
+Copyright: 2012, Marco Martin <mart at kde.org>
+License: GPL-2+
+
+Files: plasma/kscreenapplet.*
+Copyright: 2013, Dan Vratil <dvratil at redhat.com>
+License: GPL-2 or GPL-3 or later approved by KDE e.V.
+ 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) 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 14 of version 3 of the license.
+ .
+ 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", also, the
+ complete text of the GNU General Public License version 3 can be found in
+ "/usr/share/common-licenses/GPL-3".
 
 Files: debian/*
-Copyright: 2012, 2013 Achim Bohnet <allee at kubuntu.org>
+Copyright: 2012-2013, Achim Bohnet <allee at kubuntu.org>
+           2013, Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 License: LGPL-2.1+
 
-
-License: GPL-2.0+
+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
  the Free Software Foundation; either version 2 of the License, or
@@ -39,8 +112,8 @@ License: GPL-2.0+
  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".
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
@@ -57,35 +130,5 @@ License: LGPL-2.1+
  License along with this library; 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/LGPL-2.1".
-
-
-License: BSD
- You may use this file under the terms of the BSD license as follows:
- .
- "Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-   * 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.
-   * Neither the name of Nokia Corporation and its Subsidiary(-ies) 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 COPYRIGHT HOLDERS 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 COPYRIGHT
- OWNER 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."
+ 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".

-- 
kscreen packaging

