Merge lp:~smartboyhw/kubuntu-packaging/plasmate-copyright into lp:~kubuntu-packagers/kubuntu-packaging/plasmate

Proposed by Howard Chan
Status: Merged
Approved by: Michał Zając
Approved revision: 4
Merged at revision: 3
Proposed branch: lp:~smartboyhw/kubuntu-packaging/plasmate-copyright
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/plasmate
Diff against target: 158 lines (+130/-14)
1 file modified
debian/copyright (+130/-14)
To merge this branch: bzr merge lp:~smartboyhw/kubuntu-packaging/plasmate-copyright
Reviewer Review Type Date Requested Status
Rohan Garg Pending
Kubuntu Packagers Pending
Review via email: mp+148361@code.launchpad.net

Description of the change

Fixed the copyright file.

To post a comment you must log in.
4. By Howard Chan

New copyright licenses

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/copyright'
2--- debian/copyright 2013-02-12 10:54:53 +0000
3+++ debian/copyright 2013-02-14 12:20:30 +0000
4@@ -3,16 +3,39 @@
5 Source: <url://example.com>
6
7 Files: *
8-Copyright: <years> <put author's name and email here>
9- <years> <likewise for another author>
10-License: <special license>
11- <Put the license of the package here indented by 1 space>
12- <This follows the format of Description: lines in control file>
13- .
14- <Including paragraphs>
15-
16-# If you want to use GPL v2 or later for the /debian/* files use
17-# the following clauses, or change it to suit. Delete these two lines
18+Copyright: 2003 Scott Wheeler <wheeler@kde.org>
19+ 2005 Rafal Rzepecki <divide@users.sourceforge.net>
20+ 2006 Hamish Rodda <rodda@kde.org>
21+ 2006-2010 Aaron Seigo <aseigo@kde.org>
22+ 2007 Pino Toscano <pino@kde.org>
23+ 2007 Frerich Raabe <raabe@kde.org>
24+ 2008 Aleix Pol <aleixpol@gmail.com>
25+ 2009 Riccardo Iaconelli <riccardo@kde.org>
26+ 2009-2010 Artur Duque de Souza <asouza@kde.org>
27+ 2009-2010 Diego '[Po]lentino' Casella <polentino911@gmail.com>
28+ 2009-2010 Shantanu Tushar Jha <shaan7in@gmail.com>
29+ 2009-2010 Sandro Andrade <sandroandrade@kde.org>
30+ 2009-2010 Lim Yuen Hoe <yuenhoe@hotmail.com>
31+ 2011 Kevin Ottens <ervin@kde.org>
32+ 2012 Giorgos Tsiapaliwkas <terietor@gmail.com>
33+
34+License: GPL-2+
35+ This package is free software; you can redistribute it and/or modify
36+ it under the terms of the GNU General Public License as published by
37+ the Free Software Foundation; either version 2 of the License, or
38+ (at your option) any later version.
39+ .
40+ This package is distributed in the hope that it will be useful,
41+ but WITHOUT ANY WARRANTY; without even the implied warranty of
42+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
43+ GNU General Public License for more details.
44+ .
45+ You should have received a copy of the GNU General Public License
46+ along with this program. If not, see <http://www.gnu.org/licenses/>
47+ .
48+ On Debian systems, the complete text of the GNU General
49+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
50+
51 Files: debian/*
52 Copyright: 2013 Rohan Garg <rohangarg@kubuntu.org>
53 License: GPL-2+
54@@ -32,7 +55,100 @@
55 On Debian systems, the complete text of the GNU General
56 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
57
58-# Please also look if there are files or directories which have a
59-# different copyright/license attached and list them here.
60-# Please avoid to pick license terms that are more restrictive than the
61-# packaged work, as it may make Debian's contributions unacceptable upstream.
62+Files: plasmate/modeltest/*
63+Copyright: 2009 Stephen Kelly <steveire@gmail.com>
64+ 2011 Nokia Corporation and/or its subsidiary(-ies) <qt-info@nokia.com>
65+License: LGPL-2.1
66+ This library is free software; you can redistribute it and/or
67+ modify it under the terms of the GNU Lesser General Public
68+ License as published by the Free Software Foundation; either
69+ version 2.1 of the License, or (at your option) any later version.
70+ .
71+ This library is distributed in the hope that it will be useful,
72+ but WITHOUT ANY WARRANTY; without even the implied warranty of
73+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
74+ Lesser General Public License for more details.
75+ .
76+ You should have received a copy of the GNU Lesser General Public
77+ License along with this library; if not, write to the Free Software
78+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
79+ .
80+ On Debian systems, the complete text of the GNU Lesser General
81+ Public License Version 2 can be found in "/usr/share/common-licenses/
82+ LGPL-2.1"
83+
84+Files: ./plasmoidviewer/*
85+ ./plasmate/previewer/plasmoid/test/*
86+Copyright: 2007 Frerich Raabe <raabe@kde.org>
87+ 2007-2008 Aaron Seigo <aseigo@kde.org>
88+License: BSD
89+ Redistribution and use in source and binary forms, with or without
90+ modification, are permitted provided that the following conditions
91+ are met:
92+ .
93+ 1. Redistributions of source code must retain the above copyright
94+ notice, this
95+ list of conditions and the following disclaimer.
96+ 2. Redistributions in binary form must reproduce the above copyright
97+ notice,
98+ this list of conditions and the following disclaimer in the
99+ documentation
100+ and/or other materials provided with the distribution.
101+ .
102+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
103+ "AS IS" AND
104+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
105+ IMPLIED
106+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
107+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
108+ LIABLE FOR
109+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
110+ CONSEQUENTIAL DAMAGES
111+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
112+ SERVICES;
113+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
114+ CAUSED AND
115+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
116+ TORT
117+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
118+ OF THIS
119+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
120+ .
121+ The views and conclusions contained in the software and documentation
122+ are those
123+ of the authors and should not be interpreted as representing official
124+ policies,
125+ either expressed or implied, of the FreeBSD Project.
126+ .
127+ On Debian systems, the complete text of the FreeBSD License can be
128+ found in "/usr/share/common-licenses/
129+ BSD"
130+
131+Files: engineexplorer/ktreeviewsearchline.cpp
132+ engineexplorer/ktreeviewsearchline.h
133+Copyright: 2003 Scott Wheeler <wheeler@kde.org>
134+ 2005 Rafal Rzepecki <divide@users.sourceforge.net>
135+ 2006 Hamish Rodda <rodda@kde.org>
136+ 2007 Pino Toscano <pino@kde.org>
137+License: LGPL-2
138+ This library is free software; you can redistribute it and/or
139+ modify it under the terms of the GNU Library General Public
140+ License as published by the Free Software Foundation; either
141+ version 2 of the License, or (at your option) any later version.
142+ .
143+ This library is distributed in the hope that it will be useful,
144+ but WITHOUT ANY WARRANTY; without even the implied warranty of
145+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
146+ Library General Public License for more details.
147+ .
148+ You should have received a copy of the GNU Library General Public
149+ License along with this library; if not, write to the Free Software
150+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 0
151+ 2110-1301 USA
152+ .
153+ On Debian systems, the complete text of the GNU Library General
154+ Public License Version 2 can be found in "/usr/share/common-licenses/
155+ LGPL-2"
156+
157+
158+

Subscribers

People subscribed via source and target branches

to all changes: